logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 2180537a2b92362c75e7d082fea026062fbd4b9b
parent 66ac2e9b81a46b38c9ab9ba793c36987d3171911
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Wed,  2 Aug 2023 12:30:09 +0200

MediaProxy: :whitelist config fallback to []

Diffstat:

Mlib/pleroma/web/media_proxy.ex3+--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 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)