From f0798440de96139f5717e90582e41ddb6ce5a0ce Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@firemail.cc>
Date: Fri, 20 Apr 2018 23:22:16 -0400
Subject: [PATCH] Use correct activity for undo

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 2 +-
 lib/pleroma/web/activity_pub/utils.ex        | 4 ++--
 test/web/activity_pub/activity_pub_test.exs  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 215ddc57a..ace230804 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -142,7 +142,7 @@ def announce(
 
   def unannounce(%User{} = actor, %Object{} = object, local \\ true) do
     with %Activity{} = activity <- get_existing_announce(actor.ap_id, object),
-         unannounce_data <- make_unannounce_data(actor, object),
+         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 1f740eda5..9e2fa1fb2 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -283,13 +283,13 @@ def make_announce_data(
   """
   def make_unannounce_data(
         %User{ap_id: ap_id} = user,
-        %Object{data: %{"id" => id, "context" => context}} = object
+        %Activity{data: %{"id" => id, "context" => context}} = activity
       ) do
     %{
       "type" => "Undo",
       "actor" => ap_id,
       "object" => id,
-      "to" => [user.follower_address, object.data["actor"]],
+      "to" => [user.follower_address, activity.data["actor"]],
       "cc" => ["https://www.w3.org/ns/activitystreams#Public"],
       "context" => context
     }
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index 6a07da775..e3258ed4e 100644
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -291,12 +291,12 @@ test "unannouncing a previously announced object" do
 
       assert unannounce_activity.data["to"] == [
                User.ap_followers(user),
-               note_activity.data["actor"]
+               announce_activity.data["actor"]
       ]
       assert unannounce_activity.data["type"] == "Undo"
-      assert unannounce_activity.data["object"] == object.data["id"]
+      assert unannounce_activity.data["object"] == announce_activity.data["id"]
       assert unannounce_activity.data["actor"] == user.ap_id
-      assert unannounce_activity.data["context"] == object.data["context"]
+      assert unannounce_activity.data["context"] == announce_activity.data["context"]
 
       assert Repo.get(Activity, announce_activity.id) == nil
     end