diff options
| author | eal <eal@waifu.club> | 2018-08-20 12:13:07 +0000 |
|---|---|---|
| committer | eal <eal@waifu.club> | 2018-08-20 12:13:07 +0000 |
| commit | f1c407e777cc1e783ad6930a89ebaa01d9a42c3b (patch) | |
| tree | 0ace375f28e80f213d751806c9dd9032074a8c66 /lib | |
| parent | e0c350db390f809a6cbd049a91ac819d740b4eda (diff) | |
| parent | 51a21284c6ed361a9f03cdca103d31c668b4962e (diff) | |
| download | pleroma-f1c407e777cc1e783ad6930a89ebaa01d9a42c3b.tar.gz | |
Merge branch 'fix/redirect-on-user-fetch' into 'develop'
ActivityPub: follow redirects when fetching user
See merge request pleroma/pleroma!278
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index ec605b694..cb14f6a57 100644 --- 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}} <- - @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 |