X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fservices.ts;h=8a8a95486071b0b12ef5397e6ac8225da8b70d82;hb=e1a570abff3ebf375433e58e7362d56bd32d4cd8;hp=189e1651bae8d8e03d9851714afb5df7912fc8f6;hpb=4097c6d66cb2919c28b5bce44b259e630923fbe0;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/services.ts b/server/controllers/services.ts index 189e1651b..8a8a95486 100644 --- a/server/controllers/services.ts +++ b/server/controllers/services.ts @@ -1,4 +1,4 @@ -import * as express from 'express' +import express from 'express' import { EMBED_SIZE, PREVIEWS_SIZE, WEBSERVER, THUMBNAILS_SIZE } from '../initializers/constants' import { asyncMiddleware, oembedValidator } from '../middlewares' import { accountNameWithHostGetValidator } from '../middlewares/validators' @@ -78,17 +78,18 @@ function buildOEmbed (options: { const maxWidth = parseInt(req.query.maxwidth, 10) const embedUrl = webserverUrl + embedPath - let embedWidth = EMBED_SIZE.width - let embedHeight = EMBED_SIZE.height const embedTitle = escapeHTML(title) let thumbnailUrl = previewPath ? webserverUrl + previewPath : undefined - if (maxHeight < embedHeight) embedHeight = maxHeight + let embedWidth = EMBED_SIZE.width if (maxWidth < embedWidth) embedWidth = maxWidth + let embedHeight = EMBED_SIZE.height + if (maxHeight < embedHeight) embedHeight = maxHeight + // Our thumbnail is too big for the consumer if ( (maxHeight !== undefined && maxHeight < previewSize.height) ||