truncated_namespace should default to nil

[akkoma] / lib / pleroma / upload.ex

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index e714dc57b6f046c965e188fe95d6e955c21a41bd..e13d40c5a6e8c3c2188faccef7ed2dbb7e35c275 100644 (file)
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -229,13 +229,15 @@ defmodule Pleroma.Upload do
 
       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
-            truncated_namespace = Config.get([Pleroma.Uploaders.S3, :truncated_namespace]) ->
+            !is_nil(truncated_namespace) ->
               truncated_namespace
 
-            namespace = Config.get([Pleroma.Uploaders.S3, :bucket_namespace]) ->
+            !is_nil(namespace) ->
               namespace <> ":" <> bucket
 
             true ->