Merge branch 'nil-report-object-hotfix' into 'develop'

AdminAPI: hotfix for nil report objects See merge request pleroma/pleroma!3504
2021-08-11 20:30:43 +00:00 · 2021-08-11 20:30:43 +00:00 · 3a7b54be4a
parent 3ca39ccf69 7247c29653
commit 3a7b54be4a
1 changed files with 3 additions and 1 deletions
--- a/lib/pleroma/web/admin_api/report.ex
+++ b/lib/pleroma/web/admin_api/report.ex
@ -13,7 +13,9 @@ def extract_report_info(
    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)