X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuploaders%2Fs3.ex;h=19832a7ecc456e38390d1d931370bb1402d3a2dd;hb=97252a27d9bdde3483cc6d676c0c61150d2174ad;hp=2d1ddef757fe741b9d0d48ba1b28e22fb8da6b5a;hpb=b19597f602e70121a1762476873377c782549817;p=akkoma

diff --git a/lib/pleroma/uploaders/s3.ex b/lib/pleroma/uploaders/s3.ex
index 2d1ddef75..19832a7ec 100644
--- a/lib/pleroma/uploaders/s3.ex
+++ b/lib/pleroma/uploaders/s3.ex
@@ -15,20 +15,18 @@ defmodule Pleroma.Uploaders.S3 do
       ])}}
   end
 
-  def put_file(name, uuid, path, content_type, _opts) do
+  def put_file(upload = %Pleroma.Upload{}) do
     config = Pleroma.Config.get([__MODULE__])
     bucket = Keyword.get(config, :bucket)
 
-    {:ok, file_data} = File.read(path)
+    {:ok, file_data} = File.read(upload.tempfile)
 
-    File.rm!(path)
-
-    s3_name = "#{uuid}/#{strict_encode(name)}"
+    s3_name = strict_encode(upload.path)
 
     op =
       ExAws.S3.put_object(bucket, s3_name, file_data, [
         {:acl, :public_read},
-        {:content_type, content_type}
+        {:content_type, upload.content_type}
       ])
 
     case ExAws.request(op) do