limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats

Browse source
This commit is contained in:
Francis Dinh 2018-04-25 01:58:50 -04:00
commit 2d775bf1be
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -145,9 +145,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end end
end end
def unannounce(%User{} = actor, %Object{} = object, local \\ true) do def unannounce(
%User{} = actor,
%Object{} = object,
local \\ true,
activity_id \\ nil
) do
with %Activity{} = activity <- get_existing_announce(actor.ap_id, object), with %Activity{} = activity <- get_existing_announce(actor.ap_id, object),
unannounce_data <- make_unannounce_data(actor, activity), unannounce_data <- make_unannounce_data(actor, activity, activity_id),
{:ok, unannounce_activity} <- insert(unannounce_data, local), {:ok, unannounce_activity} <- insert(unannounce_data, local),
:ok <- maybe_federate(activity), :ok <- maybe_federate(activity),
{:ok, _activity} <- Repo.delete(activity), {:ok, _activity} <- Repo.delete(activity),

9
lib/pleroma/web/activity_pub/utils.ex
View file

@ -284,16 +284,19 @@ defmodule Pleroma.Web.ActivityPub.Utils do
""" """
def make_unannounce_data( def make_unannounce_data(
%User{ap_id: ap_id} = user, %User{ap_id: ap_id} = user,
%Activity{data: %{"id" => id, "context" => context}} = activity %Activity{data: %{"context" => context}} = activity,
activity_id
) do ) do
%{ data = %{
"type" => "Undo", "type" => "Undo",
"actor" => ap_id, "actor" => ap_id,
"object" => id, "object" => activity.data,
"to" => [user.follower_address, activity.data["actor"]], "to" => [user.follower_address, activity.data["actor"]],
"cc" => ["https://www.w3.org/ns/activitystreams#Public"], "cc" => ["https://www.w3.org/ns/activitystreams#Public"],
"context" => context "context" => context
} }
if activity_id, do: Map.put(data, "id", activity_id), else: data
end end
def add_announce_to_object(%Activity{data: %{"actor" => actor}}, object) do def add_announce_to_object(%Activity{data: %{"actor" => actor}}, object) do

4
test/web/activity_pub/activity_pub_test.exs
View file

@ -295,9 +295,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
User.ap_followers(user), User.ap_followers(user),
announce_activity.data["actor"] announce_activity.data["actor"]
] ]
assert unannounce_activity.data["type"] == "Undo" assert unannounce_activity.data["type"] == "Undo"
assert unannounce_activity.data["object"] == announce_activity.data["id"] assert unannounce_activity.data["object"] == announce_activity.data
assert unannounce_activity.data["actor"] == user.ap_id assert unannounce_activity.data["actor"] == user.ap_id
assert unannounce_activity.data["context"] == announce_activity.data["context"] assert unannounce_activity.data["context"] == announce_activity.data["context"]