projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
salmon
/
salmon.ex
diff --git
a/lib/pleroma/web/salmon/salmon.ex
b/lib/pleroma/web/salmon/salmon.ex
index 562ec3d9cd6b6aba0fdfd2999ab81ea082d205f4..1dc514976f30c4ba2df14385f0d00e46e6245c90 100644
(file)
--- a/
lib/pleroma/web/salmon/salmon.ex
+++ b/
lib/pleroma/web/salmon/salmon.ex
@@
-1,3
+1,7
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.Salmon do
@httpoison Application.get_env(:pleroma, :httpoison)
defmodule Pleroma.Web.Salmon do
@httpoison Application.get_env(:pleroma, :httpoison)
@@
-157,15
+161,12
@@
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
- with {:ok, %{status
_code
: code}} <-
+ defp send_to_user(%{info: %{
salmon:
salmon}}, feed, poster) do
+ with {:ok, %{status: code}} <-
poster.(
salmon,
feed,
poster.(
salmon,
feed,
- [{"Content-Type", "application/magic-envelope+xml"}],
- timeout: 10000,
- recv_timeout: 20000,
- hackney: [pool: :default]
+ [{"Content-Type", "application/magic-envelope+xml"}]
) do
Logger.debug(fn -> "Pushed to #{salmon}, code #{code}" end)
else
) do
Logger.debug(fn -> "Pushed to #{salmon}, code #{code}" end)
else
@@
-183,9
+184,9
@@
defmodule Pleroma.Web.Salmon do
"Undo",
"Delete"
]
"Undo",
"Delete"
]
- def publish(user, activity, poster \\ &@httpoison.post/
4
)
+ def publish(user, activity, poster \\ &@httpoison.post/
3
)
- def publish(%{info: %{
"keys" =>
keys}} = user, %{data: %{"type" => type}} = activity, poster)
+ def publish(%{info: %{
keys:
keys}} = user, %{data: %{"type" => type}} = activity, poster)
when type in @supported_activities do
feed = ActivityRepresenter.to_simple_form(activity, user, true)
when type in @supported_activities do
feed = ActivityRepresenter.to_simple_form(activity, user, true)