moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AdminAPI: hotfix for nil report objects 

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3504
This commit is contained in:
Alex Gleason 2021-08-11 09:38:16 -05:00 committed by Haelwenn (lanodan) Monnier
parent bb2d5879cc
commit e117551169
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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" - MRF ObjectAgePolicy: Fix pattern matching on "published"
- TwitterAPI: Make `change_password` and `change_email` require params on body instead of query - TwitterAPI: Make `change_password` and `change_email` require params on body instead of query
- Subscription(Bell) Notifications: Don't create from Pipeline Ingested replies - Subscription(Bell) Notifications: Don't create from Pipeline Ingested replies
- AdminAPI: Fix rendering reports containing a `nil` object
## 2.4.0 - 2021-08-08 ## 2.4.0 - 2021-08-08

4
lib/pleroma/web/admin_api/report.ex
View File

@ -13,7 +13,9 @@ def extract_report_info(
account = User.get_cached_by_ap_id(account_ap_id) account = User.get_cached_by_ap_id(account_ap_id)
statuses = 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_map(act) -> Activity.get_by_ap_id_with_object(act["id"])
act when is_binary(act) -> Activity.get_by_ap_id_with_object(act) act when is_binary(act) -> Activity.get_by_ap_id_with_object(act)
end) end)