diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-11 20:30:43 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-11 20:30:43 +0000 |
| commit | 3a7b54be4a13cb5386cb7825baf798510f7ab099 (patch) | |
| tree | 8b97716f70d0de29440b76f22cfb1dd6f449c886 | |
| parent | 3ca39ccf69658d095a91e8a61030ecee98b279d8 (diff) | |
| parent | 7247c2965375ca830a4c713944939f59c60a06d9 (diff) | |
| download | pleroma-3a7b54be4a13cb5386cb7825baf798510f7ab099.tar.gz pleroma-3a7b54be4a13cb5386cb7825baf798510f7ab099.zip | |
Merge branch 'nil-report-object-hotfix' into 'develop'
AdminAPI: hotfix for nil report objects
See merge request pleroma/pleroma!3504
| -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) |