forks/peertube
1
0
Fork 0
Code Releases Activity

Add video title/description when rendering html

Browse source
This commit is contained in:
Chocobozzz 2018-12-14 15:49:36 +01:00
parent a46934c825
commit 9aac44236c
No known key found for this signature in database
GPG key ID: 583A612D890159BE
2 changed files with 41 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
server/controllers/client.ts
View file

@ -16,22 +16,20 @@ const testEmbedPath = join(distPath, 'standalone', 'videos', 'test-embed.html')
// Special route that add OpenGraph and oEmbed tags // Special route that add OpenGraph and oEmbed tags
// Do not use a template engine for a so little thing // Do not use a template engine for a so little thing
clientsRouter.use('/videos/watch/:id', clientsRouter.use('/videos/watch/:id', asyncMiddleware(generateWatchHtmlPage))
asyncMiddleware(generateWatchHtmlPage)
)
clientsRouter.use('' + clientsRouter.use(
'/videos/embed', '/videos/embed',
embedCSP, embedCSP,
(req: express.Request, res: express.Response, next: express.NextFunction) => { (req: express.Request, res: express.Response) => {
res.removeHeader('X-Frame-Options') res.removeHeader('X-Frame-Options')
res.sendFile(embedPath) res.sendFile(embedPath)
} }
) )
clientsRouter.use('' + clientsRouter.use(
'/videos/test-embed', (req: express.Request, res: express.Response, next: express.NextFunction) => { '/videos/test-embed',
res.sendFile(testEmbedPath) (req: express.Request, res: express.Response) => res.sendFile(testEmbedPath)
}) )
// Static HTML/CSS/JS client files // Static HTML/CSS/JS client files
@ -90,7 +88,7 @@ export {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
async function generateHTMLPage (req: express.Request, res: express.Response, paramLang?: string) { async function generateHTMLPage (req: express.Request, res: express.Response, paramLang?: string) {
const html = await ClientHtml.getIndexHTML(req, res, paramLang) const html = await ClientHtml.getDefaultHTMLPage(req, res, paramLang)
return sendHTML(html, res) return sendHTML(html, res)
} }

51
server/lib/client-html.ts
View file

@ -18,21 +18,13 @@ export class ClientHtml {
ClientHtml.htmlCache = {} ClientHtml.htmlCache = {}
} }
static async getIndexHTML (req: express.Request, res: express.Response, paramLang?: string) { static async getDefaultHTMLPage (req: express.Request, res: express.Response, paramLang?: string) {
const path = ClientHtml.getIndexPath(req, res, paramLang) const html = await ClientHtml.getIndexHTML(req, res, paramLang)
if (ClientHtml.htmlCache[path]) return ClientHtml.htmlCache[path]
const buffer = await readFile(path) let customHtml = ClientHtml.addTitleTag(html)
customHtml = ClientHtml.addDescriptionTag(customHtml)
let html = buffer.toString() return customHtml
html = ClientHtml.addTitleTag(html)
html = ClientHtml.addDescriptionTag(html)
html = ClientHtml.addCustomCSS(html)
ClientHtml.htmlCache[path] = html
return html
} }
static async getWatchHTMLPage (videoId: string, req: express.Request, res: express.Response) { static async getWatchHTMLPage (videoId: string, req: express.Request, res: express.Response) {
@ -55,7 +47,26 @@ export class ClientHtml {
return ClientHtml.getIndexHTML(req, res) return ClientHtml.getIndexHTML(req, res)
} }
return ClientHtml.addOpenGraphAndOEmbedTags(html, video) let customHtml = ClientHtml.addTitleTag(html, escapeHTML(video.name))
customHtml = ClientHtml.addDescriptionTag(customHtml, escapeHTML(video.description))
customHtml = ClientHtml.addOpenGraphAndOEmbedTags(customHtml, video)
return customHtml
}
private static async getIndexHTML (req: express.Request, res: express.Response, paramLang?: string) {
const path = ClientHtml.getIndexPath(req, res, paramLang)
if (ClientHtml.htmlCache[path]) return ClientHtml.htmlCache[path]
const buffer = await readFile(path)
let html = buffer.toString()
html = ClientHtml.addCustomCSS(html)
ClientHtml.htmlCache[path] = html
return html
} }
private static getIndexPath (req: express.Request, res: express.Response, paramLang?: string) { private static getIndexPath (req: express.Request, res: express.Response, paramLang?: string) {
@ -81,14 +92,18 @@ export class ClientHtml {
return join(__dirname, '../../../client/dist/' + buildFileLocale(lang) + '/index.html') return join(__dirname, '../../../client/dist/' + buildFileLocale(lang) + '/index.html')
} }
private static addTitleTag (htmlStringPage: string) { private static addTitleTag (htmlStringPage: string, title?: string) {
const titleTag = '<title>' + CONFIG.INSTANCE.NAME + '</title>' let text = title || CONFIG.INSTANCE.NAME
if (title) text += ` - ${CONFIG.INSTANCE.NAME}`
const titleTag = `<title>${text}</title>`
return htmlStringPage.replace(CUSTOM_HTML_TAG_COMMENTS.TITLE, titleTag) return htmlStringPage.replace(CUSTOM_HTML_TAG_COMMENTS.TITLE, titleTag)
} }
private static addDescriptionTag (htmlStringPage: string) { private static addDescriptionTag (htmlStringPage: string, description?: string) {
const descriptionTag = `<meta name="description" content="${CONFIG.INSTANCE.SHORT_DESCRIPTION}" />` const content = description || CONFIG.INSTANCE.SHORT_DESCRIPTION
const descriptionTag = `<meta name="description" content="${content}" />`
return htmlStringPage.replace(CUSTOM_HTML_TAG_COMMENTS.DESCRIPTION, descriptionTag) return htmlStringPage.replace(CUSTOM_HTML_TAG_COMMENTS.DESCRIPTION, descriptionTag)
} }