projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
views
/
report_view.ex
diff --git
a/lib/pleroma/web/admin_api/views/report_view.ex
b/lib/pleroma/web/admin_api/views/report_view.ex
index e7db3a8fff827ad7f6199d4edf2788c2af3761df..73ccdc582ae97b6da8434c9343629925295966cb 100644
(file)
--- a/
lib/pleroma/web/admin_api/views/report_view.ex
+++ b/
lib/pleroma/web/admin_api/views/report_view.ex
@@
-8,7
+8,6
@@
defmodule Pleroma.Web.AdminAPI.ReportView do
alias Pleroma.HTML
alias Pleroma.User
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.HTML
alias Pleroma.User
alias Pleroma.Web.CommonAPI.Utils
- alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.StatusView
def render("index.json", %{reports: reports}) do
alias Pleroma.Web.MastodonAPI.StatusView
def render("index.json", %{reports: reports}) do
@@
-38,12
+37,17
@@
defmodule Pleroma.Web.AdminAPI.ReportView do
%{
id: report.id,
%{
id: report.id,
- account:
AccountView.render("account.json", %{user: account}
),
- actor:
AccountView.render("account.json", %{user: user}
),
+ account:
merge_account_views(account
),
+ actor:
merge_account_views(user
),
content: content,
created_at: created_at,
statuses: StatusView.render("index.json", %{activities: statuses, as: :activity}),
state: report.data["state"]
}
end
content: content,
created_at: created_at,
statuses: StatusView.render("index.json", %{activities: statuses, as: :activity}),
state: report.data["state"]
}
end
+
+ defp merge_account_views(user) do
+ Pleroma.Web.MastodonAPI.AccountView.render("account.json", %{user: user})
+ |> Map.merge(Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: user}))
+ end
end
end