X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fhttp%2Fadapter_helper.ex;fp=lib%2Fpleroma%2Fhttp%2Fadapter_helper.ex;h=f9b4896168863adb74b4619aad1f9108e38e57f1;hb=364b6969eb7c79e57ed02345ddff4f48519e6b0a;hp=c667afd258294de173a51cf0fbe69f57393adec3;hpb=058bf96798bb27b84bce1c46f7debd1561885454;p=akkoma

diff --git a/lib/pleroma/http/adapter_helper.ex b/lib/pleroma/http/adapter_helper.ex
index c667afd25..f9b489616 100644
--- a/lib/pleroma/http/adapter_helper.ex
+++ b/lib/pleroma/http/adapter_helper.ex
@@ -6,7 +6,7 @@ defmodule Pleroma.HTTP.AdapterHelper do
   @moduledoc """
   Configure Tesla.Client with default and customized adapter options.
   """
-  @defaults [pool: :federation, connect_timeout: 5_000, recv_timeout: 5_000]
+  @defaults [name: MyFinch, connect_timeout: 5_000, recv_timeout: 5_000]
 
   @type proxy_type() :: :socks4 | :socks5
   @type host() :: charlist() | :inet.ip_address()
@@ -43,17 +43,7 @@ defmodule Pleroma.HTTP.AdapterHelper do
   def options(%URI{} = uri, opts \\ []) do
     @defaults
     |> Keyword.merge(opts)
-    |> adapter_helper().options(uri)
-  end
-
-  defp adapter, do: Application.get_env(:tesla, :adapter)
-
-  defp adapter_helper do
-    case adapter() do
-      Tesla.Adapter.Gun -> AdapterHelper.Gun
-      Tesla.Adapter.Hackney -> AdapterHelper.Hackney
-      _ -> AdapterHelper.Default
-    end
+    |> AdapterHelper.Default.options(uri)
   end
 
   @spec parse_proxy(String.t() | tuple() | nil) ::