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

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
parent 251abf21d4 d103427932
commit e8f96e848a
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/client/assets/thumbnail-not-available.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

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

@ -8,7 +8,7 @@ export default function(file: IDriveFile, thumbnail = false): string {
if (file.metadata.withoutChunks) { if (file.metadata.withoutChunks) {
if (thumbnail) { 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 { } else {
return file.metadata.webpublicUrl || file.metadata.url; return file.metadata.webpublicUrl || file.metadata.url;
} }

2
src/server/file/send-drive-file.ts
View File

@ -73,7 +73,7 @@ export default async function(ctx: Koa.BaseContext) {
await sendRaw(); await sendRaw();
} else { } else {
ctx.status = 404; 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) { } else if ('web' in ctx.query) {