diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-01-26 23:11:42 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-01-26 23:11:42 +0900 |
| commit | 9d72ff12b9844ca847ddd8844375fcdbf235f550 (patch) | |
| tree | c426cc41e1106b2b43e94af2966af4c21b53dd85 /src | |
| parent | [Client/Desktop] Fix design (diff) | |
| download | sharkey-9d72ff12b9844ca847ddd8844375fcdbf235f550.tar.gz sharkey-9d72ff12b9844ca847ddd8844375fcdbf235f550.tar.bz2 sharkey-9d72ff12b9844ca847ddd8844375fcdbf235f550.zip | |
[Server] Fix bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/file/server.ts | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/file/server.ts b/src/file/server.ts index 0f269c4424..1831ef23b2 100644 --- a/src/file/server.ts +++ b/src/file/server.ts @@ -93,9 +93,12 @@ function send(data: Buffer, type: string, req: express.Request, res: express.Res app.get('/:id', async (req, res): Promise<void> => { 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'); return; + } else if (file.data == null) { + res.status(400); + return; } 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> => { 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'); return; + } else if (file.data == null) { + res.status(400); + return; } send(file.data.buffer, file.type, req, res); |