From d103427932aa733e0677119d1bf7e83ee0720ee6 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Tue, 9 Apr 2019 21:07:46 +0900 Subject: [PATCH] Fix non media thumbnails (#4380) --- src/client/assets/thumbnail-not-available.png | Bin 0 -> 5705 bytes src/misc/get-drive-file-url.ts | 2 +- src/server/file/send-drive-file.ts | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/client/assets/thumbnail-not-available.png diff --git a/src/client/assets/thumbnail-not-available.png b/src/client/assets/thumbnail-not-available.png new file mode 100644 index 0000000000000000000000000000000000000000..07cad9919c5a1c6a9398799fc75c989c602386ff GIT binary patch literal 5705 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 literal 0 HcmV?d00001 diff --git a/src/misc/get-drive-file-url.ts b/src/misc/get-drive-file-url.ts index 067db8a5d0..f2b0f8b001 100644 --- a/src/misc/get-drive-file-url.ts +++ b/src/misc/get-drive-file-url.ts @@ -8,7 +8,7 @@ export default function(file: IDriveFile, thumbnail = false): string { if (file.metadata.withoutChunks) { if (thumbnail) { - return file.metadata.thumbnailUrl || file.metadata.webpublicUrl || (isImage ? file.metadata.url : null); + return file.metadata.thumbnailUrl || file.metadata.webpublicUrl || (isImage ? file.metadata.url : '/assets/thumbnail-not-available.png'); } else { return file.metadata.webpublicUrl || file.metadata.url; } diff --git a/src/server/file/send-drive-file.ts b/src/server/file/send-drive-file.ts index e0208f3fab..b22124240a 100644 --- a/src/server/file/send-drive-file.ts +++ b/src/server/file/send-drive-file.ts @@ -73,7 +73,7 @@ export default async function(ctx: Koa.BaseContext) { await sendRaw(); } else { ctx.status = 404; - await send(ctx as any, '/dummy.png', { root: assets }); + await send(ctx as any, '/thumbnail-not-available.png', { root: assets }); } } } else if ('web' in ctx.query) {