logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 3a7b54be4a13cb5386cb7825baf798510f7ab099
parent 3ca39ccf69658d095a91e8a61030ecee98b279d8
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Wed, 11 Aug 2021 20:30:43 +0000

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

AdminAPI: hotfix for nil report objects

See merge request pleroma/pleroma!3504

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)