Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-12 08:55:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #6313

Browse Source
This commit is contained in:
Baris Usakli
2018-02-07 15:46:11 -05:00
parent ecc2b9560d
commit e99d4a5c61
3 changed files with 79 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/messaging/rooms.js
View File

@@ -177,9 +177,44 @@ module.exports = function (Messaging) {
}));
db.sortedSetsRemove(keys, roomId, next);
},
function (next) {
updateOwner(roomId, next);
},
], callback);
};
Messaging.leaveRooms = function (uid, roomIds, callback) {
async.waterfall([
function (next) {
var roomKeys = roomIds.map(function (roomId) {
return 'chat:room:' + roomId + ':uids';
});
db.sortedSetsRemove(roomKeys, uid, next);
},
function (next) {
db.sortedSetRemove('uid:' + uid + ':chat:rooms', roomIds, next);
},
function (next) {
db.sortedSetRemove('uid:' + uid + ':chat:rooms:unread', roomIds, next);
},
function (next) {
async.eachSeries(roomIds, updateOwner, next);
},
], callback);
};
function updateOwner(roomId, callback) {
async.waterfall([
function (next) {
db.getSortedSetRange('chat:room:' + roomId + ':uids', 0, 0, next);
},
function (uids, next) {
var newOwner = uids[0] || 0;
db.setObjectField('chat:room:' + roomId, 'owner', newOwner, next);
},
], callback);
}
Messaging.getUidsInRoom = function (roomId, start, stop, callback) {
db.getSortedSetRevRange('chat:room:' + roomId + ':uids', start, stop, callback);
};

6
src/user/delete.js
View File

@@ -7,6 +7,7 @@ var db = require('../database');
var posts = require('../posts');
var topics = require('../topics');
var groups = require('../groups');
var messaging = require('../messaging');
var plugins = require('../plugins');
var batch = require('../batch');
@@ -173,12 +174,9 @@ module.exports = function (User) {
var userKeys = roomIds.map(function (roomId) {
return 'uid:' + uid + ':chat:room:' + roomId + ':mids';
});
var roomKeys = roomIds.map(function (roomId) {
return 'chat:room:' + roomId + ':uids';
});
async.parallel([
async.apply(db.sortedSetsRemove, roomKeys, uid),
async.apply(messaging.leaveRooms, uid, roomIds),
async.apply(db.deleteAll, userKeys),
], next);
},

41
test/messaging.js
View File

@@ -177,10 +177,51 @@ describe('Messaging Library', function () {
Messaging.isUserInRoom(bazUid, roomId, function (err, isUserInRoom) {
assert.ifError(err);
assert.equal(isUserInRoom, false);
Messaging.getRoomData(roomId, function (err, data) {
assert.ifError(err);
assert.equal(data.owner, fooUid);
done();
});
});
});
});
it('should change owner when owner leaves room', function (done) {
socketModules.chats.newRoom({ uid: herpUid }, { touid: fooUid }, function (err, roomId) {
assert.ifError(err);
socketModules.chats.addUserToRoom({ uid: herpUid }, { roomId: roomId, username: 'baz' }, function (err) {
assert.ifError(err);
socketModules.chats.leave({ uid: herpUid }, roomId, function (err) {
assert.ifError(err);
Messaging.getRoomData(roomId, function (err, data) {
assert.ifError(err);
assert.equal(data.owner, fooUid);
done();
});
});
});
});
});
it('should change owner if owner is deleted', function (done) {
User.create({ username: 'deleted_chat_user' }, function (err, sender) {
assert.ifError(err);
User.create({ username: 'receiver' }, function (err, receiver) {
assert.ifError(err);
socketModules.chats.newRoom({ uid: sender }, { touid: receiver }, function (err, roomId) {
assert.ifError(err);
User.deleteAccount(sender, function (err) {
assert.ifError(err);
Messaging.getRoomData(roomId, function (err, data) {
assert.ifError(err);
assert.equal(data.owner, receiver);
done();
});
});
});
});
});
});
it('should fail to remove user from room', function (done) {
socketModules.chats.removeUserFromRoom({ uid: fooUid }, null, function (err) {