X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Futils.ex;h=f98545336f3efcc14998077b37803e7fc6ab4af4;hb=2d775bf1be5ddf0a8c5553ef15dde55c2483c1d4;hp=c9d0e45b2db432c3b5158ac4b9e12b871e81ed52;hpb=e981280fa74ddccb02c7deb27bd5cc5e85f9fc8f;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index c9d0e45b2..f98545336 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -284,16 +284,19 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   """
   def make_unannounce_data(
         %User{ap_id: ap_id} = user,
-        %Activity{data: %{"id" => id, "context" => context}} = activity
+        %Activity{data: %{"context" => context}} = activity,
+        activity_id
       ) do
-    %{
+    data = %{
       "type" => "Undo",
       "actor" => ap_id,
-      "object" => id,
+      "object" => activity.data,
       "to" => [user.follower_address, activity.data["actor"]],
       "cc" => ["https://www.w3.org/ns/activitystreams#Public"],
       "context" => context
     }
+
+    if activity_id, do: Map.put(data, "id", activity_id), else: data
   end
 
   def add_announce_to_object(%Activity{data: %{"actor" => actor}}, object) do