diff options
| author | Aya Morisawa <AyaMorisawa4869@gmail.com> | 2019-02-06 22:44:55 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-02-06 22:44:55 +0900 |
| commit | 96bc17aa1014983d5e6bf8b4c05d898156995a0d (patch) | |
| tree | fdf7c68bdbf3784988351004127db988d7c40c29 /src/tools | |
| parent | Fix bug (diff) | |
| download | sharkey-96bc17aa1014983d5e6bf8b4c05d898156995a0d.tar.gz sharkey-96bc17aa1014983d5e6bf8b4c05d898156995a0d.tar.bz2 sharkey-96bc17aa1014983d5e6bf8b4c05d898156995a0d.zip | |
Check config on load (#4170)
Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/move-drive-files.ts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/move-drive-files.ts b/src/tools/move-drive-files.ts index 8a1e944503..263e5e125d 100644 --- a/src/tools/move-drive-files.ts +++ b/src/tools/move-drive-files.ts @@ -37,8 +37,9 @@ async function job(file: IDriveFile): Promise<any> { const thumbnailKeyDir = `${config.drive.prefix}/${uuid.v4()}`; const thumbnailKey = `${thumbnailKeyDir}/${name}.thumbnail.jpg`; - 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 }` + ); const bucket = await getDriveFileBucket(); const readable = bucket.openDownloadStream(file._id); |