projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/theora-detection-read-bytes' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
federator
/
federator.ex
diff --git
a/lib/pleroma/web/federator/federator.ex
b/lib/pleroma/web/federator/federator.ex
index ac3d7c1323dcc5e3e9469905753891e899405cc3..a9c7aecd52da40d72fe760820722c246e6430859 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
@websub Application.get_env(:pleroma, :websub)
@ostatus Application.get_env(:pleroma, :ostatus)
@websub Application.get_env(:pleroma, :websub)
@ostatus Application.get_env(:pleroma, :ostatus)
- @httpoison Application.get_env(:pleroma, :httpoison)
@max_jobs 20
def init(args) do
@max_jobs 20
def init(args) do
@@
-134,7
+133,7
@@
defmodule Pleroma.Web.Federator do
def handle(
:publish_single_websub,
def handle(
:publish_single_websub,
- %{xml:
xml, topic: topic, callback: callback, secret:
secret} = params
+ %{xml:
_xml, topic: _topic, callback: _callback, secret: _
secret} = params
) do
case Websub.publish_one(params) do
{:ok, _} ->
) do
case Websub.publish_one(params) do
{:ok, _} ->
@@
-151,7
+150,7
@@
defmodule Pleroma.Web.Federator do
end
if Mix.env() == :test do
end
if Mix.env() == :test do
- def enqueue(type, payload, priority \\ 1) do
+ def enqueue(type, payload,
_
priority \\ 1) do
if Pleroma.Config.get([:instance, :federating]) do
handle(type, payload)
end
if Pleroma.Config.get([:instance, :federating]) do
handle(type, payload)
end