projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
[akkoma]
/
lib
/
pleroma
/
uploaders
/
s3.ex
diff --git
a/lib/pleroma/uploaders/s3.ex
b/lib/pleroma/uploaders/s3.ex
index 2d1ddef757fe741b9d0d48ba1b28e22fb8da6b5a..19832a7ecc456e38390d1d931370bb1402d3a2dd 100644
(file)
--- a/
lib/pleroma/uploaders/s3.ex
+++ b/
lib/pleroma/uploaders/s3.ex
@@
-15,20
+15,18
@@
defmodule Pleroma.Uploaders.S3 do
])}}
end
])}}
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)
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},
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
])
case ExAws.request(op) do