salmon: refactor to work as a federator publishing module

diff --git a/config/config.exs b/config/config.exs
index 37803383ae41bfc7df056c139d05bbe214ec6078..3dcff3c4675e8be50cac47e6c5311520b73839ad 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -213,7 +213,8 @@ config :pleroma, :instance,
   federating: true,
   federation_reachability_timeout_days: 7,
   federation_publisher_modules: [
   federating: true,
   federation_reachability_timeout_days: 7,
   federation_publisher_modules: [

-    Pleroma.Web.ActivityPub.Publisher
+    Pleroma.Web.ActivityPub.Publisher,
+    Pleroma.Web.Salmon

   ],
   allow_relay: true,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
   ],
   allow_relay: true,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 252d3b0095175d45293c7896b320fe3af12cc43c..c9b2459337be538ff37c815ad49003d3d8e5f688 100644 (file)
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -13,7 +13,6 @@ defmodule Pleroma.Web.Federator do
   alias Pleroma.Web.Federator.Publisher
   alias Pleroma.Web.Federator.RetryQueue
   alias Pleroma.Web.OStatus
   alias Pleroma.Web.Federator.Publisher
   alias Pleroma.Web.Federator.RetryQueue
   alias Pleroma.Web.OStatus

-  alias Pleroma.Web.Salmon

   alias Pleroma.Web.WebFinger
   alias Pleroma.Web.Websub
 
   alias Pleroma.Web.WebFinger
   alias Pleroma.Web.Websub
 


@@ -58,10 +57,6 @@ defmodule Pleroma.Web.Federator do
     PleromaJobQueue.enqueue(:federator_outgoing, __MODULE__, [:refresh_subscriptions])
   end
 
     PleromaJobQueue.enqueue(:federator_outgoing, __MODULE__, [:refresh_subscriptions])
   end
 

-  def publish_single_salmon(params) do
-    PleromaJobQueue.enqueue(:federator_outgoing, __MODULE__, [:publish_single_salmon, params])
-  end
-

   # Job Worker Callbacks
 
   def perform(:refresh_subscriptions) do
   # Job Worker Callbacks
 
   def perform(:refresh_subscriptions) do


@@ -95,9 +90,6 @@ defmodule Pleroma.Web.Federator do
         if OStatus.is_representable?(activity) do
           Logger.info(fn -> "Sending #{activity.data["id"]} out via WebSub" end)
           Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)
         if OStatus.is_representable?(activity) do
           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
       end
 
         end
       end
 


@@ -143,10 +135,6 @@ defmodule Pleroma.Web.Federator do
     end
   end
 
     end
   end
 

