Fix unfollows

[akkoma] / lib / pleroma / web / activity_pub / transmogrifier.ex

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index fe0294c5c5b4080078a077edda91e703f4d0a1c6..20b1603df11075f78cdbd45a1d773741635fa319 100644 (file)
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -251,7 +251,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
       ) do
     with %User{local: true} = followed = User.get_cached_by_ap_id(followed),
          %User{} = follower = User.get_or_fetch_by_ap_id(follower),
-         {:ok, activity} <- ActivityPub.unfollow(follower, followed, false) do
+         {:ok, activity} <- ActivityPub.unfollow(follower, followed, id, false) do
       User.unfollow(follower, followed)
       {:ok, activity}
     else
@@ -259,21 +259,32 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     end
   end
 
-  def handle_incoming(%{"type" => "Undo", "object" => object_id} = data) do
-    object = Object.get_by_ap_id(object_id).data
-    data = Map.put(data, "object", object)
-
-    handle_incoming(data)
-  end
-
   def handle_incoming(
         %{"type" => "Block", "object" => blocked, "actor" => blocker, "id" => id} = data
       ) do
     with %User{local: true} = blocked = User.get_cached_by_ap_id(blocked),
          %User{} = blocker = User.get_or_fetch_by_ap_id(blocker),
-         {:ok, activity} <- ActivityPub.block(blocker, blocked, false) do
+         {:ok, activity} <- ActivityPub.block(blocker, blocked, id, false) do
       User.unfollow(blocker, blocked)
-      User.block(blocker, blocked.ap_id)
+      User.block(blocker, blocked)
+      {:ok, activity}
+    else
+      e -> :error
+    end
+  end
+
+  def handle_incoming(
+        %{
+          "type" => "Undo",
+          "object" => %{"type" => "Like", "object" => object_id},
+          "actor" => actor,
+          "id" => id
+        } = data
+      ) 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.unlike(actor, object, id, false) do
       {:ok, activity}
     else
       e -> :error
@@ -282,7 +293,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
 
   # TODO
   # Accept
-  # Undo for non-Announce
 
   def handle_incoming(_), do: :error
 
@@ -534,4 +544,17 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
       Repo.delete_all(q)
     end
   end
+
+  def maybe_fix_user_url(data) do
+    if is_map(data["url"]) do
+      data = Map.put(data, "url", data["url"]["href"])
+    end
+
+    data
+  end
+
+  def maybe_fix_user_object(data) do
+    data
+    |> maybe_fix_user_url
+  end
 end