diff options
| author | lain <lain@soykaf.club> | 2023-11-27 15:30:13 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2023-11-27 15:30:13 +0000 |
| commit | 2b839197a9a4e02f7c2efe7473b576b738b23f50 (patch) | |
| tree | 4dee6b9953748bcce45e202d0116fb80c64e6c63 /lib | |
| parent | 9c57f17af37d537b5fdfe6d15224cfa6aef9a82c (diff) | |
| parent | 4ef56c5b65a4d1e7e90a87f1a1a507df523a4b4b (diff) | |
| download | pleroma-2b839197a9a4e02f7c2efe7473b576b738b23f50.tar.gz pleroma-2b839197a9a4e02f7c2efe7473b576b738b23f50.zip | |
Merge branch 'strip-fix' into 'develop'
Strip fix
See merge request pleroma/pleroma!3981
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/utils.ex | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index 437220077..b32f19740 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -7,6 +7,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do alias Ecto.UUID alias Pleroma.Activity alias Pleroma.Config + alias Pleroma.EctoType.ActivityPub.ObjectValidators.ObjectID alias Pleroma.Maps alias Pleroma.Notification alias Pleroma.Object @@ -852,9 +853,11 @@ defmodule Pleroma.Web.ActivityPub.Utils do [actor | reported_activities] = activity.data["object"] stripped_activities = - Enum.map(reported_activities, fn - act when is_map(act) -> act["id"] - act when is_binary(act) -> act + Enum.reduce(reported_activities, [], fn act, acc -> + case ObjectID.cast(act) do + {:ok, act} -> [act | acc] + _ -> acc + end end) new_data = put_in(activity.data, ["object"], [actor | stripped_activities]) |