Inactive device removal bug fix.
Ylian Saint-Hilaire committed
Aug 1, 2021 at 10:59 UTC
e63e7b54f453cc4b98440f8eb9ae0103a7af18f6
2 files changed
+2
-2
meshuser.js
+1
-1
@@ -2600,7 +2600,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
2600
2601
if (change != '') {
2602
db.Set(mesh);
2603
- var event = { etype: 'mesh', userid: user._id, username: user.name, meshid: mesh._id, name: mesh.name, mtype: mesh.mtype, desc: mesh.desc, flags: mesh.flags, consent: mesh.consent, action: 'meshchange', links: mesh.links, msg: change, domain: domain.id, invite: mesh.invite, expireDevs: mesh.expireDevs };
2603
+ var event = { etype: 'mesh', userid: user._id, username: user.name, meshid: mesh._id, name: mesh.name, mtype: mesh.mtype, desc: mesh.desc, flags: mesh.flags, consent: mesh.consent, action: 'meshchange', links: mesh.links, msg: change, domain: domain.id, invite: mesh.invite, expireDevs: command.expireDevs };
2604
if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the mesh. Another event will come.
2605
parent.parent.DispatchEvent(parent.CreateMeshDispatchTargets(mesh, [user._id]), obj, event);
2606
}
views/default.handlebars
+1
-1
@@ -2912,7 +2912,7 @@
2912
if (message.event.links) { meshes[message.event.meshid].links = message.event.links; }
2913
if (message.event.amt) { meshes[message.event.meshid].amt = message.event.amt; }
2914
if (message.event.invite != null) { meshes[message.event.meshid].invite = message.event.invite; } else { delete meshes[message.event.meshid].invite; }
2915
- if (message.event.expireDevs != null) { meshes[message.event.meshid].expireDevs = message.event.expireDevs; } else { delete meshes[message.event.meshid].expireDevs; }
2915
+ if (message.event.expireDevs != null) { if (message.event.expireDevs > 0) { meshes[message.event.meshid].expireDevs = message.event.expireDevs; } else { delete meshes[message.event.meshid].expireDevs; } }
2916
2917
// Check if we lost rights to this mesh in this change.
2918
if (IsMeshViewable(message.event.meshid) == false) {