logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 530fb5b29ebd414781c703e4b41d204135f3efe7
parent 3c936061d55c1c4bd9346471bc498dd123395766
Author: Mark Felder <feld@feld.me>
Date:   Fri,  8 Jan 2021 16:43:19 -0600

Avoid duplicate Config calls

Diffstat:

Mlib/pleroma/upload.ex5+++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex @@ -233,6 +233,7 @@ defmodule Pleroma.Upload do 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 @@ defmodule Pleroma.Upload 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