diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-16 15:31:31 +0400 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-16 15:31:31 +0400 |
commit | 421e35b578b3fc109f820f693e91139a3e3f8970 (patch) | |
tree | 37da58962582854597cd068c603b8ba23e10f7bb /lib/pleroma/web/admin_api/admin_api_controller.ex | |
parent | d1c7f8e576e31487544b57d67802843b8ef38388 (diff) | |
parent | c2527b8c63a4e35b121981efe2c39cc54c77648d (diff) | |
download | pleroma-421e35b578b3fc109f820f693e91139a3e3f8970.tar.gz |
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'lib/pleroma/web/admin_api/admin_api_controller.ex')
-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, |