OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix #5744: Missing plugins-global.css + missing async (#5746) 

* Fix #5744: Missing plugins-global.css + missing async

* Modifications required by Chocobozzz.

* Styling

---------

Co-authored-by: Chocobozzz <me@florianbigard.com>
pull/5817/head
John Livingston 2023-05-10 09:54:44 +02:00 committed by GitHub
parent 674f8ddd41
commit f9eee54f2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/lib/client-html.ts
View File

@ -1,5 +1,5 @@
import express from 'express' import express from 'express'
import { readFile } from 'fs-extra' import { pathExists, readFile } from 'fs-extra'
import { join } from 'path' import { join } from 'path'
import validator from 'validator' import validator from 'validator'
import { isTestOrDevInstance } from '@server/helpers/core-utils' import { isTestOrDevInstance } from '@server/helpers/core-utils'
@ -408,7 +408,20 @@ class ClientHtml {
} }
private static async addAsyncPluginCSS (htmlStringPage: string) { private static async addAsyncPluginCSS (htmlStringPage: string) {
const globalCSSContent = await readFile(PLUGIN_GLOBAL_CSS_PATH) if (!pathExists(PLUGIN_GLOBAL_CSS_PATH)) {
logger.info('Plugin Global CSS file is not available (generation may still be in progress), ignoring it.')
return htmlStringPage
}
let globalCSSContent: Buffer
try {
globalCSSContent = await readFile(PLUGIN_GLOBAL_CSS_PATH)
} catch (err) {
logger.error('Error retrieving the Plugin Global CSS file, ignoring it.', { err })
return htmlStringPage
}
if (globalCSSContent.byteLength === 0) return htmlStringPage if (globalCSSContent.byteLength === 0) return htmlStringPage
const fileHash = sha256(globalCSSContent) const fileHash = sha256(globalCSSContent)