From: Mark Felder <feld@feld.me>
Date: Mon, 11 Jan 2021 20:19:14 +0000 (-0600)
Subject: Simplify. We will always have a result from Upload.base_url/0, so just add it to... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ef59d998338551f15b7fe782641bfbf443fd66f4;p=akkoma

Simplify. We will always have a result from Upload.base_url/0, so just add it to the list
---

diff --git a/lib/pleroma/web/media_proxy.ex b/lib/pleroma/web/media_proxy.ex
index 1dab35d2c..dcf3b0623 100644
--- a/lib/pleroma/web/media_proxy.ex
+++ b/lib/pleroma/web/media_proxy.ex
@@ -73,22 +73,14 @@ defmodule Pleroma.Web.MediaProxy do
 
   def whitelisted?(url) do
     %{host: domain} = URI.parse(url)
-    %{host: web_domain} = Web.base_url() |> URI.parse()
-    %{host: upload_domain} = Upload.base_url() |> URI.parse()
 
     mediaproxy_whitelist_domains =
       [:media_proxy, :whitelist]
       |> Config.get()
+      |> Kernel.++(["#{Upload.base_url()}"])
       |> Enum.map(&maybe_get_domain_from_url/1)
 
-    whitelist_domains =
-      if web_domain == upload_domain do
-        mediaproxy_whitelist_domains
-      else
-        [upload_domain | mediaproxy_whitelist_domains]
-      end
-
-    domain in whitelist_domains
+    domain in mediaproxy_whitelist_domains
   end
 
   defp maybe_get_domain_from_url("http" <> _ = url) do