Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #8133, check if user is in room before removing

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-01-23 22:40:14 -05:00
parent 30c503611c
commit 23810cc64b
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/messaging/rooms.js
View File

@@ -111,6 +111,9 @@ module.exports = function (Messaging) {
}; };
Messaging.leaveRoom = async (uids, roomId) => { Messaging.leaveRoom = async (uids, roomId) => {
const isInRoom = await Promise.all(uids.map(uid => Messaging.isUserInRoom(uid, roomId)));
uids = uids.filter((uid, index) => isInRoom[index]);
const keys = uids const keys = uids
.map(uid => 'uid:' + uid + ':chat:rooms') .map(uid => 'uid:' + uid + ':chat:rooms')
.concat(uids.map(uid => 'uid:' + uid + ':chat:rooms:unread')); .concat(uids.map(uid => 'uid:' + uid + ':chat:rooms:unread'));
@@ -125,6 +128,9 @@ module.exports = function (Messaging) {
}; };
Messaging.leaveRooms = async (uid, roomIds) => { Messaging.leaveRooms = async (uid, roomIds) => {
const isInRoom = await Promise.all(roomIds.map(roomId => Messaging.isUserInRoom(uid, roomId)));
roomIds = roomIds.filter((roomId, index) => isInRoom[index]);
const roomKeys = roomIds.map(roomId => 'chat:room:' + roomId + ':uids'); const roomKeys = roomIds.map(roomId => 'chat:room:' + roomId + ':uids');
await Promise.all([ await Promise.all([
db.sortedSetsRemove(roomKeys, uid), db.sortedSetsRemove(roomKeys, uid),

9
test/messaging.js
View File

@@ -222,6 +222,15 @@ describe('Messaging Library', function () {
}); });
}); });
it('should send not a user-leave system message when a user tries to leave a room they are not in', async () => {
await socketModules.chats.leave({ uid: bazUid }, roomId);
const messages = await socketModules.chats.getMessages({ uid: fooUid }, { uid: fooUid, roomId: roomId, start: 0 });
assert.equal(messages.length, 4);
const message = messages.pop();
assert.strictEqual(message.system, true);
assert.strictEqual(message.content, 'user-leave');
});
it('should change owner when owner leaves room', function (done) { it('should change owner when owner leaves room', function (done) {
socketModules.chats.newRoom({ uid: herpUid }, { touid: fooUid }, function (err, roomId) { socketModules.chats.newRoom({ uid: herpUid }, { touid: fooUid }, function (err, roomId) {
assert.ifError(err); assert.ifError(err);