From 5448c22031d66cc020323bf4c4d1701889a46485 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 7 Feb 2019 21:02:33 +0900 Subject: Revert 96bc17aa1014983d5e6bf8b4c05d898156995a0d --- src/tools/move-drive-files.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/tools') diff --git a/src/tools/move-drive-files.ts b/src/tools/move-drive-files.ts index 263e5e125d..8a1e944503 100644 --- a/src/tools/move-drive-files.ts +++ b/src/tools/move-drive-files.ts @@ -37,9 +37,8 @@ async function job(file: IDriveFile): Promise { const thumbnailKeyDir = `${config.drive.prefix}/${uuid.v4()}`; const thumbnailKey = `${thumbnailKeyDir}/${name}.thumbnail.jpg`; - 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 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 bucket = await getDriveFileBucket(); const readable = bucket.openDownloadStream(file._id); -- cgit v1.2.3-freya