Add banner image to user json.

[akkoma] / lib / pleroma / web / federator / federator.ex

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 042c202be5c294d2a125ae7ccedd490d27fbc674..0b9808b8f919ed1e02ce45b578de2b5c88791382 100644 (file)
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -1,8 +1,10 @@
 defmodule Pleroma.Web.Federator do
   use GenServer
   alias Pleroma.User
+  alias Pleroma.Activity
   alias Pleroma.Web.{WebFinger, Websub}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Transmogrifier
   require Logger
 
   @websub Application.get_env(:pleroma, :websub)
@@ -44,14 +46,14 @@ defmodule Pleroma.Web.Federator do
     with actor when not is_nil(actor) <- User.get_cached_by_ap_id(activity.data["actor"]) do
       {:ok, actor} = WebFinger.ensure_keys_present(actor)
       if ActivityPub.is_public?(activity) do
-        Logger.debug(fn -> "Sending #{activity.data["id"]} out via salmon" end)
-        Pleroma.Web.Salmon.publish(actor, activity)
-
-        Logger.debug(fn -> "Sending #{activity.data["id"]} out via websub" end)
+        Logger.info(fn -> "Sending #{activity.data["id"]} out via websub" end)
         Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)
+
+        Logger.info(fn -> "Sending #{activity.data["id"]} out via salmon" end)
+        Pleroma.Web.Salmon.publish(actor, activity)
       end
 
-      Logger.debug(fn -> "Sending #{activity.data["id"]} out via AP" end)
+      Logger.info(fn -> "Sending #{activity.data["id"]} out via AP" end)
       Pleroma.Web.ActivityPub.ActivityPub.publish(actor, activity)
     end
   end
@@ -62,10 +64,29 @@ defmodule Pleroma.Web.Federator do
   end
 
   def handle(:incoming_doc, doc) do
-    Logger.debug("Got document, trying to parse")
+    Logger.info("Got document, trying to parse")
     @ostatus.handle_incoming(doc)
   end
 
+  def handle(:incoming_ap_doc, params) do
+    Logger.info("Handling incoming ap activity")
+    with {:ok, _user} <- ap_enabled_actor(params["actor"]),
+         nil <- Activity.get_by_ap_id(params["id"]),
+         {:ok, activity} <- Transmogrifier.handle_incoming(params) do
+    else
+      %Activity{} ->
+        Logger.info("Already had #{params["id"]}")
+      e ->
+        # Just drop those for now
+        Logger.info("Unhandled activity")
+        Logger.info(Poison.encode!(params, [pretty: 2]))
+    end
+  end
+
+  def handle(:publish_single_ap, params) do
+    ActivityPub.publish_one(params)
+  end
+
   def handle(:publish_single_websub, %{xml: xml, topic: topic, callback: callback, secret: secret}) do
     signature = @websub.sign(secret || "", xml)
     Logger.debug(fn -> "Pushing #{topic} to #{callback}" end)
@@ -104,7 +125,7 @@ defmodule Pleroma.Web.Federator do
     end
   end
 
-  def handle_cast({:enqueue, type, payload, priority}, state) when type in [:incoming_doc] do
+  def handle_cast({:enqueue, type, payload, priority}, state) when type in [:incoming_doc, :incoming_ap_doc] do
     %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state
     i_queue = enqueue_sorted(i_queue, {type, payload}, 1)
     {i_running_jobs, i_queue} = maybe_start_job(i_running_jobs, i_queue)
@@ -141,4 +162,13 @@ defmodule Pleroma.Web.Federator do
   def queue_pop([%{item: element} | queue]) do
     {element, queue}
   end
+
+  def ap_enabled_actor(id) do
+    user = User.get_by_ap_id(id)
+    if User.ap_enabled?(user) do
+      {:ok, user}
+    else
+      ActivityPub.make_user_from_ap_id(id)
+    end
+  end
 end