diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-17 22:20:39 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-17 22:20:39 +0300 |
commit | 0447c4271587f6dc3d87fa079aa78ae0b4e38245 (patch) | |
tree | d889756de95d2ab21c296ca7e4d2d9aa744f774c /lib/pleroma/web/admin_api/admin_api_controller.ex | |
parent | 7dd51652f96db8479fb3848c3a993b74b7246d27 (diff) | |
parent | 79376abae347a5039931f57c581074b6da859827 (diff) | |
download | pleroma-0447c4271587f6dc3d87fa079aa78ae0b4e38245.tar.gz |
Merge branch 'develop' into issue/733
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) |