aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-03-07 11:31:08 +0000
committerrinpatch <rinpatch@sdf.org>2019-03-07 11:31:08 +0000
commit992145e64ce40ca8eb85367c78df1696ad0e414c (patch)
tree8a65ba69a0c4df507aeaa877ca1765d3e07c8f64 /lib
parented5a1bbdfcc8b85330c7d4c8f8e08b6c2599ffa5 (diff)
parentc2faae70dfc138efbeb3edccf97c22c2546a665a (diff)
downloadpleroma-992145e64ce40ca8eb85367c78df1696ad0e414c.tar.gz
Merge branch 'bugfix/delete-activity-audience' into 'develop'
expand the audience of delete activities to all recipients of the deleted object Closes #682 See merge request pleroma/pleroma!891
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 783491b67..adb42b9ab 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -309,12 +309,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
def delete(%Object{data: %{"id" => id, "actor" => actor}} = object, local \\ true) do
user = User.get_cached_by_ap_id(actor)
+ to = object.data["to"] || [] ++ object.data["cc"] || []
data = %{
"type" => "Delete",
"actor" => actor,
"object" => id,
- "to" => [user.follower_address, "https://www.w3.org/ns/activitystreams#Public"]
+ "to" => to
}
with {:ok, _} <- Object.delete(object),