diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-09-18 16:44:11 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-09-18 16:44:11 +0300 |
| commit | f89728ad95ff317b68cd5bfe1d35e98e94a9f42d (patch) | |
| tree | d34d669a6b12bb7731820ef1df048a3b39920f02 /lib | |
| parent | f9dd121ad3f7e1de465f81c7a5fe4e4173d88e28 (diff) | |
| parent | 40c968626dde499969d90f256d5ef6d1b1d5e2b4 (diff) | |
| download | pleroma-f89728ad95ff317b68cd5bfe1d35e98e94a9f42d.tar.gz | |
Merge branch 'develop' into feature/return-link-for-password-reset
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 6 | ||||
| -rw-r--r-- | lib/pleroma/web/admin_api/views/report_view.ex | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 03a73053b..4421b30c8 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -447,11 +447,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) diff --git a/lib/pleroma/web/admin_api/views/report_view.ex b/lib/pleroma/web/admin_api/views/report_view.ex index a25f3f1fe..51b95ad5e 100644 --- a/lib/pleroma/web/admin_api/views/report_view.ex +++ b/lib/pleroma/web/admin_api/views/report_view.ex @@ -12,7 +12,9 @@ defmodule Pleroma.Web.AdminAPI.ReportView do def render("index.json", %{reports: reports}) do %{ - reports: render_many(reports, __MODULE__, "show.json", as: :report) + reports: + render_many(reports[:items], __MODULE__, "show.json", as: :report) |> Enum.reverse(), + total: reports[:total] } end |