hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adapter renaming to adapter_helper

Browse source
This commit is contained in:
Alexander Strizhakov 2020-03-03 18:53:44 +03:00
commit f98ee730f0
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
8 changed files with 44 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/http/adapter.ex → lib/pleroma/http/adapter_helper.ex
View file

@ -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 ::

8
lib/pleroma/http/adapter/gun.ex → lib/pleroma/http/adapter_helper/gun.ex
View file

@ -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

6
lib/pleroma/http/adapter/hackney.ex → lib/pleroma/http/adapter_helper/hackney.ex
View file

@ -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

8
lib/pleroma/http/connection.ex
View file

@ -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