diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-18 12:06:38 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-18 12:06:38 +0300 |
| commit | c98e761d28812818971d327800f1fc4c2baa2dbc (patch) | |
| tree | 60ccdc45dbf52c6cd0a2f06aab6b572fef9be0d2 /lib/pleroma/web/admin_api/admin_api_controller.ex | |
| parent | 9f28249dfb0918cfd97450494c6c306dae9ab3fb (diff) | |
| parent | 40c968626dde499969d90f256d5ef6d1b1d5e2b4 (diff) | |
| download | pleroma-c98e761d28812818971d327800f1fc4c2baa2dbc.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
Diffstat (limited to 'lib/pleroma/web/admin_api/admin_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 544b9d7d8..2a1cc59e5 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -442,11 +442,9 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do params |> Map.put("type", "Flag") |> Map.put("skip_preload", true) + |> Map.put("total", true) - reports = - [] - |> ActivityPub.fetch_activities(params) - |> Enum.reverse() + reports = ActivityPub.fetch_activities([], params) conn |> put_view(ReportView) |