projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract apps actions from `MastodonAPIController` to `AppController`
[akkoma]
/
lib
/
pleroma
/
web
/
salmon
/
salmon.ex
diff --git
a/lib/pleroma/web/salmon/salmon.ex
b/lib/pleroma/web/salmon/salmon.ex
index 9fefdbe2566e60d74d90a4e02280f97d5d547e8f..8ba7380c0902b9df9a30a72f1efe5ee02cf64532 100644
(file)
--- a/
lib/pleroma/web/salmon/salmon.ex
+++ b/
lib/pleroma/web/salmon/salmon.ex
@@
-5,11
+5,10
@@
defmodule Pleroma.Web.Salmon do
@behaviour Pleroma.Web.Federator.Publisher
defmodule Pleroma.Web.Salmon do
@behaviour Pleroma.Web.Federator.Publisher
- @httpoison Application.get_env(:pleroma, :httpoison)
-
use Bitwise
alias Pleroma.Activity
use Bitwise
alias Pleroma.Activity
+ alias Pleroma.HTTP
alias Pleroma.Instances
alias Pleroma.Keys
alias Pleroma.User
alias Pleroma.Instances
alias Pleroma.Keys
alias Pleroma.User
@@
-153,7
+152,7
@@
defmodule Pleroma.Web.Salmon do
def publish_one(%{recipient: url, feed: feed} = params) when is_binary(url) do
with {:ok, %{status: code}} when code in 200..299 <-
def publish_one(%{recipient: url, feed: feed} = params) when is_binary(url) do
with {:ok, %{status: code}} when code in 200..299 <-
-
@httpoison
.post(
+
HTTP
.post(
url,
feed,
[{"Content-Type", "application/magic-envelope+xml"}]
url,
feed,
[{"Content-Type", "application/magic-envelope+xml"}]
@@
-162,7
+161,7
@@
defmodule Pleroma.Web.Salmon do
do: Instances.set_reachable(url)
Logger.debug(fn -> "Pushed to #{url}, code #{code}" end)
do: Instances.set_reachable(url)
Logger.debug(fn -> "Pushed to #{url}, code #{code}" end)
- :ok
+ {:ok, code}
else
e ->
unless params[:unreachable_since], do: Instances.set_reachable(url)
else
e ->
unless params[:unreachable_since], do: Instances.set_reachable(url)
@@
-171,6
+170,15
@@
defmodule Pleroma.Web.Salmon do
end
end
end
end
+ def publish_one(%{recipient_id: recipient_id} = params) do
+ recipient = User.get_cached_by_id(recipient_id)
+
+ params
+ |> Map.delete(:recipient_id)
+ |> Map.put(:recipient, recipient)
+ |> publish_one()
+ end
+
def publish_one(_), do: :noop
@supported_activities [
def publish_one(_), do: :noop
@supported_activities [
@@
-219,7
+227,7
@@
defmodule Pleroma.Web.Salmon do
Logger.debug(fn -> "Sending Salmon to #{remote_user.ap_id}" end)
Publisher.enqueue_one(__MODULE__, %{
Logger.debug(fn -> "Sending Salmon to #{remote_user.ap_id}" end)
Publisher.enqueue_one(__MODULE__, %{
- recipient
: remote_user
,
+ recipient
_id: remote_user.id
,
feed: feed,
unreachable_since: reachable_urls_metadata[remote_user.info.salmon]
})
feed: feed,
unreachable_since: reachable_urls_metadata[remote_user.info.salmon]
})