projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'admin-api-users-sort' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
views
/
status_view.ex
diff --git
a/lib/pleroma/web/admin_api/views/status_view.ex
b/lib/pleroma/web/admin_api/views/status_view.ex
index 6042a22b6fe0b1d6bd0bbb683b4604aae835b77f..48d639b410bcb0ee230d195e5d9cdae5a0845482 100644
(file)
--- a/
lib/pleroma/web/admin_api/views/status_view.ex
+++ b/
lib/pleroma/web/admin_api/views/status_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.StatusView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.StatusView do
@@
-13,6
+13,10
@@
defmodule Pleroma.Web.AdminAPI.StatusView do
defdelegate merge_account_views(user), to: AdminAPI.AccountView
defdelegate merge_account_views(user), to: AdminAPI.AccountView
+ def render("index.json", %{total: total} = opts) do
+ %{total: total, activities: safe_render_many(opts.activities, __MODULE__, "show.json", opts)}
+ end
+
def render("index.json", opts) do
safe_render_many(opts.activities, __MODULE__, "show.json", opts)
end
def render("index.json", opts) do
safe_render_many(opts.activities, __MODULE__, "show.json", opts)
end