From 76148b27f7501bac061992136852be4303370c8d Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Tue, 1 Jun 2021 01:36:53 +0200 Subject: refactor API errors to standard error format --- server/controllers/lazy-static.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'server/controllers/lazy-static.ts') diff --git a/server/controllers/lazy-static.ts b/server/controllers/lazy-static.ts index 25d3b49b4..9f260cef0 100644 --- a/server/controllers/lazy-static.ts +++ b/server/controllers/lazy-static.ts @@ -56,10 +56,10 @@ async function getActorImage (req: express.Request, res: express.Response) { } const image = await ActorImageModel.loadByName(filename) - if (!image) return res.sendStatus(HttpStatusCode.NOT_FOUND_404) + if (!image) return res.status(HttpStatusCode.NOT_FOUND_404).end() if (image.onDisk === false) { - if (!image.fileUrl) return res.sendStatus(HttpStatusCode.NOT_FOUND_404) + if (!image.fileUrl) return res.status(HttpStatusCode.NOT_FOUND_404).end() logger.info('Lazy serve remote actor image %s.', image.fileUrl) @@ -67,7 +67,7 @@ async function getActorImage (req: express.Request, res: express.Response) { await pushActorImageProcessInQueue({ filename: image.filename, fileUrl: image.fileUrl, type: image.type }) } catch (err) { logger.warn('Cannot process remote actor image %s.', image.fileUrl, { err }) - return res.sendStatus(HttpStatusCode.NOT_FOUND_404) + return res.status(HttpStatusCode.NOT_FOUND_404).end() } image.onDisk = true @@ -83,21 +83,21 @@ async function getActorImage (req: express.Request, res: express.Response) { async function getPreview (req: express.Request, res: express.Response) { const result = await VideosPreviewCache.Instance.getFilePath(req.params.filename) - if (!result) return res.sendStatus(HttpStatusCode.NOT_FOUND_404) + if (!result) return res.status(HttpStatusCode.NOT_FOUND_404).end() return res.sendFile(result.path, { maxAge: STATIC_MAX_AGE.LAZY_SERVER }) } async function getVideoCaption (req: express.Request, res: express.Response) { const result = await VideosCaptionCache.Instance.getFilePath(req.params.filename) - if (!result) return res.sendStatus(HttpStatusCode.NOT_FOUND_404) + if (!result) return res.status(HttpStatusCode.NOT_FOUND_404).end() return res.sendFile(result.path, { maxAge: STATIC_MAX_AGE.LAZY_SERVER }) } async function getTorrent (req: express.Request, res: express.Response) { const result = await VideosTorrentCache.Instance.getFilePath(req.params.filename) - if (!result) return res.sendStatus(HttpStatusCode.NOT_FOUND_404) + if (!result) return res.status(HttpStatusCode.NOT_FOUND_404).end() // Torrents still use the old naming convention (video uuid + .torrent) return res.sendFile(result.path, { maxAge: STATIC_MAX_AGE.SERVER }) -- cgit v1.2.3