diff options
author | Alex Gleason <alex@alexgleason.me> | 2021-08-11 09:38:16 -0500 |
---|---|---|
committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2021-08-13 17:57:39 +0200 |
commit | e1175511693973ef0c5b21ea70e517893f61f4e1 (patch) | |
tree | 18f2429af1d2ab3b91dfa154d401c07d44ffb224 /lib | |
parent | bb2d5879cc1275ebc552e704589cf608bb91a43d (diff) | |
download | pleroma-e1175511693973ef0c5b21ea70e517893f61f4e1.tar.gz |
AdminAPI: hotfix for nil report objects
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3504
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/admin_api/report.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/report.ex b/lib/pleroma/web/admin_api/report.ex index 259068f04..345bc1e87 100644 --- a/lib/pleroma/web/admin_api/report.ex +++ b/lib/pleroma/web/admin_api/report.ex @@ -13,7 +13,9 @@ defmodule Pleroma.Web.AdminAPI.Report do account = User.get_cached_by_ap_id(account_ap_id) statuses = - Enum.map(status_ap_ids, fn + status_ap_ids + |> Enum.reject(&is_nil(&1)) + |> Enum.map(fn act when is_map(act) -> Activity.get_by_ap_id_with_object(act["id"]) act when is_binary(act) -> Activity.get_by_ap_id_with_object(act) end) |