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

Deprecate Pleroma.Web.base_url/0

Browse source 
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
This commit is contained in:
Alex Gleason 2021-05-31 15:09:11 -05:00
commit 51a9f97e87
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
43 changed files with 93 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ defmodule Pleroma.Web.MediaProxy do
alias Pleroma.Config
alias Pleroma.Helpers.UriHelper
alias Pleroma.Upload
alias Pleroma.Web
alias Pleroma.Web.Endpoint
alias Pleroma.Web.MediaProxy.Invalidation
@base64_opts [padding: false]
@ -69,7 +69,7 @@ defmodule Pleroma.Web.MediaProxy do
# non-local non-whitelisted URLs through it and be sure that body size constraint is preserved.
def preview_enabled?, do: enabled?() and !!Config.get([:media_preview_proxy, :enabled])
def local?(url), do: String.starts_with?(url, Web.base_url())
def local?(url), do: String.starts_with?(url, Endpoint.url())
def whitelisted?(url) do
%{host: domain} = URI.parse(url)
@ -122,7 +122,7 @@ defmodule Pleroma.Web.MediaProxy do
end
defp signed_url(url) do
:crypto.hmac(:sha, Config.get([Web.Endpoint, :secret_key_base]), url)
:crypto.hmac(:sha, Config.get([Endpoint, :secret_key_base]), url)
end
def filename(url_or_path) do
@ -130,7 +130,7 @@ defmodule Pleroma.Web.MediaProxy do
end
def base_url do
Config.get([:media_proxy, :base_url], Web.base_url())
Config.get([:media_proxy, :base_url], Endpoint.url())
end
defp proxy_url(path, sig_base64, url_base64, filename) do