projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/emoji-in-local-users' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
activity_pub.ex
diff --git
a/lib/pleroma/web/activity_pub/activity_pub.ex
b/lib/pleroma/web/activity_pub/activity_pub.ex
index 90a39ce6989294b636f452851f809074c496ef11..cb14f6a577dc1ffb3ef8d5c47809f54e5597c62b 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub.ex
@@
-565,7
+565,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
def fetch_and_prepare_user_from_ap_id(ap_id) do
with {:ok, %{status_code: 200, body: body}} <-
def fetch_and_prepare_user_from_ap_id(ap_id) do
with {:ok, %{status_code: 200, body: body}} <-
- @httpoison.get(ap_id,
Accept: "application/activity+json"
),
+ @httpoison.get(ap_id,
[Accept: "application/activity+json"], follow_redirect: true
),
{:ok, data} <- Jason.decode(body) do
user_data_from_user_object(data)
else
{:ok, data} <- Jason.decode(body) do
user_data_from_user_object(data)
else
@@
-653,7
+653,11
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
@httpoison.post(
inbox,
json,
@httpoison.post(
inbox,
json,
- [{"Content-Type", "application/activity+json"}, {"signature", signature}],
+ [
+ {"Content-Type", "application/activity+json"},
+ {"signature", signature},
+ {"digest", digest}
+ ],
hackney: [pool: :default]
)
end
hackney: [pool: :default]
)
end