X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=inline;f=lib%2Fpleroma%2Fhttp%2Fhttp.ex;h=c96ee7353db19225f367d7afb900efcb8b9629f2;hb=314758c25bbc0044afcec98710c36532a1dc7e0d;hp=c5f720bc9f756292f0c99d2c44500911ca19062f;hpb=0f2f7d2cec8297b1b5645643d7584cde561ce628;p=akkoma diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex index c5f720bc9..c96ee7353 100644 --- a/lib/pleroma/http/http.ex +++ b/lib/pleroma/http/http.ex @@ -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