aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers/api
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-10-02 09:02:47 +0200
committerChocobozzz <me@florianbigard.com>2018-10-02 09:02:47 +0200
commit913f08f2bd5b03c121ee65751e938e4faa27e7f1 (patch)
tree968f024c2ebc253c054824526499ea4a87dc3a7b /server/controllers/api
parentc049d791f92cc10f569ee3122edff616cff381f9 (diff)
downloadPeerTube-913f08f2bd5b03c121ee65751e938e4faa27e7f1.tar.gz
PeerTube-913f08f2bd5b03c121ee65751e938e4faa27e7f1.tar.zst
PeerTube-913f08f2bd5b03c121ee65751e938e4faa27e7f1.zip
Fix get version
Diffstat (limited to 'server/controllers/api')
-rw-r--r--server/controllers/api/config.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts
index 633cf5e34..f14104d7f 100644
--- a/server/controllers/api/config.ts
+++ b/server/controllers/api/config.ts
@@ -10,7 +10,7 @@ import { customConfigUpdateValidator } from '../../middlewares/validators/config
10import { ClientHtml } from '../../lib/client-html' 10import { ClientHtml } from '../../lib/client-html'
11import { auditLoggerFactory, CustomConfigAuditView, getAuditIdFromRes } from '../../helpers/audit-logger' 11import { auditLoggerFactory, CustomConfigAuditView, getAuditIdFromRes } from '../../helpers/audit-logger'
12import { remove, writeJSON } from 'fs-extra' 12import { remove, writeJSON } from 'fs-extra'
13import { version } from '../../tools/cli' 13import { getVersion } from '../../helpers/utils'
14 14
15const packageJSON = require('../../../../package.json') 15const packageJSON = require('../../../../package.json')
16const configRouter = express.Router() 16const configRouter = express.Router()
@@ -43,7 +43,7 @@ let serverCommit: string
43async function getConfig (req: express.Request, res: express.Response, next: express.NextFunction) { 43async function getConfig (req: express.Request, res: express.Response, next: express.NextFunction) {
44 const allowed = await isSignupAllowed() 44 const allowed = await isSignupAllowed()
45 const allowedForCurrentIP = isSignupAllowedForCurrentIP(req.ip) 45 const allowedForCurrentIP = isSignupAllowedForCurrentIP(req.ip)
46 serverCommit = (serverCommit) ? serverCommit : version() 46 serverCommit = (serverCommit) ? serverCommit : getVersion()
47 if (serverCommit === packageJSON.version) serverCommit = '' 47 if (serverCommit === packageJSON.version) serverCommit = ''
48 48
49 const enabledResolutions = Object.keys(CONFIG.TRANSCODING.RESOLUTIONS) 49 const enabledResolutions = Object.keys(CONFIG.TRANSCODING.RESOLUTIONS)