Apply Upload.base_url for S3

lib/pleroma/uploaders/s3.ex

@@ -30,7 +30,7 @@ defmodule Pleroma.Uploaders.S3 do
     {:ok,
      {:url,
       Path.join([
-        Keyword.fetch!(config, :public_endpoint),
+        Pleroma.Upload.base_url(),
         bucket_with_namespace,
         strict_encode(URI.decode(file))
       ])}}

test/pleroma/uploaders/s3_test.exs

@@ -11,11 +11,16 @@ defmodule Pleroma.Uploaders.S3Test do
   import Mock
   import ExUnit.CaptureLog
 
-  setup do:
+  setup do
+    clear_config(Pleroma.Upload,
+      uploader: Pleroma.Uploaders.S3
+    )
+
     clear_config(Pleroma.Uploaders.S3,
       bucket: "test_bucket",
       public_endpoint: "https://s3.amazonaws.com"
     )
+  end
 
   describe "get_file/1" do
     test "it returns path to local folder for files" do