ActivityPub: Send out Accept after Follow.

[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 f4af3aed35b82570d30b39e813d47ded09892dd7..76f04e8a3f7b2d61f00be0df2d81e676dfd33ea4 100644 (file)
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -38,11 +38,11 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     end
   end
 
-  def handle_incoming(%{"type" => "Follow", "object" => followed, "actor" => follower, "id" => id}) do
-    with %User{} = followed <- User.get_cached_by_ap_id(followed),
+  def handle_incoming(%{"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.follow(follower, followed, id, false) do
-      # TODO: Send an "Accept" activity.
+      ActivityPub.accept(%{to: [follower.ap_id], actor: followed.ap_id, object: data, local: true})
       User.follow(follower, followed)
       {:ok, activity}
     else
@@ -68,6 +68,13 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     {:ok, data}
   end
 
+  def prepare_outgoing(%{"type" => type} = data) when type in ["Follow", "Accept"] do
+    data = data
+    |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
+
+    {:ok, data}
+  end
+
   def add_mention_tags(object) do
     mentions = object["to"]
     |> Enum.map(fn (ap_id) -> User.get_cached_by_ap_id(ap_id) end)