sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Rename make_unannounce_data helper to make_undo_data" 

This reverts commit c649ca8958.
This commit is contained in:
Francis Dinh 2018-04-22 19:42:28 -04:00
parent c649ca8958
commit b1742eca42
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -142,7 +142,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
def unannounce(%User{} = actor, %Object{} = object, local \\ true) do def unannounce(%User{} = actor, %Object{} = object, local \\ true) do
with %Activity{} = activity <- get_existing_announce(actor.ap_id, object), 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, unannounce_activity} <- insert(unannounce_data, local),
:ok <- maybe_federate(activity), :ok <- maybe_federate(activity),
{:ok, _activity} <- Repo.delete(activity), {:ok, _activity} <- Repo.delete(activity),

4
lib/pleroma/web/activity_pub/utils.ex
View File

@ -279,9 +279,9 @@ defmodule Pleroma.Web.ActivityPub.Utils do
end end
@doc """ @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, %User{ap_id: ap_id} = user,
%Activity{data: %{"id" => id, "context" => context}} = activity %Activity{data: %{"id" => id, "context" => context}} = activity
) do ) do