diff options
| author | lain <lain@soykaf.club> | 2019-11-04 14:11:44 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-11-04 14:11:44 +0000 |
| commit | 556da9290217823ac8a6f4cecfda2186a4d6985d (patch) | |
| tree | f837914d84e7ae41c3de76ba9f5d50f40494f794 /lib/pleroma/web/admin_api | |
| parent | bab786cd935e37a74483d090fdfbb283764d83fe (diff) | |
| parent | d56bc622755ea0a858bf086bc1f525c1752e4db8 (diff) | |
| download | pleroma-556da9290217823ac8a6f4cecfda2186a4d6985d.tar.gz | |
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
Store status data inside flag activity
See merge request pleroma/pleroma!1849
Diffstat (limited to 'lib/pleroma/web/admin_api')
| -rw-r--r-- | lib/pleroma/web/admin_api/report.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/admin_api/report.ex b/lib/pleroma/web/admin_api/report.ex index c751dc2be..9c3468570 100644 --- 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 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} |