X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fservices.ts;h=99a33a716a158cb70060dfada8c76e4bdc96a1b0;hb=5f04dd2f743961e0a06c29531cc3ccc9e4928d56;hp=3ce6bd5269f65259434843ac8aac43b55c98ff47;hpb=d8755eed1e452d2efbfc983af0e9d228d152bf6b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/services.ts b/server/controllers/services.ts index 3ce6bd526..99a33a716 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 } @@ -47,15 +47,15 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr width: embedWidth, height: embedHeight, title: video.name, - author_name: video.Author.name, + author_name: video.VideoChannel.Author.name, provider_name: 'PeerTube', provider_url: webserverUrl } 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)