Merge branch 'develop' into 'remove-twitter-api'

[akkoma] / lib / pleroma / http / adapter_helper / hackney.ex

diff --git a/lib/pleroma/http/adapter_helper/hackney.ex b/lib/pleroma/http/adapter_helper/hackney.ex
index a0e161eaa27b245eba90a3fb72c9b582e28c73e2..dcb4cac71966de2e3cddfafe1bf122ccd4e2f77d 100644 (file)
--- a/lib/pleroma/http/adapter_helper/hackney.ex
+++ b/lib/pleroma/http/adapter_helper/hackney.ex
@@ -11,10 +11,12 @@ defmodule Pleroma.HTTP.AdapterHelper.Hackney do
 
   @spec options(keyword(), URI.t()) :: keyword()
   def options(connection_opts \\ [], %URI{} = uri) do
-    proxy = Pleroma.Config.get([:http, :proxy_url], nil)
+    proxy = Pleroma.Config.get([:http, :proxy_url])
+
+    config_opts = Pleroma.Config.get([:http, :adapter], [])
 
     @defaults
-    |> Keyword.merge(Pleroma.Config.get([:http, :adapter], []))
+    |> Keyword.merge(config_opts)
     |> Keyword.merge(connection_opts)
     |> add_scheme_opts(uri)
     |> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy)