Merge branch 'develop' into feature/compat/push-subscriptions

[akkoma] / lib / pleroma / uploaders / swift / uploader.ex

diff --git a/lib/pleroma/uploaders/swift/uploader.ex b/lib/pleroma/uploaders/swift/uploader.ex
index c71808c2deac815da03a75a31132618d8c94d8c5..794f76cb08f1698f7ff824bfb114db354c736e2f 100644 (file)
--- a/lib/pleroma/uploaders/swift/uploader.ex
+++ b/lib/pleroma/uploaders/swift/uploader.ex
@@ -1,15 +1,10 @@
 defmodule Pleroma.Uploaders.Swift do
   @behaviour Pleroma.Uploaders.Uploader
 
-  @settings Application.get_env(:pleroma, Pleroma.Uploaders.Swift)
-
   def put_file(name, uuid, tmp_path, content_type, _should_dedupe) do
     {:ok, file_data} = File.read(tmp_path)
     remote_name = "#{uuid}/#{name}"
 
     Pleroma.Uploaders.Swift.Client.upload_file(remote_name, file_data, content_type)
-
-    object_url = Keyword.fetch!(@settings, :object_url)
-    "#{object_url}/#{remote_name}"
   end
 end