diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-11-16 18:44:48 +0900 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-11-16 18:44:48 +0900 |
| commit | c506cc48ef230da30d5786285806de904b725981 (patch) | |
| tree | 39977c25bcdb34c6599bebe9b2472e7291d0dc96 | |
| parent | 09b4f7269e5307f29fc8ca7b548e93cd93836dc5 (diff) | |
| download | pleroma-c506cc48ef230da30d5786285806de904b725981.tar.gz | |
Admin API: Error when trying to update reports in the "old" format
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/utils.ex | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b4ad91b0d..740facf04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,6 +77,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`) - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname` +- Admin API: Error when trying to update reports in the "old" format </details> ## [1.1.2] - 2019-10-18 diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index c45662359..01aacbde3 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -903,7 +903,13 @@ defmodule Pleroma.Web.ActivityPub.Utils do def strip_report_status_data(activity) do [actor | reported_activities] = activity.data["object"] - stripped_activities = Enum.map(reported_activities, & &1["id"]) + + stripped_activities = + Enum.map(reported_activities, fn + act when is_map(act) -> act["id"] + act when is_binary(act) -> act + end) + new_data = put_in(activity.data, ["object"], [actor | stripped_activities]) {:ok, %{activity | data: new_data}} |