usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #3871 (#4082)

This commit is contained in:
MeiMei 2019-02-01 21:37:34 +09:00 committed by syuilo
parent bab1dc1d97
commit 9c106022ae
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/misc/get-drive-file-url.ts
View File

@ -4,15 +4,17 @@ import config from '../config';
export default function(file: IDriveFile, thumbnail = false): string { export default function(file: IDriveFile, thumbnail = false): string {
if (file == null) return null; if (file == null) return null;
const isImage = file.contentType && file.contentType.startsWith('image/');
if (file.metadata.withoutChunks) { if (file.metadata.withoutChunks) {
if (thumbnail) { 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 { } else {
return file.metadata.webpublicUrl || file.metadata.url; return file.metadata.webpublicUrl || file.metadata.url;
} }
} else { } else {
if (thumbnail) { if (thumbnail) {
return `${config.drive_url}/${file._id}?thumbnail`; return isImage ? `${config.drive_url}/${file._id}?thumbnail` : null;
} else { } else {
return `${config.drive_url}/${file._id}?web`; return `${config.drive_url}/${file._id}?web`;
} }