mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-03-06 04:21:17 +01:00
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
This commit is contained in:
@@ -187,7 +187,7 @@ var db = require('./database'),
|
||||
};
|
||||
|
||||
Categories.getModerators = function(cid, callback) {
|
||||
Groups.getByGroupName('cid:' + cid + ':moderators', {}, function(err, groupObj) {
|
||||
Groups.getByGroupName('cid:' + cid + ':privileges:mod', {}, function(err, groupObj) {
|
||||
if (!err) {
|
||||
if (groupObj.members && groupObj.members.length) {
|
||||
user.getMultipleUserFields(groupObj.members, ['uid', 'username', 'userslug', 'picture'], function(err, moderators) {
|
||||
@@ -197,7 +197,8 @@ var db = require('./database'),
|
||||
callback(null, []);
|
||||
}
|
||||
} else {
|
||||
callback(err, null);
|
||||
// Probably no mods
|
||||
callback(null, []);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
@@ -753,7 +753,7 @@ var bcrypt = require('bcryptjs'),
|
||||
};
|
||||
|
||||
User.isModerator = function(uid, cid, callback) {
|
||||
groups.isMemberByGroupName(uid, 'cid:' + cid + ':moderators', function(err, isMember) {
|
||||
groups.isMemberByGroupName(uid, 'cid:' + cid + ':privileges:mod', function(err, isMember) {
|
||||
if(err) {
|
||||
return calback(err);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user