From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 8 Mar 2019 22:59:10 +0000 (+0000)
Subject: http: connection: unify adapter configuration and defaults
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1f78d23eed1fe80622837bc45831c406de244bef;p=akkoma

http: connection: unify adapter configuration and defaults
---

diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index 1477c6dd6..c0173465a 100644
--- 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