projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8282b6a
)
Fix report parsing
author
Maxim Filippov
<colixer@gmail.com>
Sun, 27 Oct 2019 13:33:58 +0000
(16:33 +0300)
committer
Maxim Filippov
<colixer@gmail.com>
Sun, 27 Oct 2019 13:33:58 +0000
(16:33 +0300)
lib/pleroma/web/admin_api/report.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/admin_api/report.ex
b/lib/pleroma/web/admin_api/report.ex
index ccd56e15e8c787b41dd19902cd9149c4a22ba3ab..9c34685708c6467b141ceb469cbdecbc38bcd3bc 100644
(file)
--- a/
lib/pleroma/web/admin_api/report.ex
+++ b/
lib/pleroma/web/admin_api/report.ex
@@
-13,8
+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 act ->
- Activity.get_by_ap_id_with_object(act["id"])
+ Enum.map(status_ap_ids, 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)
%{report: report, user: user, account: account, statuses: statuses}