erin/akkoma
1
0
Fork 0
forked from mirrors/akkoma
Code Activity

use nil instead of empty string

Browse source
This commit is contained in:
Jeff Becker 2018-01-29 10:06:16 -05:00
parent dffde6631d
commit 066fe1a697
No known key found for this signature in database
GPG key ID: F357B3B42F6F9B05
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -42,7 +42,7 @@
# Configures http settings, upstream proxy etc. # Configures http settings, upstream proxy etc.
config :pleroma, :http, config :pleroma, :http,
proxy_url: "" proxy_url: nil
config :pleroma, :instance, config :pleroma, :instance,
version: version, version: version,

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

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