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

attempting to join a private group causes the join to be pending, #2588

Browse Source
This commit is contained in:
Julian Lam
2015-01-08 16:50:31 -05:00
parent a5d7fee623
commit 71b41239ac
3 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
"use strict";
var groups = require('../groups'),
meta = require('../meta'),
SocketGroups = {};
@@ -9,7 +10,17 @@ SocketGroups.join = function(socket, data, callback) {
return callback(new Error('[[error:invalid-data]]'));
}
groups.join(data.groupName, socket.uid, callback);
if (meta.config.allowPrivateGroups) {
groups.isPrivate(data.groupName, function(err, isPrivate) {
if (isPrivate) {
groups.requestMembership(data.groupName, socket.uid, callback);
} else {
groups.join(data.groupName, socket.uid, callback);
}
});
} else {
groups.join(data.groupName, socket.uid, callback);
}
};
SocketGroups.leave = function(socket, data, callback) {