diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-02-01 21:37:34 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-02-01 21:37:34 +0900 |
| commit | 9c106022ae850ad33653d8fdfc8231e02006a8d7 (patch) | |
| tree | eb3c8e8e34bd4e8239ed4fb06859b0300cb7bbb6 /src | |
| parent | Create type definition for 'koa-json-body' (#4056) (diff) | |
| download | sharkey-9c106022ae850ad33653d8fdfc8231e02006a8d7.tar.gz sharkey-9c106022ae850ad33653d8fdfc8231e02006a8d7.tar.bz2 sharkey-9c106022ae850ad33653d8fdfc8231e02006a8d7.zip | |
Fix #3871 (#4082)
Diffstat (limited to 'src')
| -rw-r--r-- | src/misc/get-drive-file-url.ts | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/misc/get-drive-file-url.ts b/src/misc/get-drive-file-url.ts index 6ab7bfdb1b..90c3f24422 100644 --- a/src/misc/get-drive-file-url.ts +++ b/src/misc/get-drive-file-url.ts @@ -4,15 +4,17 @@ import config from '../config'; export default function(file: IDriveFile, thumbnail = false): string { if (file == null) return null; + const isImage = file.contentType && file.contentType.startsWith('image/'); + if (file.metadata.withoutChunks) { if (thumbnail) { - return file.metadata.thumbnailUrl || file.metadata.webpublicUrl || file.metadata.url; + return file.metadata.thumbnailUrl || file.metadata.webpublicUrl || (isImage ? file.metadata.url : null); } else { return file.metadata.webpublicUrl || file.metadata.url; } } else { if (thumbnail) { - return `${config.drive_url}/${file._id}?thumbnail`; + return isImage ? `${config.drive_url}/${file._id}?thumbnail` : null; } else { return `${config.drive_url}/${file._id}?web`; } |