From 0afc8d7856c9fe37de338d1e9365563d986c9319 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sun, 12 May 2019 03:43:53 +0000
Subject: [PATCH] federator: publisher: integrate job queue, simplify
 publish_one logic

---
 lib/pleroma/web/federator/publisher.ex | 29 +++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/lib/pleroma/web/federator/publisher.ex b/lib/pleroma/web/federator/publisher.ex
index 36277fd7e..2e533ae94 100644
--- a/lib/pleroma/web/federator/publisher.ex
+++ b/lib/pleroma/web/federator/publisher.ex
@@ -3,6 +3,10 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.Federator.Publisher do
+  alias Pleroma.Web.Federator.RetryQueue
+
+  require Logger
+
   @moduledoc """
   Defines the contract used by federation implementations to publish messages to
   their peers.
@@ -24,15 +28,26 @@ defmodule Pleroma.Web.Federator.Publisher do
   """
   @callback publish(Pleroma.User.t(), Pleroma.Activity.t()) :: :ok | {:error, any()}
 
-  @doc """
-  Enqueues work generated by the federation module.
-  """
-  @spec enqueue(module(), keyword()) :: :ok
-  def enqueue(module, args), do: PleromaJobQueue.enqueue(:federation_outgoing, module, args)
-
   @doc """
   Enqueue publishing a single activity.
   """
   @spec enqueue_one(module(), Map.t()) :: :ok
-  def enqueue_one(module, %{} = args), do: enqueue(module, [:publish_one, args])
+  def enqueue_one(module, %{} = params),
+    do: PleromaJobQueue.enqueue(:federation_outgoing, __MODULE__, [:publish_one, module, params])
+
+  @spec perform(atom(), module(), any()) :: {:ok, any()} | {:error, any()}
+  def perform(:publish_one, module, params) do
+    case apply(module, :publish_one, [params]) do
+      {:ok, _} ->
+        :ok
+
+      {:error, _} ->
+        RetryQueue.enqueue(params, module)
+    end
+  end
+
+  def perform(type, _, _) do
+    Logger.debug("Unknown task: #{type}")
+    {:error, "Don't know what to do with this"}
+  end
 end
-- 
2.45.2