http: connection: unify adapter configuration and defaults

diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index 1477c6dd6fdc0da56978ace862e240aca4f173cd..c0173465ab741d9bf39b41750865cdbe7f30c3e7 100644 (file)
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -31,6 +31,10 @@ defmodule Pleroma.HTTP.Connection do
   #
   defp hackney_options(opts) do
     options = Keyword.get(opts, :adapter, [])
-    Keyword.merge(@hackney_options, options)
+    adapter_options = Pleroma.Config.get([:http, :adapter], [])
+
+    @hackney_options
+    |> Keyword.merge(adapter_options)
+    |> Keyword.merge(options)
   end
 end