mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-14 01:45:47 +01:00
fix: #8133, check if user is in room before removing
This commit is contained in:
@@ -111,6 +111,9 @@ module.exports = function (Messaging) {
|
||||
};
|
||||
|
||||
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
|
||||
.map(uid => 'uid:' + uid + ':chat:rooms')
|
||||
.concat(uids.map(uid => 'uid:' + uid + ':chat:rooms:unread'));
|
||||
@@ -125,6 +128,9 @@ module.exports = function (Messaging) {
|
||||
};
|
||||
|
||||
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');
|
||||
await Promise.all([
|
||||
db.sortedSetsRemove(roomKeys, uid),
|
||||
|
||||
Reference in New Issue
Block a user