1
0
mirror of https://github.com/MisskeyIO/misskey synced 2024-12-15 15:18:18 +09:00

Merge branch 'v10' of https://github.com/syuilo/misskey into v10

This commit is contained in:
syuilo 2019-04-09 21:10:36 +09:00
commit e8f96e848a
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
3 changed files with 2 additions and 2 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

View File

@ -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;
}

View File

@ -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) {