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

4
lib/pleroma/upload.ex
View file

@ -225,7 +225,7 @@ defmodule Pleroma.Upload do
case uploader do
Pleroma.Uploaders.Local ->
upload_base_url || Pleroma.Web.base_url() <> "/media/"
upload_base_url || Pleroma.Web.Endpoint.url() <> "/media/"
Pleroma.Uploaders.S3 ->
bucket = Config.get([Pleroma.Uploaders.S3, :bucket])
@ -251,7 +251,7 @@ defmodule Pleroma.Upload do
end
_ ->
public_endpoint || upload_base_url || Pleroma.Web.base_url() <> "/media/"
public_endpoint || upload_base_url || Pleroma.Web.Endpoint.url() <> "/media/"
end
end
end