From 2d53be0267acc49cda46707b885096193a1f4e9c Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Mon, 7 Dec 2020 14:32:36 +0100 Subject: replace numbers with typed http status codes (#3409) --- server/controllers/lazy-static.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'server/controllers/lazy-static.ts') diff --git a/server/controllers/lazy-static.ts b/server/controllers/lazy-static.ts index 1ff99e90c..5c6369c9e 100644 --- a/server/controllers/lazy-static.ts +++ b/server/controllers/lazy-static.ts @@ -6,6 +6,7 @@ import { asyncMiddleware } from '../middlewares' import { AvatarModel } from '../models/avatar/avatar' import { logger } from '../helpers/logger' import { avatarPathUnsafeCache, pushAvatarProcessInQueue } from '../lib/avatar' +import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes' const lazyStaticRouter = express.Router() @@ -44,10 +45,10 @@ async function getAvatar (req: express.Request, res: express.Response) { } const avatar = await AvatarModel.loadByName(filename) - if (!avatar) return res.sendStatus(404) + if (!avatar) return res.sendStatus(HttpStatusCode.NOT_FOUND_404) if (avatar.onDisk === false) { - if (!avatar.fileUrl) return res.sendStatus(404) + if (!avatar.fileUrl) return res.sendStatus(HttpStatusCode.NOT_FOUND_404) logger.info('Lazy serve remote avatar image %s.', avatar.fileUrl) @@ -55,7 +56,7 @@ async function getAvatar (req: express.Request, res: express.Response) { await pushAvatarProcessInQueue({ filename: avatar.filename, fileUrl: avatar.fileUrl }) } catch (err) { logger.warn('Cannot process remote avatar %s.', avatar.fileUrl, { err }) - return res.sendStatus(404) + return res.sendStatus(HttpStatusCode.NOT_FOUND_404) } avatar.onDisk = true @@ -71,7 +72,7 @@ async function getAvatar (req: express.Request, res: express.Response) { async function getPreview (req: express.Request, res: express.Response) { const result = await VideosPreviewCache.Instance.getFilePath(req.params.uuid) - if (!result) return res.sendStatus(404) + if (!result) return res.sendStatus(HttpStatusCode.NOT_FOUND_404) return res.sendFile(result.path, { maxAge: STATIC_MAX_AGE.SERVER }) } @@ -81,7 +82,7 @@ async function getVideoCaption (req: express.Request, res: express.Response) { videoId: req.params.videoId, language: req.params.captionLanguage }) - if (!result) return res.sendStatus(404) + if (!result) return res.sendStatus(HttpStatusCode.NOT_FOUND_404) return res.sendFile(result.path, { maxAge: STATIC_MAX_AGE.SERVER }) } -- cgit v1.2.3