From 1b5e2d72900c8ceaf76940b72839d3c424ac96e8 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 23 Nov 2018 11:06:10 +0100 Subject: Optimize config endpoint --- server/controllers/api/config.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'server/controllers') diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index 03c1cec7b..5233e9f68 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts @@ -10,7 +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' +import { getServerCommit } from '../../helpers/utils' const packageJSON = require('../../../../package.json') const configRouter = express.Router() @@ -40,11 +40,11 @@ configRouter.delete('/custom', ) let serverCommit: string -async function getConfig (req: express.Request, res: express.Response, next: express.NextFunction) { +async function getConfig (req: express.Request, res: express.Response) { const allowed = await isSignupAllowed() const allowedForCurrentIP = isSignupAllowedForCurrentIP(req.ip) - serverCommit = (serverCommit) ? serverCommit : await getVersion() - if (serverCommit === packageJSON.version) serverCommit = '' + + if (serverCommit === undefined) serverCommit = await getServerCommit() const enabledResolutions = Object.keys(CONFIG.TRANSCODING.RESOLUTIONS) .filter(key => CONFIG.TRANSCODING.ENABLED === CONFIG.TRANSCODING.RESOLUTIONS[key] === true) -- cgit v1.2.3