X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fclient.ts;h=385757fa6bb45729433b142458f918e9a815589e;hb=ff193d5e3fbe648f689be2e235dcf88daa1bba48;hp=df2eee9c987278711ffc3f1f1ce85668441a390b;hpb=1f30a1853e38c20a45722dbd6d38aaaec63839e8;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index df2eee9c9..385757fa6 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -3,16 +3,18 @@ import * as express from 'express'
import { join } from 'path'
import * as validator from 'validator'
import { escapeHTML, readFileBufferPromise, root } from '../helpers/core-utils'
-import { CONFIG, EMBED_SIZE, OPENGRAPH_AND_OEMBED_COMMENT, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers'
+import { ACCEPT_HEADERS, CONFIG, EMBED_SIZE, OPENGRAPH_AND_OEMBED_COMMENT, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers'
import { asyncMiddleware } from '../middlewares'
import { VideoModel } from '../models/video/video'
+import { VideoPrivacy } from '../../shared/models/videos'
+import { buildFileLocale, getCompleteLocale, getDefaultLocale, is18nLocale } from '../../shared/models'
+import { LOCALE_FILES } from '../../shared/models/i18n/i18n'
const clientsRouter = express.Router()
const distPath = join(root(), 'client', 'dist')
const assetsImagesPath = join(root(), 'client', 'dist', 'assets', 'images')
const embedPath = join(distPath, 'standalone', 'videos', 'embed.html')
-const indexPath = join(distPath, 'index.html')
// Special route that add OpenGraph and oEmbed tags
// Do not use a template engine for a so little thing
@@ -39,11 +41,34 @@ for (const staticClientFile of staticClientFiles) {
clientsRouter.use('/client', express.static(distPath, { maxAge: STATIC_MAX_AGE }))
clientsRouter.use('/client/assets/images', express.static(assetsImagesPath, { maxAge: STATIC_MAX_AGE }))
+clientsRouter.use('/client/locales/:locale/:file.json', function (req, res) {
+ const locale = req.params.locale
+ const file = req.params.file
+
+ if (is18nLocale(locale) && LOCALE_FILES.indexOf(file) !== -1) {
+ const completeLocale = getCompleteLocale(locale)
+ const completeFileLocale = buildFileLocale(completeLocale)
+ return res.sendFile(join(__dirname, `../../../client/dist/locale/${file}_${completeFileLocale}.json`))
+ }
+
+ return res.sendStatus(404)
+})
+
// 404 for static files not found
clientsRouter.use('/client/*', (req: express.Request, res: express.Response, next: express.NextFunction) => {
res.sendStatus(404)
})
+// Always serve index client page (the client is a single page application, let it handle routing)
+// Try to provide the right language index.html
+clientsRouter.use('/(:language)?', function (req, res) {
+ if (req.accepts(ACCEPT_HEADERS) === 'html') {
+ return res.sendFile(getIndexPath(req, req.params.language))
+ }
+
+ return res.status(404).end()
+})
+
// ---------------------------------------------------------------------------
export {
@@ -52,6 +77,21 @@ export {
// ---------------------------------------------------------------------------
+function getIndexPath (req: express.Request, paramLang?: string) {
+ let lang: string
+
+ // Check param lang validity
+ if (paramLang && is18nLocale(paramLang)) {
+ lang = paramLang
+ } else {
+ // lang = req.acceptsLanguages(POSSIBLE_LOCALES) || getDefaultLocale()
+ // Disable auto language for now
+ lang = getDefaultLocale()
+ }
+
+ return join(__dirname, '../../../client/dist/' + buildFileLocale(lang) + '/index.html')
+}
+
function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) {
const previewUrl = CONFIG.WEBSERVER.URL + STATIC_PATHS.PREVIEWS + video.getPreviewName()
const videoUrl = CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid
@@ -77,8 +117,8 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) {
'description': videoDescriptionEscaped,
'image': previewUrl,
- 'twitter:card': 'summary_large_image',
- 'twitter:site': '@Chocobozzz',
+ 'twitter:card': CONFIG.SERVICES.TWITTER.WHITELISTED ? 'player' : 'summary_large_image',
+ 'twitter:site': CONFIG.SERVICES.TWITTER.USERNAME,
'twitter:title': videoNameEscaped,
'twitter:description': videoDescriptionEscaped,
'twitter:image': previewUrl,
@@ -100,11 +140,12 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) {
'@type': 'VideoObject',
name: videoNameEscaped,
description: videoDescriptionEscaped,
+ thumbnailUrl: previewUrl,
+ uploadDate: video.createdAt.toISOString(),
duration: video.getActivityStreamDuration(),
- thumbnailURL: previewUrl,
- contentURL: videoUrl,
- embedURL: embedUrl,
- uploadDate: video.createdAt
+ contentUrl: videoUrl,
+ embedUrl: embedUrl,
+ interactionCount: video.views
}
let tagsString = ''
@@ -124,6 +165,9 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) {
// Schema.org
tagsString += ``
+ // SEO
+ tagsString += ``
+
return htmlStringPage.replace(OPENGRAPH_AND_OEMBED_COMMENT, tagsString)
}
@@ -137,18 +181,18 @@ async function generateWatchHtmlPage (req: express.Request, res: express.Respons
} else if (validator.isInt(videoId)) {
videoPromise = VideoModel.loadAndPopulateAccountAndServerAndTags(+videoId)
} else {
- return res.sendFile(indexPath)
+ return res.sendFile(getIndexPath(req))
}
let [ file, video ] = await Promise.all([
- readFileBufferPromise(indexPath),
+ readFileBufferPromise(getIndexPath(req)),
videoPromise
])
const html = file.toString()
// Let Angular application handle errors
- if (!video) return res.sendFile(indexPath)
+ if (!video || video.privacy === VideoPrivacy.PRIVATE) return res.sendFile(getIndexPath(req))
const htmlStringPageWithTags = addOpenGraphAndOEmbedTags(html, video)
res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags)