import { Hooks } from '@server/lib/plugins/hooks'
import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '@shared/core-utils/i18n'
import { HttpStatusCode } from '@shared/models'
-import { root } from '../helpers/core-utils'
+import { root } from '@shared/core-utils'
import { STATIC_MAX_AGE } from '../initializers/constants'
import { ClientHtml, sendHTML, serveIndexHTML } from '../lib/client-html'
-import { asyncMiddleware, disableRobots, embedCSP } from '../middlewares'
+import { asyncMiddleware, embedCSP } from '../middlewares'
const clientsRouter = express.Router()
'assets/images/icons/icon-512x512.png',
'assets/images/default-playlist.jpg',
'assets/images/default-avatar-account.png',
- 'assets/images/default-avatar-video-channel.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) {
res.status(HttpStatusCode.NOT_FOUND_404).end()
})
-// No index exceptions
-clientsRouter.all('/about/peertube',
- disableRobots,
- asyncMiddleware(serveIndexHTML)
-)
-
// 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)?', asyncMiddleware(serveIndexHTML))
}
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) {