X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fclient.ts;h=045a50ef0375d49bf4b24e31cab2e6cad45111eb;hb=608624252466acf9f1d9ee1c1170bd4fe4d18d18;hp=b23f7e1aeb4fc6add8e640e7b55b563567325800;hpb=0b7db72af30403fb6c7d906a4c239a5519cf934d;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index b23f7e1ae..045a50ef0 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -1,16 +1,18 @@
import * as express from 'express'
import { join } from 'path'
import * as validator from 'validator'
-import * as Promise from 'bluebird'
+import * as Bluebird from 'bluebird'
import { database as db } from '../initializers/database'
import {
CONFIG,
STATIC_PATHS,
STATIC_MAX_AGE,
- OPENGRAPH_COMMENT
+ OPENGRAPH_AND_OEMBED_COMMENT,
+ EMBED_SIZE
} from '../initializers'
-import { root, readFileBufferPromise } from '../helpers'
+import { root, readFileBufferPromise, escapeHTML } from '../helpers'
+import { asyncMiddleware } from '../middlewares'
import { VideoInstance } from '../models'
const clientsRouter = express.Router()
@@ -19,9 +21,11 @@ const distPath = join(root(), 'client', 'dist')
const embedPath = join(distPath, 'standalone', 'videos', 'embed.html')
const indexPath = join(distPath, 'index.html')
-// Special route that add OpenGraph tags
+// Special route that add OpenGraph and oEmbed tags
// Do not use a template engine for a so little thing
-clientsRouter.use('/videos/watch/:id', generateWatchHtmlPage)
+clientsRouter.use('/videos/watch/:id',
+ asyncMiddleware(generateWatchHtmlPage)
+)
clientsRouter.use('/videos/embed', (req: express.Request, res: express.Response, next: express.NextFunction) => {
res.sendFile(embedPath)
@@ -43,66 +47,86 @@ export {
// ---------------------------------------------------------------------------
-function addOpenGraphTags (htmlStringPage: string, video: VideoInstance) {
+function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoInstance) {
const previewUrl = CONFIG.WEBSERVER.URL + STATIC_PATHS.PREVIEWS + video.getPreviewName()
- const videoUrl = CONFIG.WEBSERVER.URL + '/videos/watch/' + video.id
+ const videoUrl = CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid
- const metaTags = {
+ const videoName = escapeHTML(video.name)
+ const videoDescription = escapeHTML(video.description)
+ const embedUrl = CONFIG.WEBSERVER.URL + video.getEmbedPath()
+
+ const openGraphMetaTags = {
'og:type': 'video',
- 'og:title': video.name,
+ 'og:title': videoName,
'og:image': previewUrl,
'og:url': videoUrl,
- 'og:description': video.description,
+ 'og:description': videoDescription,
+
+ 'og:video:url': embedUrl,
+ 'og:video:secure_url': embedUrl,
+ 'og:video:type': 'text/html',
+ 'og:video:width': EMBED_SIZE.width,
+ 'og:video:height': EMBED_SIZE.height,
- 'name': video.name,
- 'description': video.description,
+ 'name': videoName,
+ 'description': videoDescription,
'image': previewUrl,
'twitter:card': 'summary_large_image',
'twitter:site': '@Chocobozzz',
- 'twitter:title': video.name,
- 'twitter:description': video.description,
- 'twitter:image': previewUrl
+ 'twitter:title': videoName,
+ 'twitter:description': videoDescription,
+ 'twitter:image': previewUrl,
+ 'twitter:player': embedUrl,
+ 'twitter:player:width': EMBED_SIZE.width,
+ 'twitter:player:height': EMBED_SIZE.height
}
+ const oembedLinkTags = [
+ {
+ type: 'application/json+oembed',
+ href: CONFIG.WEBSERVER.URL + '/services/oembed?url=' + encodeURIComponent(videoUrl),
+ title: videoName
+ }
+ ]
+
let tagsString = ''
- Object.keys(metaTags).forEach(tagName => {
- const tagValue = metaTags[tagName]
+ Object.keys(openGraphMetaTags).forEach(tagName => {
+ const tagValue = openGraphMetaTags[tagName]
- tagsString += ''
+ tagsString += ``
})
- return htmlStringPage.replace(OPENGRAPH_COMMENT, tagsString)
+ for (const oembedLinkTag of oembedLinkTags) {
+ tagsString += ``
+ }
+
+ return htmlStringPage.replace(OPENGRAPH_AND_OEMBED_COMMENT, tagsString)
}
-function generateWatchHtmlPage (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function generateWatchHtmlPage (req: express.Request, res: express.Response, next: express.NextFunction) {
const videoId = '' + req.params.id
- let videoPromise: Promise
+ let videoPromise: Bluebird
// Let Angular application handle errors
if (validator.isUUID(videoId, 4)) {
- videoPromise = db.Video.loadByUUIDAndPopulateAuthorAndPodAndTags(videoId)
+ videoPromise = db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(videoId)
} else if (validator.isInt(videoId)) {
- videoPromise = db.Video.loadAndPopulateAuthorAndPodAndTags(+videoId)
+ videoPromise = db.Video.loadAndPopulateAccountAndServerAndTags(+videoId)
} else {
return res.sendFile(indexPath)
}
- Promise.all([
+ let [ file, video ] = await Promise.all([
readFileBufferPromise(indexPath),
videoPromise
])
- .then(([ file, video ]) => {
- file = file as Buffer
- video = video as VideoInstance
- const html = file.toString()
+ const html = file.toString()
- // Let Angular application handle errors
- if (!video) return res.sendFile(indexPath)
+ // Let Angular application handle errors
+ if (!video) return res.sendFile(indexPath)
- const htmlStringPageWithTags = addOpenGraphTags(html, video)
- res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags)
- })
- .catch(err => next(err))
+ const htmlStringPageWithTags = addOpenGraphAndOEmbedTags(html, video)
+ res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags)
}