use nil instead of empty string

diff --git a/config/config.exs b/config/config.exs
index 05995085c46d3fcbc4f691d9ac2d484a772a59a5..e71d5e5a066261a2cd09b42977f623d372fc0048 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -42,7 +42,7 @@ version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
 
 # Configures http settings, upstream proxy etc.
 config :pleroma, :http,
-  proxy_url: ""
+  proxy_url: nil
 
 config :pleroma, :instance,
   version: version,

diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index 31135411c0953fb6f1a050f06d17b340d8d57426..8b8a82353a9c4c2e5e88960c769b64ea5e11bb59 100644 (file)
--- a/lib/pleroma/http/http.ex
+++ b/lib/pleroma/http/http.ex
@@ -4,9 +4,9 @@ defmodule Pleroma.HTTP do
 
   def process_request_options(options) do
     config = Application.get_env(:pleroma, :http, [])
-    proxy = Keyword.get(config, :proxy_url, "")
+    proxy = Keyword.get(config, :proxy_url, nil)
     case proxy do
-      "" -> options
+      nil -> options
       _ -> options ++ [proxy: proxy]
     end
   end