X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fclient.ts;h=f9514d988f9be01d262aaa6837251351a3695814;hb=458685e0d039a0ad3fa4f26d99746f7d6d0b40e9;hp=eb1ee6cbd6e8e6e546cbb118003a9599ea071dc6;hpb=76148b27f7501bac061992136852be4303370c8d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/client.ts b/server/controllers/client.ts index eb1ee6cbd..f9514d988 100644 --- 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/core-utils' 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) { @@ -135,31 +140,31 @@ 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) - return sendHTML(html, 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) {