diff options
| author | Francis Dinh <normandy@firemail.cc> | 2018-04-22 19:42:28 -0400 |
|---|---|---|
| committer | Francis Dinh <normandy@firemail.cc> | 2018-04-22 19:42:28 -0400 |
| commit | b1742eca4292f99ac256408acf6441d4f3eaa346 (patch) | |
| tree | ee191056fc5e3cce100e5b7219a25537e6323573 | |
| parent | c649ca89586ec83407b298c20f51a25318d777b9 (diff) | |
| download | pleroma-b1742eca4292f99ac256408acf6441d4f3eaa346.tar.gz pleroma-b1742eca4292f99ac256408acf6441d4f3eaa346.zip | |
Revert "Rename make_unannounce_data helper to make_undo_data"
This reverts commit c649ca89586ec83407b298c20f51a25318d777b9.
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/utils.ex | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 0eb5829ef..ace230804 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -142,7 +142,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do def unannounce(%User{} = actor, %Object{} = object, local \\ true) do with %Activity{} = activity <- get_existing_announce(actor.ap_id, object), - unannounce_data <- make_undo_data(actor, activity), + unannounce_data <- make_unannounce_data(actor, activity), {:ok, unannounce_activity} <- insert(unannounce_data, local), :ok <- maybe_federate(activity), {:ok, _activity} <- Repo.delete(activity), diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index d2a421ea4..9e2fa1fb2 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -279,9 +279,9 @@ defmodule Pleroma.Web.ActivityPub.Utils do end @doc """ - Make undo activity data for the given actor and object + Make unannounce activity data for the given actor and object """ - def make_undo_data( + def make_unannounce_data( %User{ap_id: ap_id} = user, %Activity{data: %{"id" => id, "context" => context}} = activity ) do |