Apply 4 suggestion(s) to 2 file(s)

lib/pleroma/upload.ex

@@ -237,13 +237,7 @@ def base_url do
 
     case uploader do
       Pleroma.Uploaders.Local ->
-        cond do
+        upload_base_url || Pleroma.Web.base_url() <> "/media/"
-          !is_nil(upload_base_url) ->
-            upload_base_url
-
-          true ->
-            Pleroma.Web.base_url() <> "/media/"
-        end
 
       Pleroma.Uploaders.S3 ->
         bucket = Config.get([Pleroma.Uploaders.S3, :bucket])
@@ -260,22 +254,14 @@ def base_url do
               bucket
           end
 
-        cond do
+        if public_endpoint do
-          !is_nil(public_endpoint) ->
+          Path.join([public_endpoint, bucket_with_namespace])
-            Path.join([public_endpoint, bucket_with_namespace])
+        else
-
+          Path.join([upload_base_url, bucket_with_namespace])
-          true ->
-            Path.join([upload_base_url, bucket_with_namespace])
         end
 
       _ ->
-        cond do
+        public_endpoint || upload_base_url
-          !is_nil(public_endpoint) ->
-            public_endpoint
-
-          true ->
-            upload_base_url
-        end
     end
   end
 end

lib/pleroma/web/media_proxy.ex

@@ -80,13 +80,12 @@ def whitelisted?(url) do
       |> Enum.map(&maybe_get_domain_from_url/1)
 
     whitelist_domains =
-      cond do
+      base_url = Upload.base_url()
-        Web.base_url() == Upload.base_url() ->
+      if Web.base_url() == base_url do
-          mediaproxy_whitelist_domains
+        mediaproxy_whitelist_domains
-
+      else
-        true ->
+        %{host: base_domain} = URI.parse(base_url)
-          %{host: base_domain} = URI.parse(Upload.base_url())
+        [base_domain | mediaproxy_whitelist_domains]
-          [base_domain | mediaproxy_whitelist_domains]
       end
 
     domain in whitelist_domains