projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'deprecate-public_endpoint' into 'develop'
[akkoma]
/
lib
/
pleroma
/
upload.ex
diff --git
a/lib/pleroma/upload.ex
b/lib/pleroma/upload.ex
index 619a85e93f216483425916d89656a497064d2425..6547113514b15fe3d74770f2fde3869930265223 100644
(file)
--- a/
lib/pleroma/upload.ex
+++ b/
lib/pleroma/upload.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Upload do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Upload do
@@
-229,13
+229,15
@@
defmodule Pleroma.Upload do
Pleroma.Uploaders.S3 ->
bucket = Config.get([Pleroma.Uploaders.S3, :bucket])
Pleroma.Uploaders.S3 ->
bucket = Config.get([Pleroma.Uploaders.S3, :bucket])
+ truncated_namespace = Config.get([Pleroma.Uploaders.S3, :truncated_namespace])
+ namespace = Config.get([Pleroma.Uploaders.S3, :bucket_namespace])
bucket_with_namespace =
cond do
bucket_with_namespace =
cond do
-
truncated_namespace = Config.get([Pleroma.Uploaders.S3, :truncated_namespace]
) ->
+
!is_nil(truncated_namespace
) ->
truncated_namespace
truncated_namespace
-
namespace = Config.get([Pleroma.Uploaders.S3, :bucket_namespace]
) ->
+
!is_nil(namespace
) ->
namespace <> ":" <> bucket
true ->
namespace <> ":" <> bucket
true ->
@@
-249,7
+251,7
@@
defmodule Pleroma.Upload do
end
_ ->
end
_ ->
- public_endpoint || upload_base_url
+ public_endpoint || upload_base_url
|| Pleroma.Web.base_url() <> "/media/"
end
end
end
end
end
end