nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Handle webpubs in queue.

Browse source
This commit is contained in:
Roger Braun 2017-06-23 16:37:34 +02:00
parent 6ee0ca21e2
commit ffc9d7708b
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ defmodule Pleroma.Web.Federator do
@websub Application.get_env(:pleroma, :websub) @websub Application.get_env(:pleroma, :websub)
@ostatus Application.get_env(:pleroma, :ostatus) @ostatus Application.get_env(:pleroma, :ostatus)
@httpoison Application.get_env(:pleroma, :httpoison)
@max_jobs 10 @max_jobs 10
def start_link do def start_link do
@ -47,6 +48,20 @@ def handle(:incoming_doc, doc) do
@ostatus.handle_incoming(doc) @ostatus.handle_incoming(doc)
end end
def handle(:publish_single_websub, %{xml: xml, topic: topic, callback: callback, secret: secret}) do
signature = @websub.sign(secret || "", xml)
Logger.debug(fn -> "Pushing #{topic} to #{callback}" end)
with {:ok, %{status_code: code}} <- @httpoison.post(callback, xml, [
{"Content-Type", "application/atom+xml"},
{"X-Hub-Signature", "sha1=#{signature}"}
], timeout: 10000, recv_timeout: 20000) do
Logger.debug(fn -> "Pushed to #{callback}, code #{code}" end)
else e ->
Logger.debug(fn -> "Couldn't push to #{callback}, #{inspect(e)}" end)
end
end
def handle(type, payload) do def handle(type, payload) do
Logger.debug(fn -> "Unknown task: #{type}" end) Logger.debug(fn -> "Unknown task: #{type}" end)
{:error, "Don't know what do do with this"} {:error, "Don't know what do do with this"}

20
lib/pleroma/web/websub/websub.ex
View file

@ -49,19 +49,13 @@ def publish(topic, user, activity) do
|> :xmerl.export_simple(:xmerl_xml) |> :xmerl.export_simple(:xmerl_xml)
|> to_string |> to_string
signature = sign(sub.secret || "", response) data = %{
Logger.debug(fn -> "Pushing #{topic} to #{sub.callback}" end) xml: response,
topic: topic,
Task.start(fn -> callback: sub.callback,
with {:ok, %{status_code: code}} <- @httpoison.post(sub.callback, response, [ secret: sub.secret
{"Content-Type", "application/atom+xml"}, }
{"X-Hub-Signature", "sha1=#{signature}"} Pleroma.Web.Federator.enqueue(:publish_single_websub, data)
], timeout: 10000, recv_timeout: 20000) do
Logger.debug(fn -> "Pushed to #{sub.callback}, code #{code}" end)
else e ->
Logger.debug(fn -> "Couldn't push to #{sub.callback}, #{inspect(e)}" end)
end
end)
end) end)
end end