Merge branch 'admin-status-list' into 'develop'
authorfeld <feld@feld.me>
Thu, 27 Feb 2020 18:11:04 +0000 (18:11 +0000)
committerfeld <feld@feld.me>
Thu, 27 Feb 2020 18:11:04 +0000 (18:11 +0000)
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)

Closes #1550

See merge request pleroma/pleroma!2192

1  2 
CHANGELOG.md
lib/pleroma/web/admin_api/admin_api_controller.ex
test/web/admin_api/admin_api_controller_test.exs

diff --cc CHANGELOG.md
Simple merge
index f45ef8679e83d8f6b31be44f514724d4df7579ff,9cb63bc2ea5f1c5613452ce3cde03da899fe9f28..8804343b9bad05763a4fd197527cdd306fba107f
@@@ -248,11 -247,10 +248,11 @@@ defmodule Pleroma.Web.AdminAPI.AdminAPI
      {page, page_size} = page_params(params)
  
      activities =
-       ActivityPub.fetch_instance_activities(%{
+       ActivityPub.fetch_statuses(nil, %{
          "instance" => instance,
          "limit" => page_size,
 -        "offset" => (page - 1) * page_size
 +        "offset" => (page - 1) * page_size,
 +        "exclude_reblogs" => !with_reblogs && "true"
        })
  
      conn