From: Francis Dinh <normandy@firemail.cc>
Date: Wed, 9 May 2018 03:59:36 +0000 (-0400)
Subject: Change argument order and call correct # of args
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=54f6628590414193b9eda347be9def924783b115;p=akkoma

Change argument order and call correct # of args
---

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 334cfcc5b..95671ec3b 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -148,8 +148,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   def unannounce(
         %User{} = actor,
         %Object{} = object,
-        local \\ true,
-        activity_id \\ nil
+        activity_id \\ nil,
+        local \\ true
       ) do
     with %Activity{} = announce_activity <- get_existing_announce(actor.ap_id, object),
          unannounce_data <- make_unannounce_data(actor, announce_activity, activity_id),
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 8785ddaa9..f8fb79ac0 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -231,7 +231,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
          {:ok, object} <-
            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}
     else
       e -> :error