Fix lint

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

diff --git a/server/controllers/services.ts b/server/controllers/services.ts
index d0217c30ae9db1dc7ee882674f79fa04c00488a0..cabcbc00b440efb8a2f0d18156561f3c3dbccc22 100644 (file)
--- a/server/controllers/services.ts
+++ b/server/controllers/services.ts
@@ -1,8 +1,9 @@
-import * as express from 'express'
-import { EMBED_SIZE, PREVIEWS_SIZE, WEBSERVER, THUMBNAILS_SIZE } from '../initializers/constants'
+import express from 'express'
+import { MChannelSummary } from '@server/types/models'
+import { escapeHTML } from '@shared/core-utils/renderer'
+import { EMBED_SIZE, PREVIEWS_SIZE, THUMBNAILS_SIZE, WEBSERVER } from '../initializers/constants'
 import { asyncMiddleware, oembedValidator } from '../middlewares'
 import { accountNameWithHostGetValidator } from '../middlewares/validators'
-import { MChannelSummary } from '@server/types/models'
 
 const servicesRouter = express.Router()
 
@@ -35,7 +36,7 @@ function generatePlaylistOEmbed (req: express.Request, res: express.Response) {
   const json = buildOEmbed({
     channel: playlist.VideoChannel,
     title: playlist.name,
-    embedPath: playlist.getEmbedStaticPath(),
+    embedPath: playlist.getEmbedStaticPath() + buildPlayerURLQuery(req.query.url),
     previewPath: playlist.getThumbnailStaticPath(),
     previewSize: THUMBNAILS_SIZE,
     req
@@ -50,7 +51,7 @@ function generateVideoOEmbed (req: express.Request, res: express.Response) {
   const json = buildOEmbed({
     channel: video.VideoChannel,
     title: video.name,
-    embedPath: video.getEmbedStaticPath(),
+    embedPath: video.getEmbedStaticPath() + buildPlayerURLQuery(req.query.url),
     previewPath: video.getPreviewStaticPath(),
     previewSize: PREVIEWS_SIZE,
     req
@@ -59,6 +60,40 @@ function generateVideoOEmbed (req: express.Request, res: express.Response) {
   return res.json(json)
 }
 
+function buildPlayerURLQuery (inputQueryUrl: string) {
+  const allowedParameters = new Set([
+    'start',
+    'stop',
+    'loop',
+    'autoplay',
+    'muted',
+    'controls',
+    'controlBar',
+    'title',
+    'api',
+    'warningTitle',
+    'peertubeLink',
+    'p2p',
+    'subtitle',
+    'bigPlayBackgroundColor',
+    'mode',
+    'foregroundColor'
+  ])
+
+  const params = new URLSearchParams()
+
+  new URL(inputQueryUrl).searchParams.forEach((v, k) => {
+    if (allowedParameters.has(k)) {
+      params.append(k, v)
+    }
+  })
+
+  const stringQuery = params.toString()
+  if (!stringQuery) return ''
+
+  return '?' + stringQuery
+}
+
 function buildOEmbed (options: {
   req: express.Request
   title: string
@@ -77,16 +112,18 @@ function buildOEmbed (options: {
   const maxWidth = parseInt(req.query.maxwidth, 10)
 
   const embedUrl = webserverUrl + embedPath
-  let embedWidth = EMBED_SIZE.width
-  let embedHeight = EMBED_SIZE.height
+  const embedTitle = escapeHTML(title)
 
   let thumbnailUrl = previewPath
     ? webserverUrl + previewPath
     : undefined
 
-  if (maxHeight < embedHeight) embedHeight = maxHeight
+  let embedWidth = EMBED_SIZE.width
   if (maxWidth < embedWidth) embedWidth = maxWidth
 
+  let embedHeight = EMBED_SIZE.height
+  if (maxHeight < embedHeight) embedHeight = maxHeight
+
   // Our thumbnail is too big for the consumer
   if (
     (maxHeight !== undefined && maxHeight < previewSize.height) ||
@@ -95,8 +132,8 @@ function buildOEmbed (options: {
     thumbnailUrl = undefined
   }
 
-  const html = `<iframe width="${embedWidth}" height="${embedHeight}" sandbox="allow-same-origin allow-scripts" ` +
-    `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',
@@ -104,7 +141,7 @@ function buildOEmbed (options: {
     html,
     width: embedWidth,
     height: embedHeight,
-    title: title,
+    title,
     author_name: channel.name,
     author_url: channel.Actor.url,
     provider_name: 'PeerTube',