-  def perform(:publish_single_salmon, params) do
-    Salmon.send_to_user(params)
-  end
-

   def perform(
         :publish_single_websub,
         %{xml: _xml, topic: _topic, callback: _callback, secret: _secret} = params
   def perform(
         :publish_single_websub,
         %{xml: _xml, topic: _topic, callback: _callback, secret: _secret} = params

diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex
index 0a9e51656db5e9fb56bb768c81694976a257ccb9..7b59609c0a8a3633925c1f1260e62db9fe8cce44 100644 (file)
--- a/lib/pleroma/web/salmon/salmon.ex
+++ b/lib/pleroma/web/salmon/salmon.ex
@@ -3,12 +3,17 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.Salmon do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.Salmon do

+  @behaviour Pleroma.Web.Federator.Publisher
+

   @httpoison Application.get_env(:pleroma, :httpoison)
 
   use Bitwise
 
   @httpoison Application.get_env(:pleroma, :httpoison)
 
   use Bitwise
 

+  alias Pleroma.Activity

   alias Pleroma.Instances
   alias Pleroma.User
   alias Pleroma.Instances
   alias Pleroma.User

+  alias Pleroma.Web.ActivityPub.Visibility
+  alias Pleroma.Web.Federator.Publisher

   alias Pleroma.Web.OStatus.ActivityRepresenter
   alias Pleroma.Web.XML
 
   alias Pleroma.Web.OStatus.ActivityRepresenter
   alias Pleroma.Web.XML
 


@@ -165,12 +170,12 @@ defmodule Pleroma.Web.Salmon do
   end
 
   @doc "Pushes an activity to remote account."
   end
 
   @doc "Pushes an activity to remote account."

-  def send_to_user(%{recipient: %{info: %{salmon: salmon}}} = params),
-    do: send_to_user(Map.put(params, :recipient, salmon))
+  def publish_one(%{recipient: %{info: %{salmon: salmon}}} = params),
+    do: publish_one(Map.put(params, :recipient, salmon))

 
 

-  def send_to_user(%{recipient: url, feed: feed, poster: poster} = params) when is_binary(url) do
+  def publish_one(%{recipient: url, feed: feed} = params) when is_binary(url) do

     with {:ok, %{status: code}} when code in 200..299 <-
     with {:ok, %{status: code}} when code in 200..299 <-

-           poster.(
+           @httpoison.post(

              url,
              feed,
              [{"Content-Type", "application/magic-envelope+xml"}]
              url,
              feed,
              [{"Content-Type", "application/magic-envelope+xml"}]


@@ -184,11 +189,11 @@ defmodule Pleroma.Web.Salmon do
       e ->
         unless params[:unreachable_since], do: Instances.set_reachable(url)
         Logger.debug(fn -> "Pushing Salmon to #{url} failed, #{inspect(e)}" end)
       e ->
         unless params[:unreachable_since], do: Instances.set_reachable(url)
         Logger.debug(fn -> "Pushing Salmon to #{url} failed, #{inspect(e)}" end)

-        :error
+        {:error, "Unreachable instance"}

     end
   end
 
     end
   end
 

-  def send_to_user(_), do: :noop
+  def publish_one(_), do: :noop

 
   @supported_activities [
     "Create",
 
   @supported_activities [
     "Create",


@@ -199,13 +204,19 @@ defmodule Pleroma.Web.Salmon do
     "Delete"
   ]
 
     "Delete"
   ]
 

+  def is_representable?(%Activity{data: %{"type" => type}} = activity)
+      when type in @supported_activities,
+      do: Visibility.is_public?(activity)
+
+  def is_representable?(_), do: false
+

   @doc """
   Publishes an activity to remote accounts
   """
   @doc """
   Publishes an activity to remote accounts
   """

-  @spec publish(User.t(), Pleroma.Activity.t(), Pleroma.HTTP.t()) :: none
-  def publish(user, activity, poster \\ &@httpoison.post/3)
+  @spec publish(User.t(), Pleroma.Activity.t()) :: none
+  def publish(user, activity)

 
 

-  def publish(%{info: %{keys: keys}} = user, %{data: %{"type" => type}} = activity, poster)
+  def publish(%{info: %{keys: keys}} = user, %{data: %{"type" => type}} = activity)

       when type in @supported_activities do
     feed = ActivityRepresenter.to_simple_form(activity, user, true)
 
       when type in @supported_activities do
     feed = ActivityRepresenter.to_simple_form(activity, user, true)
 


@@ -229,15 +240,14 @@ defmodule Pleroma.Web.Salmon do
       |> Enum.each(fn remote_user ->
         Logger.debug(fn -> "Sending Salmon to #{remote_user.ap_id}" end)
 
       |> Enum.each(fn remote_user ->
         Logger.debug(fn -> "Sending Salmon to #{remote_user.ap_id}" end)
 

-        Pleroma.Web.Federator.publish_single_salmon(%{
+        Publisher.enqueue_one(__MODULE__, %{

           recipient: remote_user,
           feed: feed,
           recipient: remote_user,
           feed: feed,

-          poster: poster,

           unreachable_since: reachable_urls_metadata[remote_user.info.salmon]
         })
       end)
     end
   end
 
           unreachable_since: reachable_urls_metadata[remote_user.info.salmon]
         })
       end)
     end
   end
 

-  def publish(%{id: id}, _, _), do: Logger.debug(fn -> "Keys missing for user #{id}" end)
+  def publish(%{id: id}, _), do: Logger.debug(fn -> "Keys missing for user #{id}" end)

 end
 end