summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2023-08-02 12:30:09 +0200
committerMark Felder <feld@feld.me>2024-06-12 15:18:47 -0400
commit2180537a2b92362c75e7d082fea026062fbd4b9b (patch)
tree3935bc92d393d39b26e276e7d937503b611f10de
parent66ac2e9b81a46b38c9ab9ba793c36987d3171911 (diff)
downloadpleroma-2180537a2b92362c75e7d082fea026062fbd4b9b.tar.gz
pleroma-2180537a2b92362c75e7d082fea026062fbd4b9b.zip
MediaProxy: :whitelist config fallback to []
-rw-r--r--lib/pleroma/web/media_proxy.ex3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/media_proxy.ex b/lib/pleroma/web/media_proxy.ex
index d64760fc2..29882542c 100644
--- a/lib/pleroma/web/media_proxy.ex
+++ b/lib/pleroma/web/media_proxy.ex
@@ -75,8 +75,7 @@ defmodule Pleroma.Web.MediaProxy do
%{host: domain} = URI.parse(url)
mediaproxy_whitelist_domains =
- [:media_proxy, :whitelist]
- |> Config.get()
+ Config.get([:media_proxy, :whitelist], [])
|> Kernel.++(["#{Upload.base_url()}"])
|> Enum.map(&maybe_get_domain_from_url/1)