aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEugenij <eugenijm@protonmail.com>2019-07-02 01:27:00 +0000
committerkaniini <nenolod@gmail.com>2019-07-02 01:27:00 +0000
commitab50c6b3ca26c87e4b7fdbe04da5d0d236d2e9ce (patch)
treed2b758f2d38065c03b4b6085ceb654c8af19a64f /lib
parent79c88a257f8e33bf55ce6b18c32a791d6bf9546d (diff)
downloadpleroma-ab50c6b3ca26c87e4b7fdbe04da5d0d236d2e9ce.tar.gz
Add fallback value to the admin report view.
This is to avoid 500 error when the reported user no longer exists in the database.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/admin_api/views/report_view.ex4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/views/report_view.ex b/lib/pleroma/web/admin_api/views/report_view.ex
index 73ccdc582..a25f3f1fe 100644
--- a/lib/pleroma/web/admin_api/views/report_view.ex
+++ b/lib/pleroma/web/admin_api/views/report_view.ex
@@ -46,8 +46,10 @@ defmodule Pleroma.Web.AdminAPI.ReportView do
}
end
- defp merge_account_views(user) do
+ defp merge_account_views(%User{} = user) do
Pleroma.Web.MastodonAPI.AccountView.render("account.json", %{user: user})
|> Map.merge(Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: user}))
end
+
+ defp merge_account_views(_), do: %{}
end