X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fcontrollers%2Fservices.ts;h=cf7a513af8c182bba8fb6b30bcb848334e1bc243;hb=2c3abc4fa796555eb7d25f416c4f41ab3e3ad8ca;hp=99a33a716a158cb70060dfada8c76e4bdc96a1b0;hpb=72c7248b6fdcdb2175e726ff51b42e7555f2bd84;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/controllers/services.ts b/server/controllers/services.ts
index 99a33a716..cf7a513af 100644
--- a/server/controllers/services.ts
+++ b/server/controllers/services.ts
@@ -1,12 +1,19 @@
import * as express from 'express'
-
-import { CONFIG, PREVIEWS_SIZE, EMBED_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 { accountNameWithHostGetValidator } 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(accountNameWithHostGetValidator),
+ redirectToAccountUrl
+)
// ---------------------------------------------------------------------------
@@ -16,14 +23,14 @@ export {
// ---------------------------------------------------------------------------
-function generateOEmbed (req: express.Request, res: express.Response, next: express.NextFunction) {
- const video = res.locals.video as VideoInstance
+function generateOEmbed (req: express.Request, res: express.Response) {
+ const video = res.locals.video
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.getPreviewPath()
+ const embedUrl = webserverUrl + video.getEmbedStaticPath()
+ let thumbnailUrl = webserverUrl + video.getPreviewStaticPath()
let embedWidth = EMBED_SIZE.width
let embedHeight = EMBED_SIZE.height
@@ -38,7 +45,8 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr
thumbnailUrl = undefined
}
- const html = ``
+ const html = ``
const json: any = {
type: 'video',
@@ -47,7 +55,8 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr
width: embedWidth,
height: embedHeight,
title: video.name,
- author_name: video.VideoChannel.Author.name,
+ author_name: video.VideoChannel.Account.name,
+ author_url: video.VideoChannel.Account.Actor.url,
provider_name: 'PeerTube',
provider_url: webserverUrl
}
@@ -60,3 +69,7 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr
return res.json(json)
}
+
+function redirectToAccountUrl (req: express.Request, res: express.Response, next: express.NextFunction) {
+ return res.redirect(res.locals.account.Actor.url)
+}