X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fhttp%2Fconnection.ex;h=7e2c6f5e8207e7b9b413d408b8e4f892f0fc83cb;hb=264d18be32d1745e1106f68e772b307f91bc9f5b;hp=cc2e96e2b28302fc36af84ddc261a8567fddbbc4;hpb=50ba4ba2c9ebe522f5981d19e51f7ae41a02e7d8;p=akkoma

diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index cc2e96e2b..7e2c6f5e8 100644
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -8,9 +8,10 @@ defmodule Pleroma.HTTP.Connection do
   """
 
   @hackney_options [
-    timeout: 10000,
-    recv_timeout: 20000,
+    connect_timeout: 10_000,
+    recv_timeout: 20_000,
     follow_redirect: true,
+    force_redirect: true,
     pool: :federation
   ]
   @adapter Application.get_env(:tesla, :adapter)
@@ -29,8 +30,14 @@ defmodule Pleroma.HTTP.Connection do
 
   # fetch Hackney options
   #
-  defp hackney_options(opts) do
+  def hackney_options(opts) do
     options = Keyword.get(opts, :adapter, [])
-    Keyword.merge(@hackney_options, options)
+    adapter_options = Pleroma.Config.get([:http, :adapter], [])
+    proxy_url = Pleroma.Config.get([:http, :proxy_url], nil)
+
+    @hackney_options
+    |> Keyword.merge(adapter_options)
+    |> Keyword.merge(options)
+    |> Keyword.merge(proxy: proxy_url)
   end
 end