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

[Server] Fix bug

This commit is contained in:
syuilo 2017-01-26 23:11:42 +09:00
parent e15de4af4d
commit 9d72ff12b9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/file/server.ts
View File

@ -93,9 +93,12 @@ function send(data: Buffer, type: string, req: express.Request, res: express.Res
app.get('/:id', async (req, res): Promise<void> => { app.get('/:id', async (req, res): Promise<void> => {
const file = await File.findOne({_id: new mongodb.ObjectID(req.params.id)}); const file = await File.findOne({_id: new mongodb.ObjectID(req.params.id)});
if (file === null) { if (file == null) {
res.status(404).sendFile(__dirname + '/resources/dummy.png'); res.status(404).sendFile(__dirname + '/resources/dummy.png');
return; return;
} else if (file.data == null) {
res.status(400);
return;
} }
send(file.data.buffer, file.type, req, res); send(file.data.buffer, file.type, req, res);
@ -104,9 +107,12 @@ app.get('/:id', async (req, res): Promise<void> => {
app.get('/:id/:name', async (req, res): Promise<void> => { app.get('/:id/:name', async (req, res): Promise<void> => {
const file = await File.findOne({_id: new mongodb.ObjectID(req.params.id)}); const file = await File.findOne({_id: new mongodb.ObjectID(req.params.id)});
if (file === null) { if (file == null) {
res.status(404).sendFile(__dirname + '/resources/dummy.png'); res.status(404).sendFile(__dirname + '/resources/dummy.png');
return; return;
} else if (file.data == null) {
res.status(400);
return;
} }
send(file.data.buffer, file.type, req, res); send(file.data.buffer, file.type, req, res);