aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-05-06 13:18:08 +0200
committerRoger Braun <roger@rogerbraun.net>2017-05-06 13:18:08 +0200
commit9cafb67fc177ace3af176a86366ae676b89ea368 (patch)
tree1c3920d655cf63bcf0119c73d20f34091b5772c0 /lib
parent22ddddce766b5ba867c561dbd8060c67393c5504 (diff)
downloadpleroma-9cafb67fc177ace3af176a86366ae676b89ea368.tar.gz
Follow redirects when fetching activities.
This can happen for site that started as http and now switched to https.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/ostatus/ostatus.ex4
1 files 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