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

refactored groups and categories, groups no longer explodes when

Browse Source 
attempting to add members to a whitelist that doesn't exist, isEmpty
checks (new methods!) and such...
This commit is contained in:
Julian Lam
2013-11-27 20:07:04 -05:00
parent 0a06f1ac7d
commit 8b62041d28
4 changed files with 68 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/categoryTools.js
View File

@@ -8,20 +8,42 @@ var Groups = require('./groups'),
CategoryTools.privileges = function(cid, uid, callback) {
async.parallel({
"+r": function(next) {
Groups.exists('cid:' + cid + ':privileges:+r', function(err, exists) {
var key = 'cid:' + cid + ':privileges:+r';
Groups.exists(key, function(err, exists) {
if (exists) {
Groups.isMemberByGroupName(uid, 'cid:' + cid + ':privileges:+r', next);
async.parallel({
isMember: function(next) {
Groups.isMemberByGroupName(uid, key, next);
},
isEmpty: function(next) {
Groups.isEmptyByGroupName(key, next);
}
}, next);
} else {
next(null, true);
next(null, {
isMember: false,
isEmpty: true
});
}
});
},
"+w": function(next) {
Groups.exists('cid:' + cid + ':privileges:+w', function(err, exists) {
var key = 'cid:' + cid + ':privileges:+w';
Groups.exists(key, function(err, exists) {
if (exists) {
Groups.isMemberByGroupName(uid, 'cid:' + cid + ':privileges:+w', next);
async.parallel({
isMember: function(next) {
Groups.isMemberByGroupName(uid, key, next);
},
isEmpty: function(next) {
Groups.isEmptyByGroupName(key, next);
}
}, next);
} else {
next(null, true);
next(null, {
isMember: false,
isEmpty: true
});
}
});
},
@@ -33,10 +55,10 @@ CategoryTools.privileges = function(cid, uid, callback) {
}
}, function(err, privileges) {
callback(err, !privileges ? null : {
"+r": privileges['+r'],
"+w": privileges['+w'],
read: privileges['+r'] || privileges.moderator || privileges.admin,
write: privileges['+w'] || privileges.moderator || privileges.admin,
"+r": privileges['+r'].isMember,
"+w": privileges['+w'].isMember,
read: (privileges['+r'].isMember || privileges['+r'].isEmpty) || privileges.moderator || privileges.admin,
write: (privileges['+w'].isMember || privileges['+w'].isEmpty) || privileges.moderator || privileges.admin,
editable: privileges.moderator || privileges.admin,
view_deleted: privileges.moderator || privileges.admin
});