X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fclient.ts;h=b23f7e1aeb4fc6add8e640e7b55b563567325800;hb=aa2e7f1501ce108e0c250538aba7046fddefc935;hp=d42e8396df39be22621d0bbcbb0d540bbc506a9b;hpb=709756b8e183f67ef9bf8f7bc149af4736260350;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index d42e8396d..b23f7e1ae 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -6,7 +6,6 @@ import * as Promise from 'bluebird'
import { database as db } from '../initializers/database'
import {
CONFIG,
- REMOTE_SCHEME,
STATIC_PATHS,
STATIC_MAX_AGE,
OPENGRAPH_COMMENT
@@ -24,7 +23,7 @@ const indexPath = join(distPath, 'index.html')
// Do not use a template engine for a so little thing
clientsRouter.use('/videos/watch/:id', generateWatchHtmlPage)
-clientsRouter.use('/videos/embed', function (req: express.Request, res: express.Response, next: express.NextFunction) {
+clientsRouter.use('/videos/embed', (req: express.Request, res: express.Response, next: express.NextFunction) => {
res.sendFile(embedPath)
})
@@ -32,7 +31,7 @@ clientsRouter.use('/videos/embed', function (req: express.Request, res: express.
clientsRouter.use('/client', express.static(distPath, { maxAge: STATIC_MAX_AGE }))
// 404 for static files not found
-clientsRouter.use('/client/*', function (req: express.Request, res: express.Response, next: express.NextFunction) {
+clientsRouter.use('/client/*', (req: express.Request, res: express.Response, next: express.NextFunction) => {
res.sendStatus(404)
})
@@ -45,18 +44,7 @@ export {
// ---------------------------------------------------------------------------
function addOpenGraphTags (htmlStringPage: string, video: VideoInstance) {
- let basePreviewUrlHttp
-
- if (video.isOwned()) {
- basePreviewUrlHttp = CONFIG.WEBSERVER.URL
- } else {
- basePreviewUrlHttp = REMOTE_SCHEME.HTTP + '://' + video.Author.Pod.host
- }
-
- // We fetch the remote preview (bigger than the thumbnail)
- // This should not overhead the remote server since social websites put in a cache the OpenGraph tags
- // We can't use the thumbnail because these social websites want bigger images (> 200x200 for Facebook for example)
- const previewUrl = basePreviewUrlHttp + STATIC_PATHS.PREVIEWS + video.getPreviewName()
+ const previewUrl = CONFIG.WEBSERVER.URL + STATIC_PATHS.PREVIEWS + video.getPreviewName()
const videoUrl = CONFIG.WEBSERVER.URL + '/videos/watch/' + video.id
const metaTags = {
@@ -78,7 +66,7 @@ function addOpenGraphTags (htmlStringPage: string, video: VideoInstance) {
}
let tagsString = ''
- Object.keys(metaTags).forEach(function (tagName) {
+ Object.keys(metaTags).forEach(tagName => {
const tagValue = metaTags[tagName]
tagsString += ''
@@ -89,13 +77,20 @@ function addOpenGraphTags (htmlStringPage: string, video: VideoInstance) {
function generateWatchHtmlPage (req: express.Request, res: express.Response, next: express.NextFunction) {
const videoId = '' + req.params.id
+ let videoPromise: Promise
// Let Angular application handle errors
- if (!validator.isUUID(videoId, 4)) return res.sendFile(indexPath)
+ if (validator.isUUID(videoId, 4)) {
+ videoPromise = db.Video.loadByUUIDAndPopulateAuthorAndPodAndTags(videoId)
+ } else if (validator.isInt(videoId)) {
+ videoPromise = db.Video.loadAndPopulateAuthorAndPodAndTags(+videoId)
+ } else {
+ return res.sendFile(indexPath)
+ }
Promise.all([
readFileBufferPromise(indexPath),
- db.Video.loadAndPopulateAuthorAndPodAndTags(videoId)
+ videoPromise
])
.then(([ file, video ]) => {
file = file as Buffer