Node.js based forum software built for the modern web
fix: leaving a group removed users from the wrong public chat rooms (#14900)
palmoni56c4ecd3df7b3
diff --git a/src/groups/leave.js b/src/groups/leave.jsindex 35f1668a95..54c8438806 100644--- a/src/groups/leave.js+++ b/src/groups/leave.js@@ -78,7 +78,7 @@ module.exports = function (Groups) {roomData.map(r => r.roomId),await Promise.all(roomData.map(r => Groups.isMemberOfAny(uid, r.groups))));- const roomIds = roomData.filter(r => isMemberOfAny[r.roomId]).map(r => r.roomId);+ const roomIds = roomData.filter(r => !isMemberOfAny[r.roomId]).map(r => r.roomId);await messaging.leaveRooms(uid, roomIds);}diff --git a/test/groups.js b/test/groups.jsindex 1b3d12f53e..4b648c9b5e 100644--- a/test/groups.js+++ b/test/groups.js@@ -874,6 +874,44 @@ describe('Groups', () => {});});});++ describe('public chat rooms restricted to groups', () => {+ const messaging = require('../src/messaging');+ let uid;++ async function createRoomFor(groupNames) {+ const roomId = await messaging.newRoom(adminUid, {+ type: 'public',+ roomName: utils.generateUUID(),+ groups: groupNames,+ });+ await messaging.loadRoom(uid, { roomId });+ assert(await messaging.isUserInRoom(uid, roomId));+ return roomId;+ }++ before(async () => {+ uid = await User.create({ username: 'public-room-leaver' });+ await Groups.create({ name: 'room-group-a' });+ await Groups.create({ name: 'room-group-b' });+ });++ beforeEach(async () => {+ await Groups.join(['room-group-a', 'room-group-b'], uid);+ });++ it('should remove the user from a room they can no longer enter', async () => {+ const roomId = await createRoomFor(['room-group-a']);+ await Groups.leave('room-group-a', uid);+ assert.strictEqual(await messaging.isUserInRoom(uid, roomId), false);+ });++ it('should keep the user in a room another of their groups still lets them into', async () => {+ const roomId = await createRoomFor(['room-group-a', 'room-group-b']);+ await Groups.leave('room-group-a', uid);+ assert.strictEqual(await messaging.isUserInRoom(uid, roomId), true);+ });+ });});describe('.leaveAllGroups()', () => {