From 9cafb67fc177ace3af176a86366ae676b89ea368 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Sat, 6 May 2017 13:18:08 +0200 Subject: [PATCH] Follow redirects when fetching activities. This can happen for site that started as http and now switched to https. --- lib/pleroma/web/ostatus/ostatus.ex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex index e4448eb73..fe42786b2 100644 --- a/lib/pleroma/web/ostatus/ostatus.ex +++ b/lib/pleroma/web/ostatus/ostatus.ex @@ -274,9 +274,9 @@ defmodule Pleroma.Web.OStatus do end 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, %{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) end end -- 2.45.2