From 0f07c28951cf893e6313009d9517c3a5c6c84abd Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 20 Jun 2022 11:48:40 +0200 Subject: Correctly handle unknown remote actor image size --- server/controllers/lazy-static.ts | 21 +++++++++++++++------ 1 file changed, 15 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 55bf02660..8a180b5bc 100644 --- a/server/controllers/lazy-static.ts +++ b/server/controllers/lazy-static.ts @@ -1,9 +1,10 @@ import cors from 'cors' import express from 'express' import { VideosTorrentCache } from '@server/lib/files-cache/videos-torrent-cache' +import { MActorImage } from '@server/types/models' import { HttpStatusCode } from '../../shared/models/http/http-error-codes' import { logger } from '../helpers/logger' -import { LAZY_STATIC_PATHS, STATIC_MAX_AGE } from '../initializers/constants' +import { ACTOR_IMAGES_SIZE, LAZY_STATIC_PATHS, STATIC_MAX_AGE } from '../initializers/constants' import { VideosCaptionCache, VideosPreviewCache } from '../lib/files-cache' import { actorImagePathUnsafeCache, pushActorImageProcessInQueue } from '../lib/local-actor' import { asyncMiddleware } from '../middlewares' @@ -67,10 +68,7 @@ async function getActorImage (req: express.Request, res: express.Response, next: await pushActorImageProcessInQueue({ filename: image.filename, fileUrl: image.fileUrl, - size: { - height: image.height, - width: image.width - }, + size: getActorImageSize(image), type: image.type }) } catch (err) { @@ -94,7 +92,7 @@ async function getActorImage (req: express.Request, res: express.Response, next: if (err.status === HttpStatusCode.NOT_FOUND_404 && !image.isOwned()) { logger.error('Cannot lazy serve actor image %s.', filename, { err }) - actorImagePathUnsafeCache.del(filename) + actorImagePathUnsafeCache.delete(filename) image.onDisk = false image.save() @@ -105,6 +103,17 @@ async function getActorImage (req: express.Request, res: express.Response, next: }) } +function getActorImageSize (image: MActorImage): { width: number, height: number } { + if (image.width && image.height) { + return { + height: image.height, + width: image.width + } + } + + return ACTOR_IMAGES_SIZE[image.type][0] +} + async function getPreview (req: express.Request, res: express.Response) { const result = await VideosPreviewCache.Instance.getFilePath(req.params.filename) if (!result) return res.status(HttpStatusCode.NOT_FOUND_404).end() -- cgit v1.2.3