projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'emoji-loader-fix' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
publisher.ex
diff --git
a/lib/pleroma/web/activity_pub/publisher.ex
b/lib/pleroma/web/activity_pub/publisher.ex
index 8e3af0a813868b91df3e839dd518e8d67d244162..8f1399ce6f2789fb566730b8b35adcd3d4c3f525 100644
(file)
--- a/
lib/pleroma/web/activity_pub/publisher.ex
+++ b/
lib/pleroma/web/activity_pub/publisher.ex
@@
-5,6
+5,7
@@
defmodule Pleroma.Web.ActivityPub.Publisher do
alias Pleroma.Activity
alias Pleroma.Config
defmodule Pleroma.Web.ActivityPub.Publisher do
alias Pleroma.Activity
alias Pleroma.Config
+ alias Pleroma.HTTP
alias Pleroma.Instances
alias Pleroma.User
alias Pleroma.Web.ActivityPub.Relay
alias Pleroma.Instances
alias Pleroma.User
alias Pleroma.Web.ActivityPub.Relay
@@
-16,8
+17,6
@@
defmodule Pleroma.Web.ActivityPub.Publisher do
require Logger
require Logger
- @httpoison Application.get_env(:pleroma, :httpoison)
-
@moduledoc """
ActivityPub outgoing federation module.
"""
@moduledoc """
ActivityPub outgoing federation module.
"""
@@
-54,7
+53,7
@@
defmodule Pleroma.Web.ActivityPub.Publisher do
|> Timex.format!("{WDshort}, {0D} {Mshort} {YYYY} {h24}:{m}:{s} GMT")
signature =
|> Timex.format!("{WDshort}, {0D} {Mshort} {YYYY} {h24}:{m}:{s} GMT")
signature =
- Pleroma.
Web.HTTPSignatures
.sign(actor, %{
+ Pleroma.
Signature
.sign(actor, %{
host: host,
"content-length": byte_size(json),
digest: digest,
host: host,
"content-length": byte_size(json),
digest: digest,
@@
-63,7
+62,7
@@
defmodule Pleroma.Web.ActivityPub.Publisher do
with {:ok, %{status: code}} when code in 200..299 <-
result =
with {:ok, %{status: code}} when code in 200..299 <-
result =
-
@httpoison
.post(
+
HTTP
.post(
inbox,
json,
[
inbox,
json,
[