in dev, allow dev FE

[akkoma] / lib / pleroma / uploaders / s3.ex

diff --git a/lib/pleroma/uploaders/s3.ex b/lib/pleroma/uploaders/s3.ex
index 6dbef90856c2fba0f9f5bddc52d56743cef7c81d..481153fe897c00b60875657576a9f872ef75c35f 100644 (file)
--- a/lib/pleroma/uploaders/s3.ex
+++ b/lib/pleroma/uploaders/s3.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Uploaders.S3 do
@@ -12,26 +12,10 @@ defmodule Pleroma.Uploaders.S3 do
   # links with less strict filenames
   @impl true
   def get_file(file) do
-    config = Config.get([__MODULE__])
-    bucket = Keyword.fetch!(config, :bucket)
-
-    bucket_with_namespace =
-      cond do
-        truncated_namespace = Keyword.get(config, :truncated_namespace) ->
-          truncated_namespace
-
-        namespace = Keyword.get(config, :bucket_namespace) ->
-          namespace <> ":" <> bucket
-
-        true ->
-          bucket
-      end
-
     {:ok,
      {:url,
       Path.join([
-        Keyword.fetch!(config, :public_endpoint),
-        bucket_with_namespace,
+        Pleroma.Upload.base_url(),
         strict_encode(URI.decode(file))
       ])}}
   end
@@ -46,23 +30,12 @@ defmodule Pleroma.Uploaders.S3 do
 
     op =
       if streaming do
-        op =
-          upload.tempfile
-          |> ExAws.S3.Upload.stream_file()
-          |> ExAws.S3.upload(bucket, s3_name, [
-            {:acl, :public_read},
-            {:content_type, upload.content_type}
-          ])
-
-        if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Gun do
-          # set s3 upload timeout to respect :upload pool timeout
-          # timeout should be slightly larger, so s3 can retry upload on fail
-          timeout = Pleroma.HTTP.AdapterHelper.Gun.pool_timeout(:upload) + 1_000
-          opts = Keyword.put(op.opts, :timeout, timeout)
-          Map.put(op, :opts, opts)
-        else
-          op
-        end
+        upload.tempfile
+        |> ExAws.S3.Upload.stream_file()
+        |> ExAws.S3.upload(bucket, s3_name, [
+          {:acl, :public_read},
+          {:content_type, upload.content_type}
+        ])
       else
         {:ok, file_data} = File.read(upload.tempfile)