Add TMP persistent directory

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

diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index ba3c54440a43d20d93aedee0c52afd94e477fdd0..a85c1072019d8ab01e5f519506f652500c544011 100644 (file)
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -1,13 +1,13 @@
-import * as express from 'express'
+import express from 'express'
 import { constants, promises as fs } from 'fs'
 import { readFile } from 'fs-extra'
 import { join } from 'path'
 import { logger } from '@server/helpers/logger'
 import { CONFIG } from '@server/initializers/config'
 import { Hooks } from '@server/lib/plugins/hooks'
-import { HttpStatusCode } from '@shared/models'
 import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '@shared/core-utils/i18n'
-import { root } from '../helpers/core-utils'
+import { HttpStatusCode } from '@shared/models'
+import { root } from '@shared/core-utils'
 import { STATIC_MAX_AGE } from '../initializers/constants'
 import { ClientHtml, sendHTML, serveIndexHTML } from '../lib/client-html'
 import { asyncMiddleware, embedCSP } from '../middlewares'
@@ -65,7 +65,12 @@ const staticClientOverrides = [
   'assets/images/icons/icon-96x96.png',
   'assets/images/icons/icon-144x144.png',
   'assets/images/icons/icon-192x192.png',
-  'assets/images/icons/icon-512x512.png'
+  'assets/images/icons/icon-512x512.png',
+  'assets/images/default-playlist.jpg',
+  'assets/images/default-avatar-account.png',
+  'assets/images/default-avatar-account-48x48.png',
+  'assets/images/default-avatar-video-channel.png',
+  'assets/images/default-avatar-video-channel-48x48.png'
 ]
 
 for (const staticClientOverride of staticClientOverrides) {
@@ -133,33 +138,40 @@ async function generateEmbedHtmlPage (req: express.Request, res: express.Respons
 }
 
 async function generateWatchHtmlPage (req: express.Request, res: express.Response) {
-  const html = await ClientHtml.getWatchHTMLPage(req.params.id + '', req, res)
+  // Thread link is '/w/:videoId;threadId=:threadId'
+  // So to get the videoId we need to remove the last part
+  let videoId = req.params.id + ''
 
-  return sendHTML(html, res)
+  const threadIdIndex = videoId.indexOf(';threadId')
+  if (threadIdIndex !== -1) videoId = videoId.substring(0, threadIdIndex)
+
+  const html = await ClientHtml.getWatchHTMLPage(videoId, req, res)
+
+  return sendHTML(html, res, true)
 }
 
 async function generateWatchPlaylistHtmlPage (req: express.Request, res: express.Response) {
   const html = await ClientHtml.getWatchPlaylistHTMLPage(req.params.id + '', req, res)
 
-  return sendHTML(html, res)
+  return sendHTML(html, res, true)
 }
 
 async function generateAccountHtmlPage (req: express.Request, res: express.Response) {
   const html = await ClientHtml.getAccountHTMLPage(req.params.nameWithHost, req, res)
 
-  return sendHTML(html, res)
+  return sendHTML(html, res, true)
 }
 
 async function generateVideoChannelHtmlPage (req: express.Request, res: express.Response) {
   const html = await ClientHtml.getVideoChannelHTMLPage(req.params.nameWithHost, req, res)
 
-  return sendHTML(html, res)
+  return sendHTML(html, res, true)
 }
 
 async function generateActorHtmlPage (req: express.Request, res: express.Response) {
   const html = await ClientHtml.getActorHTMLPage(req.params.nameWithHost, req, res)
 
-  return sendHTML(html, res)
+  return sendHTML(html, res, true)
 }
 
 async function generateManifest (req: express.Request, res: express.Response) {