Merge remote-tracking branch 'refs/remotes/origin/master' into group-chat

This commit is contained in:
barisusakli
2015-12-19 17:21:52 +02:00
21 changed files with 158 additions and 91 deletions

View File

@@ -148,6 +148,9 @@ SocketGroups.update = isOwner(function(socket, data, callback) {
SocketGroups.kick = isOwner(function(socket, data, callback) {
if (socket.uid === parseInt(data.uid, 10)) {
return callback(new Error('[[error:cant-kick-self]]'));
}
groups.leave(data.groupName, data.uid, callback);
});