Add federated blocks

[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 01b3eab27593657bdc538badb457ac750561a287..cc0033a5fca6938075a22e731a6344614879612d 100644 (file)
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -72,9 +72,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
       |> Enum.reduce(%{}, fn data, mapping ->
         name = data["name"]
 
-        if String.starts_with?(name, ":") do
-          name = name |> String.slice(1..-2)
-        end
+        name =
+          if String.starts_with?(name, ":") do
+            name |> String.slice(1..-2)
+          else
+            name
+          end
 
         mapping |> Map.put(name, data["icon"]["url"])
       end)
@@ -220,9 +223,63 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     end
   end
 
+  def handle_incoming(
+        %{
+          "type" => "Undo",
+          "object" => %{"type" => "Announce", "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.unannounce(actor, object, id, false) do
+      {:ok, activity}
+    else
+      e -> :error
+    end
+  end
+
+  def handle_incoming(
+        %{
+          "type" => "Undo",
+          "object" => %{"type" => "Follow", "object" => followed},
+          "actor" => follower,
+          "id" => id
+        } = data
+      ) 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
+      User.unfollow(follower, followed)
+      {:ok, activity}
+    else
+      e -> :error
+    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
+      User.unfollow(follower, followed)
+      User.block(blocker, blocked.ap_id)
+      {:ok, activity}
+    else
+      e -> :error
+    end
+  end
   # TODO
   # Accept
-  # Undo
+  # Undo for non-Announce
 
   def handle_incoming(_), do: :error
 
@@ -254,10 +311,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     |> set_reply_to_uri
   end
 
-  @doc
-  _ = """
-  internal -> Mastodon
-  """
+  #  @doc
+  #  """
+  #  internal -> Mastodon
+  #  """
 
   def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
     object =