pleroma

commit: e1175511693973ef0c5b21ea70e517893f61f4e1
parent bb2d5879cc1275ebc552e704589cf608bb91a43d
Author: Alex Gleason <alex@alexgleason.me>
Date:   Wed, 11 Aug 2021 09:38:16 -0500

AdminAPI: hotfix for nil report objects

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3504

Diffstat:
M
CHANGELOG.md
1
+
M
lib/pleroma/web/admin_api/report.ex
4
+++-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - MRF ObjectAgePolicy: Fix pattern matching on "published"
 - TwitterAPI: Make `change_password` and `change_email` require params on body instead of query
 - Subscription(Bell) Notifications: Don't create from Pipeline Ingested replies
+- AdminAPI: Fix rendering reports containing a `nil` object
 
 ## 2.4.0 - 2021-08-08
 
diff --git 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)