Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-14 19:13:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

backport private group fixes

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-12-28 14:37:53 +02:00
parent 711983d580
commit 9043a40c35
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,10 @@ SocketGroups.join = function(socket, data, callback) {
return callback(new Error('[[error:invalid-uid]]'));
}
if (data.groupName === 'administrators' || groups.isPrivilegeGroup(data.groupName)) {
return callback(new Error('[[error:not-allowed]]'));
}
groups.exists(data.groupName, function(err, exists) {
if (err || !exists) {
return callback(err || new Error('[[error:no-group]]'));
@@ -39,10 +43,10 @@ SocketGroups.join = function(socket, data, callback) {
return callback(err);
}
if (checks.isPrivate && !checks.isAdmin) {
groups.requestMembership(data.groupName, socket.uid, callback);
} else {
if (!checks.isPrivate || checks.isAdmin) {
groups.join(data.groupName, socket.uid, callback);
} else {
groups.requestMembership(data.groupName, socket.uid, callback);
}
});
});