logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 7247c2965375ca830a4c713944939f59c60a06d9
parent 7c1243178b44d629f6881aa1b197641d56bbd0f1
Author: Alex Gleason <alex@alexgleason.me>
Date:   Wed, 11 Aug 2021 09:38:16 -0500

AdminAPI: hotfix for nil report objects

Diffstat:

Mlib/pleroma/web/admin_api/report.ex4+++-
1 file changed, 3 insertions(+), 1 deletion(-)

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)