diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-04-09 21:10:36 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-04-09 21:10:36 +0900 |
| commit | e8f96e848a9179b0befa2ed63387653af79cc15b (patch) | |
| tree | 6ed483d659e23f708c2a7341b8694d6ed7e0240e /src | |
| parent | Update .gitignore (diff) | |
| parent | Fix non media thumbnails (#4380) (diff) | |
| download | misskey-e8f96e848a9179b0befa2ed63387653af79cc15b.tar.gz misskey-e8f96e848a9179b0befa2ed63387653af79cc15b.tar.bz2 misskey-e8f96e848a9179b0befa2ed63387653af79cc15b.zip | |
Merge branch 'v10' of https://github.com/syuilo/misskey into v10
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/assets/thumbnail-not-available.png | bin | 0 -> 5705 bytes | |||
| -rw-r--r-- | src/misc/get-drive-file-url.ts | 2 | ||||
| -rw-r--r-- | src/server/file/send-drive-file.ts | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/client/assets/thumbnail-not-available.png b/src/client/assets/thumbnail-not-available.png Binary files differnew file mode 100644 index 0000000000..07cad9919c --- /dev/null +++ b/src/client/assets/thumbnail-not-available.png 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) { |
