X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Flazy-static.ts;h=5c6369c9e5ed1a879d6f95fb75c7b7aa6564a04d;hb=83338e45e3d583b09a5f6920ee5516b64448d9c3;hp=28d2f862a59008f3df9f24c5545e830e170772cd;hpb=e2600d8b261994abbbeb1ff921edaefd267fc122;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/lazy-static.ts b/server/controllers/lazy-static.ts index 28d2f862a..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,8 +45,10 @@ async function getAvatar (req: express.Request, res: express.Response) { } const avatar = await AvatarModel.loadByName(filename) + 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) @@ -53,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 @@ -69,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 }) } @@ -79,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 }) }