From 164174a6abac3e391e95d479a98749e20eb86f34 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 17 Oct 2017 10:35:27 +0200 Subject: Use preview instead of thumbnail for oembed --- server/controllers/services.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'server/controllers') diff --git a/server/controllers/services.ts b/server/controllers/services.ts index 3ce6bd526..4bbe56a8a 100644 --- a/server/controllers/services.ts +++ b/server/controllers/services.ts @@ -1,6 +1,6 @@ import * as express from 'express' -import { CONFIG, THUMBNAILS_SIZE } from '../initializers' +import { CONFIG, PREVIEWS_SIZE, EMBED_SIZE } from '../initializers' import { oembedValidator } from '../middlewares' import { VideoInstance } from '../models' @@ -23,17 +23,17 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr const maxWidth = parseInt(req.query.maxwidth, 10) const embedUrl = webserverUrl + video.getEmbedPath() - let thumbnailUrl = webserverUrl + video.getThumbnailPath() - let embedWidth = 560 - let embedHeight = 315 + let thumbnailUrl = webserverUrl + video.getPreviewPath() + let embedWidth = EMBED_SIZE.width + let embedHeight = EMBED_SIZE.height if (maxHeight < embedHeight) embedHeight = maxHeight if (maxWidth < embedWidth) embedWidth = maxWidth // Our thumbnail is too big for the consumer if ( - (maxHeight !== undefined && maxHeight < THUMBNAILS_SIZE.height) || - (maxWidth !== undefined && maxWidth < THUMBNAILS_SIZE.width) + (maxHeight !== undefined && maxHeight < PREVIEWS_SIZE.height) || + (maxWidth !== undefined && maxWidth < PREVIEWS_SIZE.width) ) { thumbnailUrl = undefined } @@ -54,8 +54,8 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr if (thumbnailUrl !== undefined) { json.thumbnail_url = thumbnailUrl - json.thumbnail_width = THUMBNAILS_SIZE.width - json.thumbnail_height = THUMBNAILS_SIZE.height + json.thumbnail_width = PREVIEWS_SIZE.width + json.thumbnail_height = PREVIEWS_SIZE.height } return res.json(json) -- cgit v1.2.3