ActivityPub: One queue item per server.

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 18c2c190064ddd2a2ae87d4f8408e514f9adaf70..cc20197912485fababc2a7383b80d1920b6b797f 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -2,6 +2,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   alias Pleroma.{Activity, Repo, Object, Upload, User, Notification}
   alias Pleroma.Web.ActivityPub.Transmogrifier
   alias Pleroma.Web.WebFinger
+  alias Pleroma.Web.Federator
   import Ecto.Query
   import Pleroma.Web.ActivityPub.Utils
   require Logger
@@ -305,13 +306,17 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     {:ok, data} = Transmogrifier.prepare_outgoing(activity.data)
     json = Poison.encode!(data)
     Enum.each remote_inboxes, fn(inbox) ->
-      Logger.info("Federating #{activity.data["id"]} to #{inbox}")
-      host = URI.parse(inbox).host
-      signature = Pleroma.Web.HTTPSignatures.sign(actor, %{host: host, "content-length": byte_size(json)})
-      @httpoison.post(inbox, json, [{"Content-Type", "application/activity+json"}, {"signature", signature}])
+      Federator.enqueue(:publish_single_ap, %{inbox: inbox, json: json, actor: actor, id: activity.data["id"]})
     end
   end
 
+  def publish_one(%{inbox: inbox, json: json, actor: actor, id: id}) do
+    Logger.info("Federating #{id} to #{inbox}")
+    host = URI.parse(inbox).host
+    signature = Pleroma.Web.HTTPSignatures.sign(actor, %{host: host, "content-length": byte_size(json)})
+    @httpoison.post(inbox, json, [{"Content-Type", "application/activity+json"}, {"signature", signature}])
+  end
+
   # TODO:
   # This will create a Create activity, which we need internally at the moment.
   def fetch_object_from_id(id) do

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index a13126048b883e1cfd804f6333e8450d829f6b1c..b64b43c5649a80212f3835656037e8ba631917bf 100644 (file)
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -66,6 +66,10 @@ defmodule Pleroma.Web.Federator do
     @ostatus.handle_incoming(doc)
   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)