X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fservices.ts;h=352d0b19a8bb096c7e26d800fe5be499c4044573;hb=7f2cfe3a792856f7de6f1d13688aa3d06ec1bf70;hp=3ce6bd5269f65259434843ac8aac43b55c98ff47;hpb=d8755eed1e452d2efbfc983af0e9d228d152bf6b;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/controllers/services.ts b/server/controllers/services.ts
index 3ce6bd526..352d0b19a 100644
--- a/server/controllers/services.ts
+++ b/server/controllers/services.ts
@@ -1,12 +1,19 @@
import * as express from 'express'
-
-import { CONFIG, THUMBNAILS_SIZE } from '../initializers'
-import { oembedValidator } from '../middlewares'
-import { VideoInstance } from '../models'
+import { CONFIG, EMBED_SIZE, PREVIEWS_SIZE } from '../initializers'
+import { asyncMiddleware, oembedValidator } from '../middlewares'
+import { accountsNameWithHostGetValidator } from '../middlewares/validators'
+import { VideoModel } from '../models/video/video'
const servicesRouter = express.Router()
-servicesRouter.use('/oembed', oembedValidator, generateOEmbed)
+servicesRouter.use('/oembed',
+ asyncMiddleware(oembedValidator),
+ generateOEmbed
+)
+servicesRouter.use('/redirect/accounts/:accountName',
+ asyncMiddleware(accountsNameWithHostGetValidator),
+ redirectToAccountUrl
+)
// ---------------------------------------------------------------------------
@@ -17,28 +24,29 @@ export {
// ---------------------------------------------------------------------------
function generateOEmbed (req: express.Request, res: express.Response, next: express.NextFunction) {
- const video = res.locals.video as VideoInstance
+ const video = res.locals.video as VideoModel
const webserverUrl = CONFIG.WEBSERVER.URL
const maxHeight = parseInt(req.query.maxheight, 10)
const maxWidth = parseInt(req.query.maxwidth, 10)
- const embedUrl = webserverUrl + video.getEmbedPath()
- let thumbnailUrl = webserverUrl + video.getThumbnailPath()
- let embedWidth = 560
- let embedHeight = 315
+ const embedUrl = webserverUrl + video.getEmbedStaticPath()
+ let thumbnailUrl = webserverUrl + video.getPreviewStaticPath()
+ 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
}
- const html = ``
+ const html = ``
const json: any = {
type: 'video',
@@ -47,16 +55,21 @@ 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.Account.name,
+ author_url: video.VideoChannel.Account.Actor.url,
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)
}
+
+function redirectToAccountUrl (req: express.Request, res: express.Response, next: express.NextFunction) {
+ return res.redirect(res.locals.account.Actor.url)
+}