diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-29 18:48:53 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-29 18:48:53 +0000 |
| commit | 0b2119d4a791b3623b304b0bab683609d23271d4 (patch) | |
| tree | 40eac155fc0b26d924aa072fd289fc3e64bfad26 /lib/pleroma/web/admin_api/report.ex | |
| parent | dc63aaf84f07a6f8042f43617d8ec356fed85cec (diff) | |
| parent | 7372609c5b5063d177715d5067654888f7075403 (diff) | |
Merge branch 'release/2.4.1' into 'stable'v2.4.1
Release: 2.4.1
See merge request pleroma/pleroma!3501
Diffstat (limited to 'lib/pleroma/web/admin_api/report.ex')
| -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) |