fristi/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change argument order and call correct # of args

Browse source
This commit is contained in:
Francis Dinh 2018-05-08 23:59:36 -04:00
parent e55f69a676
commit 54f6628590
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -148,8 +148,8 @@ def announce(
def unannounce( def unannounce(
%User{} = actor, %User{} = actor,
%Object{} = object, %Object{} = object,
local \\ true, activity_id \\ nil,
activity_id \\ nil local \\ true
) do ) do
with %Activity{} = announce_activity <- get_existing_announce(actor.ap_id, object), with %Activity{} = announce_activity <- get_existing_announce(actor.ap_id, object),
unannounce_data <- make_unannounce_data(actor, announce_activity, activity_id), unannounce_data <- make_unannounce_data(actor, announce_activity, activity_id),

2
lib/pleroma/web/activity_pub/transmogrifier.ex
View file

@ -231,7 +231,7 @@ def handle_incoming(
with %User{} = actor <- User.get_or_fetch_by_ap_id(actor), with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
{:ok, object} <- {:ok, object} <-
get_obj_helper(object_id) || ActivityPub.fetch_object_from_id(object_id), get_obj_helper(object_id) || ActivityPub.fetch_object_from_id(object_id),
{:ok, activity} <- ActivityPub.unannounce(object, false) do {:ok, activity} <- ActivityPub.unannounce(actor, object, id, false) do
{:ok, activity} {:ok, activity}
else else
e -> :error e -> :error