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

more clean up

Browse source
This commit is contained in:
Alexander Strizhakov 2020-03-13 09:37:57 +03:00
commit 98ed0d1c4b
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
7 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/http/adapter_helper/gun.ex
View file

@ -22,7 +22,7 @@ defmodule Pleroma.HTTP.AdapterHelper.Gun do
@spec options(keyword(), URI.t()) :: keyword()
def options(incoming_opts \\ [], %URI{} = uri) do
proxy =
Pleroma.Config.get([:http, :proxy_url], nil)
Pleroma.Config.get([:http, :proxy_url])
|> AdapterHelper.format_proxy()
config_opts = Pleroma.Config.get([:http, :adapter], [])

2
lib/pleroma/http/adapter_helper/hackney.ex
View file

@ -11,7 +11,7 @@ defmodule Pleroma.HTTP.AdapterHelper.Hackney do
@spec options(keyword(), URI.t()) :: keyword()
def options(connection_opts \\ [], %URI{} = uri) do
proxy = Pleroma.Config.get([:http, :proxy_url], nil)
proxy = Pleroma.Config.get([:http, :proxy_url])
config_opts = Pleroma.Config.get([:http, :adapter], [])