Merge branch 'parallel588/pleroma-support/compile_warnings' into 'develop'

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

diff --git a/lib/pleroma/uploaders/swift/uploader.ex b/lib/pleroma/uploaders/swift/uploader.ex
index 5db35fe50f086331576e29644d7d6bdd547bd0c1..b35b9807b06d32933db26cb36615e98287c84799 100644 (file)
--- a/lib/pleroma/uploaders/swift/uploader.ex
+++ b/lib/pleroma/uploaders/swift/uploader.ex
@@ -5,10 +5,11 @@ defmodule Pleroma.Uploaders.Swift do
     {:ok, {:url, Path.join([Pleroma.Config.get!([__MODULE__, :object_url]), name])}}
   end
 
-  def put_file(name, uuid, tmp_path, content_type, _opts) do
-    {:ok, file_data} = File.read(tmp_path)
-    remote_name = "#{uuid}/#{name}"
-
-    Pleroma.Uploaders.Swift.Client.upload_file(remote_name, file_data, content_type)
+  def put_file(upload) do
+    Pleroma.Uploaders.Swift.Client.upload_file(
+      upload.path,
+      File.read!(upload.tmpfile),
+      upload.content_type
+    )
   end
 end