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

closes #4012

Browse Source
This commit is contained in:
barisusakli
2015-12-29 10:34:06 +02:00
parent 99d64db9e0
commit 6be8675580
8 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,13 +37,17 @@ SocketGroups.join = function(socket, data, callback) {
async.parallel({
isAdmin: async.apply(user.isAdministrator, socket.uid),
isPrivate: async.apply(groups.isPrivate, data.groupName)
}, function(err, checks) {
groupData: async.apply(groups.getGroupData, data.groupName)
}, function(err, results) {
if (err) {
return callback(err);
}
if (!checks.isPrivate || checks.isAdmin) {
if (results.groupData.private && results.groupData.disableJoinRequests) {
return callback(new Error('[[error:join-requests-disabled]]'));
}
if (!results.groupData.isPrivate || results.isAdmin) {
groups.join(data.groupName, socket.uid, callback);
} else {
groups.requestMembership(data.groupName, socket.uid, callback);
@@ -261,6 +265,6 @@ SocketGroups.cover.remove = function(socket, data, callback) {
groups.removeCover(data, callback);
});
}
};
module.exports = SocketGroups;