moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid duplicate Config calls

This commit is contained in:
Mark Felder 2021-01-08 16:43:19 -06:00
parent 3c936061d5
commit 530fb5b29e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/upload.ex
View File

@ -233,6 +233,7 @@ defp url_from_spec(_upload, _base_url, {:url, url}), do: url
def base_url do
uploader = Config.get([Pleroma.Upload, :uploader])
upload_base_url = Config.get([Pleroma.Upload, :base_url])
public_endpoint = Config.get([uploader, :public_endpoint])
case uploader do
Pleroma.Uploaders.Local ->
@ -246,8 +247,8 @@ def base_url do
_ ->
cond do
!is_nil(Config.get([uploader, :public_endpoint])) ->
Config.get([uploader, :public_endpoint])
!is_nil(public_endpoint) ->
public_endpoint
true ->
upload_base_url