Merge branch 'feature/jobs' 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 37100c9e6277f0fdabb7dced65ea42df0dff9ce1..d4e2a97422e59dd0a680be3bbef31e494d688c8a 100644 (file)
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -3,16 +3,19 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.Federator do
-  alias Pleroma.User
   alias Pleroma.Activity
-  alias Pleroma.Jobs
-  alias Pleroma.Web.{WebFinger, Websub, Salmon}
-  alias Pleroma.Web.Federator.RetryQueue
+  alias Pleroma.User
+  alias Pleroma.Web.WebFinger
+  alias Pleroma.Web.Websub
+  alias Pleroma.Web.Salmon
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.Relay
   alias Pleroma.Web.ActivityPub.Transmogrifier
   alias Pleroma.Web.ActivityPub.Utils
+  alias Pleroma.Web.Federator.RetryQueue
   alias Pleroma.Web.OStatus
+  alias Pleroma.Jobs
+
   require Logger
 
   @websub Application.get_env(:pleroma, :websub)
@@ -35,31 +38,31 @@ defmodule Pleroma.Web.Federator do
   end
 
   def publish(activity, priority \\ 1) do
-    Jobs.enqueue(:federator_out, __MODULE__, [:publish, activity], priority)
+    Jobs.enqueue(:federator_outgoing, __MODULE__, [:publish, activity], priority)
   end
 
   def publish_single_ap(params) do
-    Jobs.enqueue(:federator_out, __MODULE__, [:publish_single_ap, params])
+    Jobs.enqueue(:federator_outgoing, __MODULE__, [:publish_single_ap, params])
   end
 
   def publish_single_websub(websub) do
-    Jobs.enqueue(:federator_out, __MODULE__, [:publish_single_websub, websub])
+    Jobs.enqueue(:federator_outgoing, __MODULE__, [:publish_single_websub, websub])
   end
 
   def verify_websub(websub) do
-    Jobs.enqueue(:federator_out, __MODULE__, [:verify_websub, websub])
+    Jobs.enqueue(:federator_outgoing, __MODULE__, [:verify_websub, websub])
   end
 
   def request_subscription(sub) do
-    Jobs.enqueue(:federator_out, __MODULE__, [:request_subscription, sub])
+    Jobs.enqueue(:federator_outgoing, __MODULE__, [:request_subscription, sub])
   end
 
   def refresh_subscriptions() do
-    Jobs.enqueue(:federator_out, __MODULE__, [:refresh_subscriptions])
+    Jobs.enqueue(:federator_outgoing, __MODULE__, [:refresh_subscriptions])
   end
 
   def publish_single_salmon(params) do
-    Jobs.enqueue(:federator_out, __MODULE__, [:publish_single_salmon, params])
+    Jobs.enqueue(:federator_outgoing, __MODULE__, [:publish_single_salmon, params])
   end
 
   # Job Worker Callbacks