diff options
| author | feld <feld@feld.me> | 2020-03-12 20:29:51 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-03-12 20:29:51 +0000 |
| commit | 802b991814fb851c0442dbb7b7bfc065fc062178 (patch) | |
| tree | fd5f3a9f8281b16dbbae425b435a49479e30a148 /lib | |
| parent | 00d17520314e3591caaa7ab4ca39c6227a6bdf15 (diff) | |
| parent | ad22e94f336875141a2e2db786b1f15f65402f3e (diff) | |
| download | pleroma-802b991814fb851c0442dbb7b7bfc065fc062178.tar.gz pleroma-802b991814fb851c0442dbb7b7bfc065fc062178.zip | |
Merge branch 'exclude-posts-visible-to-admin' into 'develop'
Exclude private and direct statuses visible to the admin when using godmode
Closes #1599
See merge request pleroma/pleroma!2272
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 47b7d2da3..175260bc2 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -745,14 +745,14 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do end end - def list_statuses(%{assigns: %{user: admin}} = conn, params) do + def list_statuses(%{assigns: %{user: _admin}} = conn, params) do godmode = params["godmode"] == "true" || params["godmode"] == true local_only = params["local_only"] == "true" || params["local_only"] == true with_reblogs = params["with_reblogs"] == "true" || params["with_reblogs"] == true {page, page_size} = page_params(params) activities = - ActivityPub.fetch_statuses(admin, %{ + ActivityPub.fetch_statuses(nil, %{ "godmode" => godmode, "local_only" => local_only, "limit" => page_size, |