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

Use Pleroma.Config everywhere

Browse source
This commit is contained in:
Egor Kislitsyn 2019-05-30 15:33:58 +07:00
commit 99f70c7e20
18 changed files with 80 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/http/http.ex
View file

@ -65,12 +65,9 @@ defmodule Pleroma.HTTP do
end
def process_request_options(options) do
config = Application.get_env(:pleroma, :http, [])
proxy = Keyword.get(config, :proxy_url, nil)
case proxy do
case Pleroma.Config.get([:http, :proxy_url]) do
nil -> options
_ -> options ++ [proxy: proxy]
proxy -> options ++ [proxy: proxy]
end
end