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: 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 (limited to 'src') diff --git a/src/client/assets/thumbnail-not-available.png b/src/client/assets/thumbnail-not-available.png new file mode 100644 index 0000000000..07cad9919c Binary files /dev/null and b/src/client/assets/thumbnail-not-available.png differ 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) { -- cgit v1.2.3-freya