Salmon# fixed publish an activity to remote accounts

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 34b665765cabd468ef15859c3429e7080ab0f0fe..a14d1e8c6ddadb2638160bafa41f9890e611d4ba 100644 (file)
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -7,6 +7,8 @@ defmodule Pleroma.Activity do
   alias Pleroma.{Repo, Activity, Notification}
   import Ecto.Query
 
   alias Pleroma.{Repo, Activity, Notification}
   import Ecto.Query
 

+  @type t :: %__MODULE__{}
+

   # https://github.com/tootsuite/mastodon/blob/master/app/models/notification.rb#L19
   @mastodon_notification_types %{
     "Create" => "mention",
   # https://github.com/tootsuite/mastodon/blob/master/app/models/notification.rb#L19
   @mastodon_notification_types %{
     "Create" => "mention",

diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index e572dfedf67657c3d580561572a71e1ba08853b7..32d9cf5aa7806efdcc50b08f40cb164bb6f17e18 100644 (file)
--- a/lib/pleroma/http/http.ex
+++ b/lib/pleroma/http/http.ex
@@ -10,6 +10,8 @@ defmodule Pleroma.HTTP do
   alias Pleroma.HTTP.Connection
   alias Pleroma.HTTP.RequestBuilder, as: Builder
 
   alias Pleroma.HTTP.Connection
   alias Pleroma.HTTP.RequestBuilder, as: Builder
 

+  @type t :: __MODULE__
+

   @doc """
   Builds and perform http request.
 
   @doc """
   Builds and perform http request.
 

diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex
index 1dc514976f30c4ba2df14385f0d00e46e6245c90..f7d2257eb5f1d4c372946a4627028b80cb5277b5 100644 (file)
--- a/lib/pleroma/web/salmon/salmon.ex
+++ b/lib/pleroma/web/salmon/salmon.ex
@@ -161,16 +161,21 @@ defmodule Pleroma.Web.Salmon do
     |> Enum.filter(fn user -> user && !user.local end)
   end
 
     |> Enum.filter(fn user -> user && !user.local end)
   end
 

-  defp send_to_user(%{info: %{salmon: salmon}}, feed, poster) do
+  # push an activity to remote accounts
+  #
+  defp send_to_user(%{info: %{salmon: salmon}}, feed, poster),
+    do: send_to_user(salmon, feed, poster)
+
+  defp send_to_user(url, feed, poster) when is_binary(url) do

     with {:ok, %{status: code}} <-
            poster.(
     with {:ok, %{status: code}} <-
            poster.(

-             salmon,
+             url,

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

-      Logger.debug(fn -> "Pushed to #{salmon}, code #{code}" end)
+      Logger.debug(fn -> "Pushed to #{url}, code #{code}" end)

     else
     else

-      e -> Logger.debug(fn -> "Pushing Salmon to #{salmon} failed, #{inspect(e)}" end)
+      e -> Logger.debug(fn -> "Pushing Salmon to #{url} failed, #{inspect(e)}" end)

     end
   end
 
     end
   end
 


@@ -184,6 +189,11 @@ defmodule Pleroma.Web.Salmon do
     "Undo",
     "Delete"
   ]
     "Undo",
     "Delete"
   ]

+
+  @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)
 
   def publish(%{info: %{keys: keys}} = user, %{data: %{"type" => type}} = activity, poster)
   def publish(user, activity, poster \\ &@httpoison.post/3)
 
   def publish(%{info: %{keys: keys}} = user, %{data: %{"type" => type}} = activity, poster)