From 22923690bc4e2000356de879c84d36c4c89a9122 Mon Sep 17 00:00:00 2001 From: "Rachel Fae Fox (foxiepaws)" Date: Mon, 23 Sep 2019 14:43:07 -0400 Subject: [PATCH] revert s3.ex --- lib/pleroma/uploaders/s3.ex | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/pleroma/uploaders/s3.ex b/lib/pleroma/uploaders/s3.ex index 8c353bed..521daa93 100644 --- a/lib/pleroma/uploaders/s3.ex +++ b/lib/pleroma/uploaders/s3.ex @@ -6,12 +6,10 @@ defmodule Pleroma.Uploaders.S3 do @behaviour Pleroma.Uploaders.Uploader require Logger - alias Pleroma.Config - # The file name is re-encoded with S3's constraints here to comply with previous # links with less strict filenames def get_file(file) do - config = Config.get([__MODULE__]) + config = Pleroma.Config.get([__MODULE__]) bucket = Keyword.fetch!(config, :bucket) bucket_with_namespace = @@ -36,15 +34,15 @@ defmodule Pleroma.Uploaders.S3 do end def put_file(%Pleroma.Upload{} = upload) do - config = Config.get([__MODULE__]) + config = Pleroma.Config.get([__MODULE__]) bucket = Keyword.get(config, :bucket) + {:ok, file_data} = File.read(upload.tempfile) + s3_name = strict_encode(upload.path) op = - upload.tempfile - |> ExAws.S3.Upload.stream_file() - |> ExAws.S3.upload(bucket, s3_name, [ + ExAws.S3.put_object(bucket, s3_name, file_data, [ {:acl, :public_read}, {:content_type, upload.content_type} ])