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

Fix thumbnail

This commit is contained in:
syuilo 2017-11-16 23:05:12 +09:00
parent a757960c41
commit d81bc3cd21
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB

11
src/file/server.ts
View File

@ -50,11 +50,22 @@ interface ISend {
function thumbnail(data: stream.Readable, type: string, resize: number): ISend { function thumbnail(data: stream.Readable, type: string, resize: number): ISend {
const readable: stream.Readable = (() => { const readable: stream.Readable = (() => {
// 画像ではない場合
if (!/^image\/.*$/.test(type)) { if (!/^image\/.*$/.test(type)) {
// 使わないことにしたストリームはしっかり取り壊しておく // 使わないことにしたストリームはしっかり取り壊しておく
data.destroy(); data.destroy();
return fs.createReadStream(`${__dirname}/assets/not-an-image.png`); return fs.createReadStream(`${__dirname}/assets/not-an-image.png`);
} }
const imageType = type.split('/')[1];
// 画像でもPNGかJPEGでないならダメ
if (imageType != 'png' && imageType != 'jpeg') {
// 使わないことにしたストリームはしっかり取り壊しておく
data.destroy();
return fs.createReadStream(`${__dirname}/assets/thumbnail-not-available.png`);
}
return data; return data;
})(); })();