X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fconfig.ts;h=03c1cec7b77dfc0141f4a0613dba02c672b97dd3;hb=030177d246834fdba89be9bbaeac497589b47102;hp=95549b7240fa64d90b0fa9c702f6dbdf7493c4b1;hpb=993cef4b6e000ee425087e5195dfe40cd0840243;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index 95549b724..03c1cec7b 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts @@ -10,6 +10,7 @@ import { customConfigUpdateValidator } from '../../middlewares/validators/config import { ClientHtml } from '../../lib/client-html' import { auditLoggerFactory, CustomConfigAuditView, getAuditIdFromRes } from '../../helpers/audit-logger' import { remove, writeJSON } from 'fs-extra' +import { getVersion } from '../../helpers/utils' const packageJSON = require('../../../../package.json') const configRouter = express.Router() @@ -38,9 +39,12 @@ configRouter.delete('/custom', asyncMiddleware(deleteCustomConfig) ) +let serverCommit: string async function getConfig (req: express.Request, res: express.Response, next: express.NextFunction) { const allowed = await isSignupAllowed() const allowedForCurrentIP = isSignupAllowedForCurrentIP(req.ip) + serverCommit = (serverCommit) ? serverCommit : await getVersion() + if (serverCommit === packageJSON.version) serverCommit = '' const enabledResolutions = Object.keys(CONFIG.TRANSCODING.RESOLUTIONS) .filter(key => CONFIG.TRANSCODING.ENABLED === CONFIG.TRANSCODING.RESOLUTIONS[key] === true) @@ -58,6 +62,7 @@ async function getConfig (req: express.Request, res: express.Response, next: exp } }, serverVersion: packageJSON.version, + serverCommit, signup: { allowed, allowedForCurrentIP,