projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/2291-atom-feed-escape' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
report.ex
diff --git
a/lib/pleroma/web/admin_api/report.ex
b/lib/pleroma/web/admin_api/report.ex
index c751dc2be2b96e635e357eceb7f61162526f56ce..8660d6520fc7b98589e37a0c578e81a4742a9e42 100644
(file)
--- a/
lib/pleroma/web/admin_api/report.ex
+++ b/
lib/pleroma/web/admin_api/report.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.Report do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.Report do
@@
-13,8
+13,9
@@
defmodule Pleroma.Web.AdminAPI.Report do
account = User.get_cached_by_ap_id(account_ap_id)
statuses =
account = User.get_cached_by_ap_id(account_ap_id)
statuses =
- Enum.map(status_ap_ids, fn ap_id ->
- Activity.get_by_ap_id_with_object(ap_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}
end)
%{report: report, user: user, account: account, statuses: statuses}