Simplify removeuserfromusergroup - remove unneeded condition/variable
Noah Zalev committed
Dec 7, 2021 at 22:33 UTC
d1523c3bbf0027cb4b211dbb397d22ed406c3500
1 file changed
+3
-8
meshuser.js
+3
-8
@@ -6015,9 +6015,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
6015
6016
var chguser = parent.users[command.userid];
6017
if (chguser != null) {
6018
- var change = false;
6018
if ((chguser.links != null) && (chguser.links[command.ugrpid] != null)) {
6020
- change = true;
6019
delete chguser.links[command.ugrpid];
6020
6021
// Notify user change
@@ -6035,16 +6033,13 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
6033
if (group != null) {
6034
// Remove the user from the group
6035
if ((group.links != null) && (group.links[command.userid] != null)) {
6038
- change = true;
6036
delete group.links[command.userid];
6037
db.Set(group);
6038
6039
// Notify user group change
6043
- if (change) {
6044
- var event = { etype: 'ugrp', userid: user._id, username: user.name, ugrpid: group._id, name: group.name, desc: group.desc, action: 'usergroupchange', links: group.links, msgid: 72, msgArgs: [chguser.name, group.name], msg: 'Removed user ' + chguser.name + ' from user group ' + group.name, domain: removeUserDomain.id };
6045
- if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the user group. Another event will come.
6046
- parent.parent.DispatchEvent(['*', group._id, user._id, chguser._id], obj, event);
6047
- }
6040
+ var event = { etype: 'ugrp', userid: user._id, username: user.name, ugrpid: group._id, name: group.name, desc: group.desc, action: 'usergroupchange', links: group.links, msgid: 72, msgArgs: [chguser.name, group.name], msg: 'Removed user ' + chguser.name + ' from user group ' + group.name, domain: removeUserDomain.id };
6041
+ if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the user group. Another event will come.
6042
+ parent.parent.DispatchEvent(['*', group._id, user._id, chguser._id], obj, event);
6043
}
6044
}
6045
}