Commit f1c407e7 authored by eal's avatar eal

Merge branch 'fix/redirect-on-user-fetch' into 'develop'

ActivityPub: follow redirects when fetching user

See merge request pleroma/pleroma!278
parents e0c350db 51a21284
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment