projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added recount unread notifications to markers
[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 8c06364a37939b5c411b83bbedc6fe8091785bf9..101a74c630833ad17c123c355e32c9563097b1b8 100644
(file)
--- a/
lib/pleroma/web/admin_api/views/report_view.ex
+++ b/
lib/pleroma/web/admin_api/views/report_view.ex
@@
-43,7
+43,7
@@
defmodule Pleroma.Web.AdminAPI.ReportView do
end
defp merge_account_views(%User{} = user) do
end
defp merge_account_views(%User{} = user) do
- Pleroma.Web.MastodonAPI.AccountView.render("
account
.json", %{user: user})
+ Pleroma.Web.MastodonAPI.AccountView.render("
show
.json", %{user: user})
|> Map.merge(Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: user}))
end
|> Map.merge(Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: user}))
end