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

check group exists before joining

Browse Source
This commit is contained in:
barisusakli
2015-10-02 17:13:13 -04:00
parent c5e8339abb
commit ca15b85db9
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/socket.io/groups.js
View File

@@ -22,20 +22,30 @@ SocketGroups.join = function(socket, data, callback) {
return callback(new Error('[[error:invalid-uid]]')); return callback(new Error('[[error:invalid-uid]]'));
} }
if (meta.config.allowPrivateGroups !== '0') { groups.exists(data.groupName, function(err, exists) {
if (err || !exists) {
return callback(err || new Error('[[error:no-group]]'));
}
if (parseInt(meta.config.allowPrivateGroups, 10) !== 1) {
return groups.join(data.groupName, socket.uid, callback);
}
async.parallel({ async.parallel({
isAdmin: async.apply(user.isAdministrator, socket.uid), isAdmin: async.apply(user.isAdministrator, socket.uid),
isPrivate: async.apply(groups.isPrivate, data.groupName) isPrivate: async.apply(groups.isPrivate, data.groupName)
}, function(err, checks) { }, function(err, checks) {
if (err) {
return callback(err);
}
if (checks.isPrivate && !checks.isAdmin) { if (checks.isPrivate && !checks.isAdmin) {
groups.requestMembership(data.groupName, socket.uid, callback); groups.requestMembership(data.groupName, socket.uid, callback);
} else { } else {
groups.join(data.groupName, socket.uid, callback); groups.join(data.groupName, socket.uid, callback);
} }
}); });
} else { });
groups.join(data.groupName, socket.uid, callback);
}
}; };
SocketGroups.leave = function(socket, data, callback) { SocketGroups.leave = function(socket, data, callback) {