diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-04 21:29:01 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-04 21:29:01 +0000 |
| commit | 923dff21b3feeecd17752005f7f7a97862a92e00 (patch) | |
| tree | 8f5bf9051cfff9e8d5e0b1f3bd61b5354bf456fe /lib | |
| parent | 4d38e4855820786bfa1dc7fc58d7ff78728e3ab6 (diff) | |
| parent | 0f1486ed4eeeff6a873f6050ea5fae0fdcc1c655 (diff) | |
| download | pleroma-923dff21b3feeecd17752005f7f7a97862a92e00.tar.gz | |
Merge branch 'backport/undo-fixes' into 'maint/1.1'
backport: undo fixes
See merge request pleroma/pleroma!1789
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 } |