summaryrefslogtreecommitdiff
path: root/packages/backend/src/core
diff options
context:
space:
mode:
authorAcid Chicken (硫酸鶏) <root@acid-chicken.com>2023-03-30 23:02:38 +0900
committerAcid Chicken (硫酸鶏) <root@acid-chicken.com>2023-03-30 23:02:38 +0900
commitd1c55567242ec0c0cf8fb9b923a0684df2b22a1a (patch)
tree86f81f4072507d3136b1ef2995cdbf0d1c89f516 /packages/backend/src/core
parentbuild(#10336): bump storybook (diff)
parentuse workspace:*, use pnpm@8.1.0 (diff)
downloadmisskey-d1c55567242ec0c0cf8fb9b923a0684df2b22a1a.tar.gz
misskey-d1c55567242ec0c0cf8fb9b923a0684df2b22a1a.tar.bz2
misskey-d1c55567242ec0c0cf8fb9b923a0684df2b22a1a.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into storybook
Diffstat (limited to 'packages/backend/src/core')
-rw-r--r--packages/backend/src/core/S3Service.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/backend/src/core/S3Service.ts b/packages/backend/src/core/S3Service.ts
index 629278d915..01ce12ffdd 100644
--- a/packages/backend/src/core/S3Service.ts
+++ b/packages/backend/src/core/S3Service.ts
@@ -42,7 +42,7 @@ export class S3Service {
accessKeyId: meta.objectStorageAccessKey,
secretAccessKey: meta.objectStorageSecretKey,
} : undefined,
- region: meta.objectStorageRegion ?? undefined,
+ region: meta.objectStorageRegion ? meta.objectStorageRegion : undefined, // 空文字列もundefinedにするため ?? は使わない
tls: meta.objectStorageUseSSL,
forcePathStyle: meta.objectStorageEndpoint ? meta.objectStorageS3ForcePathStyle : false, // AWS with endPoint omitted
requestHandler: new NodeHttpHandler(handlerOption),