From: feld <feld@feld.me>
Date: Thu, 27 Feb 2020 18:11:04 +0000 (+0000)
Subject: Merge branch 'admin-status-list' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f2216287a72f5d644a4e8c932b4448c15c9a2a9b;p=akkoma

Merge branch 'admin-status-list' into 'develop'

Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)

Closes #1550

See merge request pleroma/pleroma!2192
---

f2216287a72f5d644a4e8c932b4448c15c9a2a9b
diff --cc lib/pleroma/web/admin_api/admin_api_controller.ex
index f45ef8679,9cb63bc2e..8804343b9
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@@ -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