alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Follow redirects when fetching activities. 

This can happen for site that started as http and now switched to https.
This commit is contained in:
Roger Braun 2017-05-06 13:18:08 +02:00
parent 22ddddce76
commit 9cafb67fc1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/ostatus/ostatus.ex
View File

@ -274,9 +274,9 @@ def get_atom_url(body) do
end end
def fetch_activity_from_html_url(url) do def fetch_activity_from_html_url(url) do
with {:ok, %{body: body}} <- @httpoison.get(url), with {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true),
{:ok, atom_url} <- get_atom_url(body), {:ok, atom_url} <- get_atom_url(body),
{:ok, %{status_code: code, body: body}} when code in 200..299 <- @httpoison.get(atom_url) do {:ok, %{status_code: code, body: body}} when code in 200..299 <- @httpoison.get(atom_url, [], follow_redirect: true) do
handle_incoming(body) handle_incoming(body)
end end
end end