diff options
| author | lain <lain@soykaf.club> | 2019-10-04 16:32:42 +0200 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2019-10-04 21:17:46 +0000 |
| commit | b7d2ca03723d5bd6c2bd264f119bfe22024569dd (patch) | |
| tree | 9921461104bb1069b765652a80206e63d3765a3a /lib | |
| parent | 4d38e4855820786bfa1dc7fc58d7ff78728e3ab6 (diff) | |
| download | pleroma-b7d2ca03723d5bd6c2bd264f119bfe22024569dd.tar.gz pleroma-b7d2ca03723d5bd6c2bd264f119bfe22024569dd.zip | |
ActivityPub: Change addressing of Undo.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/utils.ex | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index 47917f5d3..b75514ea1 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -472,14 +472,16 @@ defmodule Pleroma.Web.ActivityPub.Utils do """ def make_unannounce_data( %User{ap_id: ap_id} = user, - %Activity{data: %{"context" => context}} = activity, + %Activity{data: %{"context" => context, "object" => object}} = activity, activity_id ) do + object = Object.normalize(object) + %{ "type" => "Undo", "actor" => ap_id, "object" => activity.data, - "to" => [user.follower_address, activity.data["actor"]], + "to" => [user.follower_address, object.data["actor"]], "cc" => [Pleroma.Constants.as_public()], "context" => context } @@ -488,14 +490,16 @@ defmodule Pleroma.Web.ActivityPub.Utils do def make_unlike_data( %User{ap_id: ap_id} = user, - %Activity{data: %{"context" => context}} = activity, + %Activity{data: %{"context" => context, "object" => object}} = activity, activity_id ) do + object = Object.normalize(object) + %{ "type" => "Undo", "actor" => ap_id, "object" => activity.data, - "to" => [user.follower_address, activity.data["actor"]], + "to" => [user.follower_address, object.data["actor"]], "cc" => [Pleroma.Constants.as_public()], "context" => context } |