hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleaning up a bit.

Browse source
This commit is contained in:
Thurloat 2018-08-27 22:45:53 -03:00
commit 0df558a6a5
5 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/uploaders/local.ex
View file

@ -1,7 +1,10 @@
defmodule Pleroma.Uploaders.Local do
def put_file(name, uuid, file, content_type) do
upload_path = get_upload_path(uuid, should_dedupe)
alias Pleroma.Web
def put_file(name, uuid, file, _content_type, should_dedupe) do
upload_folder = get_upload_path(uuid, should_dedupe)
url_path = get_url(name, uuid, should_dedupe)
File.mkdir_p!(upload_folder)

4
lib/pleroma/uploaders/s3.ex
View file

@ -1,6 +1,6 @@
defmodule Pleroma.Uploaders.S3 do
def put_file(name, uuid, path, content_type) do
def put_file(name, uuid, path, content_type, _should_dedupe) do
settings = Application.get_env(:pleroma, Pleroma.Uploaders.S3)
bucket = Keyword.fetch!(settings, :bucket)
@ -12,7 +12,7 @@ defmodule Pleroma.Uploaders.S3 do
s3_name = "#{uuid}/#{name}"
{:ok, result} =
{:ok, _} =
ExAws.S3.put_object(bucket, s3_name, file_data, [
{:acl, :public_read},
{:content_type, content_type}