X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fservices.ts;h=cf7a513af8c182bba8fb6b30bcb848334e1bc243;hb=2c3abc4fa796555eb7d25f416c4f41ab3e3ad8ca;hp=0c325678c78cf9a1e716d03e5fcec3a631e21d6f;hpb=a2431b7dcbc72c05101dcdbe631ff84a823aeb51;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/services.ts b/server/controllers/services.ts
index 0c325678c..cf7a513af 100644
--- a/server/controllers/services.ts
+++ b/server/controllers/services.ts
@@ -1,9 +1,8 @@
 import * as express from 'express'
-
 import { CONFIG, EMBED_SIZE, PREVIEWS_SIZE } from '../initializers'
-import { oembedValidator } from '../middlewares'
-import { asyncMiddleware } from '../middlewares/async'
-import { VideoInstance } from '../models'
+import { asyncMiddleware, oembedValidator } from '../middlewares'
+import { accountNameWithHostGetValidator } from '../middlewares/validators'
+import { VideoModel } from '../models/video/video'
 
 const servicesRouter = express.Router()
 
@@ -11,6 +10,10 @@ servicesRouter.use('/oembed',
   asyncMiddleware(oembedValidator),
   generateOEmbed
 )
+servicesRouter.use('/redirect/accounts/:accountName',
+  asyncMiddleware(accountNameWithHostGetValidator),
+  redirectToAccountUrl
+)
 
 // ---------------------------------------------------------------------------
 
@@ -20,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
 
@@ -42,7 +45,8 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr
     thumbnailUrl = undefined
   }
 
-  const html = `<iframe width="${embedWidth}" height="${embedHeight}" src="${embedUrl}" frameborder="0" allowfullscreen></iframe>`
+  const html = `<iframe width="${embedWidth}" height="${embedHeight}" sandbox="allow-same-origin allow-scripts" ` +
+    `src="${embedUrl}" frameborder="0" allowfullscreen></iframe>`
 
   const json: any = {
     type: 'video',
@@ -52,6 +56,7 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr
     height: embedHeight,
     title: video.name,
     author_name: video.VideoChannel.Account.name,
+    author_url: video.VideoChannel.Account.Actor.url,
     provider_name: 'PeerTube',
     provider_url: webserverUrl
   }
@@ -64,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)
+}