Merge branch 'fix/activitypub-user-view-badmap' into 'develop'

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

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index ac3d7c1323dcc5e3e9469905753891e899405cc3..bb7676cf00be5ab0b1d22c3fa9b5f33cc45f6a62 100644 (file)
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -1,8 +1,12 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.Federator do
   use GenServer
   alias Pleroma.User
   alias Pleroma.Activity
-  alias Pleroma.Web.{WebFinger, Websub}
+  alias Pleroma.Web.{WebFinger, Websub, Salmon}
   alias Pleroma.Web.Federator.RetryQueue
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.Relay
@@ -13,8 +17,6 @@ defmodule Pleroma.Web.Federator do
 
   @websub Application.get_env(:pleroma, :websub)
   @ostatus Application.get_env(:pleroma, :ostatus)
-  @httpoison Application.get_env(:pleroma, :httpoison)
-  @max_jobs 20
 
   def init(args) do
     {:ok, args}
@@ -122,6 +124,10 @@ defmodule Pleroma.Web.Federator do
     end
   end
 
+  def handle(:publish_single_salmon, params) do
+    Salmon.send_to_user(params)
+  end
+
   def handle(:publish_single_ap, params) do
     case ActivityPub.publish_one(params) do
       {:ok, _} ->
@@ -134,7 +140,7 @@ defmodule Pleroma.Web.Federator do
 
   def handle(
         :publish_single_websub,
-        %{xml: xml, topic: topic, callback: callback, secret: secret} = params
+        %{xml: _xml, topic: _topic, callback: _callback, secret: _secret} = params
       ) do
     case Websub.publish_one(params) do
       {:ok, _} ->
@@ -151,7 +157,7 @@ defmodule Pleroma.Web.Federator do
   end
 
   if Mix.env() == :test do
-    def enqueue(type, payload, priority \\ 1) do
+    def enqueue(type, payload, _priority \\ 1) do
       if Pleroma.Config.get([:instance, :federating]) do
         handle(type, payload)
       end
@@ -165,7 +171,7 @@ defmodule Pleroma.Web.Federator do
   end
 
   def maybe_start_job(running_jobs, queue) do
-    if :sets.size(running_jobs) < @max_jobs && queue != [] do
+    if :sets.size(running_jobs) < Pleroma.Config.get([__MODULE__, :max_jobs]) && queue != [] do
       {{type, payload}, queue} = queue_pop(queue)
       {:ok, pid} = Task.start(fn -> handle(type, payload) end)
       mref = Process.monitor(pid)