Expand "to" of delete activities

This commit is contained in:
Karen Konou 2019-03-04 10:47:04 +01:00
parent dd5865535e
commit aab86698a5
2 changed files with 14 additions and 1 deletions

View File

@ -310,11 +310,14 @@ def unfollow(follower, followed, activity_id \\ nil, local \\ true) do
def delete(%Object{data: %{"id" => id, "actor" => actor}} = object, local \\ true) do def delete(%Object{data: %{"id" => id, "actor" => actor}} = object, local \\ true) do
user = User.get_cached_by_ap_id(actor) user = User.get_cached_by_ap_id(actor)
to = object.data["to"] || [] ++ object.data["cc"] ||
[] ++ [user.follower_address, "https://www.w3.org/ns/activitystreams#Public"]
data = %{ data = %{
"type" => "Delete", "type" => "Delete",
"actor" => actor, "actor" => actor,
"object" => id, "object" => id,
"to" => [user.follower_address, "https://www.w3.org/ns/activitystreams#Public"] "to" => Enum.uniq(to)
} }
with {:ok, _} <- Object.delete(object), with {:ok, _} <- Object.delete(object),

View File

@ -691,6 +691,16 @@ test "decrements user note count only for public activities" do
user = Repo.get(User, user.id) user = Repo.get(User, user.id)
assert user.info.note_count == 10 assert user.info.note_count == 10
end end
test "it creates a delete activity and checks that it is also sent to users mentioned by the deleted object" do
user = insert(:user)
note = insert(:note_activity)
object = Object.get_by_ap_id(note.data["object"]["id"])
object = Kernel.put_in(object.data["to"], [user.ap_id])
{:ok, delete} = ActivityPub.delete(object)
assert user.ap_id in delete.data["to"]
end
end end
describe "timeline post-processing" do describe "timeline post-processing" do