summaryrefslogtreecommitdiff
path: root/src/services/drive
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-08-13 21:27:10 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-08-13 21:27:10 +0900
commitfd9c7d525a9d57666edd7fc2b717ee2a1b6fa231 (patch)
tree6804d5ffd15054fbb095de52ecad51926226fae2 /src/services/drive
parentWIP: Improve admin dashboard (diff)
parentOption objectStorageSetPublicRead (#6645) (diff)
downloadmisskey-fd9c7d525a9d57666edd7fc2b717ee2a1b6fa231.tar.gz
misskey-fd9c7d525a9d57666edd7fc2b717ee2a1b6fa231.tar.bz2
misskey-fd9c7d525a9d57666edd7fc2b717ee2a1b6fa231.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/services/drive')
-rw-r--r--src/services/drive/add-file.ts1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index 969dc04069..0e56d7a055 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -212,6 +212,7 @@ async function upload(key: string, stream: fs.ReadStream | Buffer, type: string,
} as S3.PutObjectRequest;
if (filename) params.ContentDisposition = contentDisposition('inline', filename);
+ if (meta.objectStorageSetPublicRead) params.ACL = 'public-read';
const s3 = getS3(meta);