aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-08-27 11:46:56 -0500
committerMark Felder <feld@FreeBSD.org>2020-08-27 11:46:56 -0500
commit157ecf402230c0b786f5765dd8b709d45c45974a (patch)
treefb77c0ce10afcc59ac3b59d490649b7bf92589e5
parent697bea04731614bcd2e1e10f0564863dc49a49fa (diff)
downloadpleroma-157ecf402230c0b786f5765dd8b709d45c45974a.tar.gz
Follow redirects.
I think we should be using some global adapter options here, though.
-rw-r--r--lib/pleroma/web/media_proxy/media_proxy_controller.ex4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/media_proxy/media_proxy_controller.ex b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
index d465ce8d1..736b7db56 100644
--- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex
+++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
@@ -50,7 +50,9 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
defp handle_preview(conn, url) do
with {:ok, %{status: status} = head_response} when status in 200..299 <-
- Tesla.head(url, opts: [adapter: [timeout: preview_head_request_timeout()]]) do
+ Tesla.head(url,
+ opts: [adapter: [timeout: preview_head_request_timeout(), follow_redirect: true]]
+ ) do
content_type = Tesla.get_header(head_response, "content-type")
handle_preview(content_type, conn, url)
else