Add filter:api.server.stats.get.result hook

[github/Chocobozzz/PeerTube.git] / server / controllers / services.ts

diff --git a/server/controllers/services.ts b/server/controllers/services.ts
index 3ac78a5df7c0149e2d2de68d9f0ed2ff8a771bf3..9151e1b04e73b64a9e0e2e10cc43729cb4c1e277 100644 (file)
--- a/server/controllers/services.ts
+++ b/server/controllers/services.ts
@@ -1,7 +1,9 @@
-import * as express from 'express'
-import { CONFIG, EMBED_SIZE, PREVIEWS_SIZE } from '../initializers'
+import express from 'express'
+import { EMBED_SIZE, PREVIEWS_SIZE, WEBSERVER, THUMBNAILS_SIZE } from '../initializers/constants'
 import { asyncMiddleware, oembedValidator } from '../middlewares'
-import { VideoModel } from '../models/video/video'
+import { accountNameWithHostGetValidator } from '../middlewares/validators'
+import { MChannelSummary } from '@server/types/models'
+import { escapeHTML } from '@shared/core-utils/renderer'
 
 const servicesRouter = express.Router()
 
@@ -9,6 +11,10 @@ servicesRouter.use('/oembed',
   asyncMiddleware(oembedValidator),
   generateOEmbed
 )
+servicesRouter.use('/redirect/accounts/:accountName',
+  asyncMiddleware(accountNameWithHostGetValidator),
+  redirectToAccountUrl
+)
 
 // ---------------------------------------------------------------------------
 
@@ -18,29 +24,82 @@ export {
 
 // ---------------------------------------------------------------------------
 
-function generateOEmbed (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const video = res.locals.video as VideoModel
-  const webserverUrl = CONFIG.WEBSERVER.URL
+function generateOEmbed (req: express.Request, res: express.Response) {
+  if (res.locals.videoAll) return generateVideoOEmbed(req, res)
+
+  return generatePlaylistOEmbed(req, res)
+}
+
+function generatePlaylistOEmbed (req: express.Request, res: express.Response) {
+  const playlist = res.locals.videoPlaylistSummary
+
+  const json = buildOEmbed({
+    channel: playlist.VideoChannel,
+    title: playlist.name,
+    embedPath: playlist.getEmbedStaticPath(),
+    previewPath: playlist.getThumbnailStaticPath(),
+    previewSize: THUMBNAILS_SIZE,
+    req
+  })
+
+  return res.json(json)
+}
+
+function generateVideoOEmbed (req: express.Request, res: express.Response) {
+  const video = res.locals.videoAll
+
+  const json = buildOEmbed({
+    channel: video.VideoChannel,
+    title: video.name,
+    embedPath: video.getEmbedStaticPath(),
+    previewPath: video.getPreviewStaticPath(),
+    previewSize: PREVIEWS_SIZE,
+    req
+  })
+
+  return res.json(json)
+}
+
+function buildOEmbed (options: {
+  req: express.Request
+  title: string
+  channel: MChannelSummary
+  previewPath: string | null
+  embedPath: string
+  previewSize: {
+    height: number
+    width: number
+  }
+}) {
+  const { req, previewSize, previewPath, title, channel, embedPath } = options
+
+  const webserverUrl = 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 + embedPath
+  const embedTitle = escapeHTML(title)
+
+  let thumbnailUrl = previewPath
+    ? webserverUrl + previewPath
+    : undefined
+
   let embedWidth = EMBED_SIZE.width
-  let embedHeight = EMBED_SIZE.height
+  if (maxWidth < embedWidth) embedWidth = maxWidth
 
+  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 < PREVIEWS_SIZE.height) ||
-    (maxWidth !== undefined && maxWidth < PREVIEWS_SIZE.width)
+    (maxHeight !== undefined && maxHeight < previewSize.height) ||
+    (maxWidth !== undefined && maxWidth < previewSize.width)
   ) {
     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 allow-popups" ` +
+    `title="${embedTitle}" src="${embedUrl}" frameborder="0" allowfullscreen></iframe>`
 
   const json: any = {
     type: 'video',
@@ -48,17 +107,22 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr
     html,
     width: embedWidth,
     height: embedHeight,
-    title: video.name,
-    author_name: video.VideoChannel.Account.name,
+    title: title,
+    author_name: channel.name,
+    author_url: channel.Actor.url,
     provider_name: 'PeerTube',
     provider_url: webserverUrl
   }
 
   if (thumbnailUrl !== undefined) {
     json.thumbnail_url = thumbnailUrl
-    json.thumbnail_width = PREVIEWS_SIZE.width
-    json.thumbnail_height = PREVIEWS_SIZE.height
+    json.thumbnail_width = previewSize.width
+    json.thumbnail_height = previewSize.height
   }
 
-  return res.json(json)
+  return json
+}
+
+function redirectToAccountUrl (req: express.Request, res: express.Response, next: express.NextFunction) {
+  return res.redirect(res.locals.account.Actor.url)
 }