aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/http/adapter_helper.ex (renamed from lib/pleroma/http/adapter.ex)2
-rw-r--r--lib/pleroma/http/adapter_helper/gun.ex (renamed from lib/pleroma/http/adapter/gun.ex)8
-rw-r--r--lib/pleroma/http/adapter_helper/hackney.ex (renamed from lib/pleroma/http/adapter/hackney.ex)6
-rw-r--r--lib/pleroma/http/connection.ex8
4 files changed, 12 insertions, 12 deletions
diff --git a/lib/pleroma/http/adapter.ex b/lib/pleroma/http/adapter_helper.ex
index a3b84d8f3..2c13666ec 100644
--- a/lib/pleroma/http/adapter.ex
+++ b/lib/pleroma/http/adapter_helper.ex
@@ -2,7 +2,7 @@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
-defmodule Pleroma.HTTP.Adapter do
+defmodule Pleroma.HTTP.AdapterHelper do
alias Pleroma.HTTP.Connection
@type proxy ::
diff --git a/lib/pleroma/http/adapter/gun.ex b/lib/pleroma/http/adapter_helper/gun.ex
index ecf9c5b62..b3298ec7f 100644
--- a/lib/pleroma/http/adapter/gun.ex
+++ b/lib/pleroma/http/adapter_helper/gun.ex
@@ -2,10 +2,10 @@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
-defmodule Pleroma.HTTP.Adapter.Gun do
- @behaviour Pleroma.HTTP.Adapter
+defmodule Pleroma.HTTP.AdapterHelper.Gun do
+ @behaviour Pleroma.HTTP.AdapterHelper
- alias Pleroma.HTTP.Adapter
+ alias Pleroma.HTTP.AdapterHelper
require Logger
@@ -28,7 +28,7 @@ defmodule Pleroma.HTTP.Adapter.Gun do
|> Keyword.merge(Pleroma.Config.get([:http, :adapter], []))
|> add_original(uri)
|> add_scheme_opts(uri)
- |> Adapter.maybe_add_proxy(Adapter.format_proxy(proxy))
+ |> AdapterHelper.maybe_add_proxy(AdapterHelper.format_proxy(proxy))
|> maybe_get_conn(uri, connection_opts)
end
diff --git a/lib/pleroma/http/adapter/hackney.ex b/lib/pleroma/http/adapter_helper/hackney.ex
index 00db30083..a0e161eaa 100644
--- a/lib/pleroma/http/adapter/hackney.ex
+++ b/lib/pleroma/http/adapter_helper/hackney.ex
@@ -1,5 +1,5 @@
-defmodule Pleroma.HTTP.Adapter.Hackney do
- @behaviour Pleroma.HTTP.Adapter
+defmodule Pleroma.HTTP.AdapterHelper.Hackney do
+ @behaviour Pleroma.HTTP.AdapterHelper
@defaults [
connect_timeout: 10_000,
@@ -17,7 +17,7 @@ defmodule Pleroma.HTTP.Adapter.Hackney do
|> Keyword.merge(Pleroma.Config.get([:http, :adapter], []))
|> Keyword.merge(connection_opts)
|> add_scheme_opts(uri)
- |> Pleroma.HTTP.Adapter.maybe_add_proxy(proxy)
+ |> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy)
end
defp add_scheme_opts(opts, %URI{scheme: "http"}), do: opts
diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index bdd062929..dc2761182 100644
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -18,7 +18,7 @@ defmodule Pleroma.HTTP.Connection do
require Logger
alias Pleroma.Config
- alias Pleroma.HTTP.Adapter
+ alias Pleroma.HTTP.AdapterHelper
@doc """
Merge default connection & adapter options with received ones.
@@ -50,9 +50,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