hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

salmon: refactor to work as a federator publishing module

Browse source
This commit is contained in:
William Pitcock 2019-05-12 04:27:01 +00:00
commit 179293e51c
3 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/pleroma/web/federator/federator.ex
View file

@ -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.Salmon
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
def publish_single_salmon(params) do
PleromaJobQueue.enqueue(:federator_outgoing, __MODULE__, [:publish_single_salmon, params])
end
# 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)
Logger.info(fn -> "Sending #{activity.data["id"]} out via Salmon" end)
Pleroma.Web.Salmon.publish(actor, activity)
end
end
@ -143,10 +135,6 @@ defmodule Pleroma.Web.Federator do
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