summaryrefslogtreecommitdiff
path: root/src/services/drive/add-file.ts
diff options
context:
space:
mode:
authorAya Morisawa <AyaMorisawa4869@gmail.com>2019-02-06 22:44:55 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-02-06 22:44:55 +0900
commit96bc17aa1014983d5e6bf8b4c05d898156995a0d (patch)
treefdf7c68bdbf3784988351004127db988d7c40c29 /src/services/drive/add-file.ts
parentFix bug (diff)
downloadmisskey-96bc17aa1014983d5e6bf8b4c05d898156995a0d.tar.gz
misskey-96bc17aa1014983d5e6bf8b4c05d898156995a0d.tar.bz2
misskey-96bc17aa1014983d5e6bf8b4c05d898156995a0d.zip
Check config on load (#4170)
Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
Diffstat (limited to 'src/services/drive/add-file.ts')
-rw-r--r--src/services/drive/add-file.ts5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index 31902b2425..b19794b8e2 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -50,8 +50,9 @@ async function save(path: string, name: string, type: string, hash: string, size
if (type === 'image/webp') ext = '.webp';
}
- const baseUrl = config.drive.baseUrl
- || `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`;
+ const baseUrl = config.drive.baseUrl.getOrElse(
+ `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`
+ );
// for original
const key = `${config.drive.prefix}/${uuid.v4()}${ext}`;