projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into 'feature/relay'
[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 bab272323f47e749c9b098800e775432c7f541f5..3a25f614e2f57c4d0946dbbb835945e785ace20c 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub.ex
@@
-562,7
+562,11
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
# nickname can be nil because of virtual actors
user_data =
if data["preferredUsername"] do
# nickname can be nil because of virtual actors
user_data =
if data["preferredUsername"] do
- Map.put(user_data, :nickname, "#{data["preferredUsername"]}@#{URI.parse(data["id"]).host}")
+ Map.put(
+ user_data,
+ :nickname,
+ "#{data["preferredUsername"]}@#{URI.parse(data["id"]).host}"
+ )
else
Map.put(user_data, :nickname, nil)
end
else
Map.put(user_data, :nickname, nil)
end
@@
-572,7
+576,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