pleroma

commit: f0d13fc3f7d0e9b58cfe1cd8918072d45d656a31
parent: 10d46235cfae03901c297473043a5700a8c5e4f0
Author: feld <feld@feld.me>
Date:   Sat, 18 Jul 2020 16:49:30 +0000

Merge branch 'fix/followredirects-hackney' into 'develop'

Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used

Closes #1966 and #1961

See merge request pleroma/pleroma!2778
Diffstat:
M
lib/pleroma/http/http.ex
9
++++++++-

1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
@@ -69,7 +69,8 @@ defmodule Pleroma.HTTP do
         request = build_request(method, headers, options, url, body, params)
 
         adapter = Application.get_env(:tesla, :adapter)
-        client = Tesla.client([Pleroma.HTTP.Middleware.FollowRedirects], adapter)
+
+        client = Tesla.client(adapter_middlewares(adapter), adapter)
 
         maybe_limit(
           fn ->
@@ -107,4 +108,10 @@ defmodule Pleroma.HTTP do
   defp maybe_limit(fun, _, _) do
     fun.()
   end
+
+  defp adapter_middlewares(Tesla.Adapter.Gun) do
+    [Pleroma.HTTP.Middleware.FollowRedirects]
+  end
+
+  defp adapter_middlewares(_), do: []
 end