hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
feld 2021-01-10 01:34:54 +00:00
commit fa63f1b55b
2 changed files with 12 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/pleroma/web/media_proxy.ex
View file

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