Merge branch 'develop' into gun

[akkoma] / lib / pleroma / http / connection.ex

diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index e2d7afbbde19850e9ef64c8673c752d773614686..777e5d4c8c7ba5ee2998bfded4d15aebddf4764b 100644 (file)
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -1,11 +1,19 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.HTTP.Connection do
   @moduledoc """
   Configure Tesla.Client with default and customized adapter options.
   """
+
+  alias Pleroma.Config
+  alias Pleroma.HTTP.AdapterHelper
+
+  require Logger
+
+  @defaults [pool: :federation]
+
   @type ip_address :: ipv4_address() | ipv6_address()
   @type ipv4_address :: {0..255, 0..255, 0..255, 0..255}
   @type ipv6_address ::
@@ -13,13 +21,6 @@ defmodule Pleroma.HTTP.Connection do
   @type proxy_type() :: :socks4 | :socks5
   @type host() :: charlist() | ip_address()
 
-  @defaults [pool: :federation]
-
-  require Logger
-
-  alias Pleroma.Config
-  alias Pleroma.HTTP.Adapter
-
   @doc """
   Merge default connection & adapter options with received ones.
   """
@@ -50,9 +51,9 @@ defmodule Pleroma.HTTP.Connection do
 
   defp adapter do
     case Application.get_env(:tesla, :adapter) do
-      Tesla.Adapter.Gun -> Adapter.Gun
-      Tesla.Adapter.Hackney -> Adapter.Hackney
-      _ -> Adapter
+      Tesla.Adapter.Gun -> AdapterHelper.Gun
+      Tesla.Adapter.Hackney -> AdapterHelper.Hackney
+      _ -> AdapterHelper
     end
   end
 
@@ -71,15 +72,15 @@ defmodule Pleroma.HTTP.Connection do
     else
       {_, _} ->
         Logger.warn("parsing port in proxy fail #{inspect(proxy)}")
-        {:error, :error_parsing_port_in_proxy}
+        {:error, :invalid_proxy_port}
 
       :error ->
         Logger.warn("parsing port in proxy fail #{inspect(proxy)}")
-        {:error, :error_parsing_port_in_proxy}
+        {:error, :invalid_proxy_port}
 
       _ ->
         Logger.warn("parsing proxy fail #{inspect(proxy)}")
-        {:error, :error_parsing_proxy}
+        {:error, :invalid_proxy}
     end
   end
 
@@ -89,7 +90,7 @@ defmodule Pleroma.HTTP.Connection do
     else
       _ ->
         Logger.warn("parsing proxy fail #{inspect(proxy)}")
-        {:error, :error_parsing_proxy}
+        {:error, :invalid_proxy}
     end
   end