Factorize myserver upgrade check
Noah Zalev committed
Aug 7, 2021 at 00:20 UTC
ccb9094217e4f972266ef13421e4ab83c2bcffc8
1 file changed
+7
-10
meshuser.js
+7
-10
@@ -5644,9 +5644,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
5644
5645
function serverCommandServerErrors(command) {
5646
// Load the server error log
5647
- if (userHasSiteUpdate() && domainHasMyServerErrorLog()) {
5647
+ if (userHasSiteUpdate() && domainHasMyServerErrorLog())
5648
fs.readFile(parent.parent.getConfigFilePath('mesherrors.txt'), 'utf8', function (err, data) { try { ws.send(JSON.stringify({ action: 'servererrors', data: data })); } catch (ex) { } });
5649
- }
5649
}
5650
5651
function serverCommandServerStats(command) {
@@ -5669,10 +5668,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
5668
if (req.session.loginToken != null) return;
5669
5670
// Perform server update
5672
- if (!userHasSiteUpdate()) return;
5673
- if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.upgrade !== true))) return;
5674
- if ((command.version != null) && (typeof command.version != 'string')) return;
5675
- parent.parent.performServerUpdate(command.version);
5671
+ if (userHasSiteUpdate() && domainHasMyServerUpgrade() && !((command.version != null) && (typeof command.version != 'string')))
5672
+ parent.parent.performServerUpdate(command.version);
5673
}
5674
5675
function serverCommandServerVersion(command) {
@@ -5680,9 +5677,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
5677
if (req.session.loginToken != null) return;
5678
5679
// Check the server version
5683
- if (!userHasSiteUpdate()) return;
5684
- if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.upgrade !== true))) return;
5685
- parent.parent.getServerTags(function (tags, err) { try { ws.send(JSON.stringify({ action: 'serverversion', tags: tags })); } catch (ex) { } });
5680
+ if (userHasSiteUpdate() && domainHasMyServerUpgrade())
5681
+ parent.parent.getServerTags(function (tags, err) { try { ws.send(JSON.stringify({ action: 'serverversion', tags: tags })); } catch (ex) { } });
5682
}
5683
5684
function serverCommandUsers(command) {
@@ -6287,7 +6283,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
6283
}
6284
6285
function userHasSiteUpdate() { return ((user.siteadmin & SITERIGHT_SERVERUPDATE) > 0); }
6290
- function domainHasMyServerErrorLog() { return !((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.errorlog !== true))) }
6286
+ function domainHasMyServerErrorLog() { return !((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.errorlog !== true))); }
6287
+ function domainHasMyServerUpgrade() { return !((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.upgrade !== true))); }
6288
6289
function csvClean(s) { return '\"' + s.split('\"').join('').split(',').join('').split('\r').join('').split('\n').join('') + '\"'; }
6290