nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'admin-report-view-user-fallback' into 'develop'

Browse source 
Handle deleted reported accounts in report admin API

Closes #1046

See merge request pleroma/pleroma!1370
This commit is contained in:
kaniini 2019-07-02 01:27:00 +00:00
parent 79c88a257f ab50c6b3ca
commit a565dbde4f
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/admin_api/views/report_view.ex
View file

@ -46,8 +46,10 @@ def render("show.json", %{report: report}) 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

16
test/web/admin_api/views/report_view_test.exs
View file

@ -111,4 +111,20 @@ test "sanitizes report description" do
refute "<script> alert('hecked :D:D:D:D:D:D:D') </script>" ==
ReportView.render("show.json", %{report: activity})[:content]
end
test "doesn't error out when the user doesn't exists" do
user = insert(:user)
other_user = insert(:user)
{:ok, activity} =
CommonAPI.report(user, %{
"account_id" => other_user.id,
"comment" => ""
})
Pleroma.User.delete(other_user)
Pleroma.User.invalidate_cache(other_user)
assert %{} = ReportView.render("show.json", %{report: activity})
end
end