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

hasEnoughRep can take an array

Browse Source 
user follow uid checks
This commit is contained in:
barisusakli
2014-11-04 18:44:04 -05:00
parent 9a8fa35d8d
commit 37d7756271
3 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/privileges/helpers.js
View File

@@ -123,7 +123,7 @@ function isGuestAllowedTo(privilege, cids, callback) {
}
helpers.hasEnoughReputationFor = function(privilege, uid, callback) {
if (parseInt(meta.config['privileges:disabled'], 10)) {
if (parseInt(meta.config['privileges:disabled'], 10) || !parseInt(uid, 10)) {
return callback(null, false);
}
@@ -131,7 +131,18 @@ helpers.hasEnoughReputationFor = function(privilege, uid, callback) {
if (err) {
return callback(null, false);
}
callback(null, parseInt(reputation, 10) >= parseInt(meta.config[privilege], 10));
reputation = parseInt(reputation, 10);
if (Array.isArray(privilege)) {
for(var i=0; i<privilege.length; ++i) {
if (reputation >= parseInt(meta.config[privilege[i]], 10)) {
return callback(null, true);
}
}
} else {
callback(null, reputation >= parseInt(meta.config[privilege], 10));
}
});
};

14
src/privileges/posts.js
View File

@@ -20,11 +20,8 @@ module.exports = function(privileges) {
return callback(null, []);
}
async.parallel({
manage_content: function(next) {
helpers.hasEnoughReputationFor('privileges:manage_content', uid, next);
},
manage_topic: function(next) {
helpers.hasEnoughReputationFor('privileges:manage_topic', uid, next);
manage: function(next) {
helpers.hasEnoughReputationFor(['privileges:manage_content', 'privileges:manage_topic'], uid, next);
},
isAdministrator: function(next) {
user.isAdministrator(uid, next);
@@ -34,7 +31,7 @@ module.exports = function(privileges) {
return callback(err);
}
var userPriv = userResults.isAdministrator || userResults.manage_topic || userResults.manage_content;
var userPriv = userResults.isAdministrator || userResults.manage;
async.parallel({
isOwner: function(next) {
@@ -120,10 +117,7 @@ module.exports = function(privileges) {
posts.isOwner(pid, uid, next);
},
function(next) {
helpers.hasEnoughReputationFor('privileges:manage_content', uid, next);
},
function(next) {
helpers.hasEnoughReputationFor('privileges:manage_topic', uid, next);
helpers.hasEnoughReputationFor(['privileges:manage_content', 'privileges:manage_topic'], uid, next);
}
], next);
});

19
src/user/follow.js
View File

@@ -33,14 +33,18 @@ module.exports = function(User) {
}
User.getFollowing = function(uid, callback) {
getFollow('following:' + uid, callback);
getFollow(uid, 'following:' + uid, callback);
};
User.getFollowers = function(uid, callback) {
getFollow('followers:' + uid, callback);
getFollow(uid, 'followers:' + uid, callback);
};
function getFollow(set, callback) {
function getFollow(uid, set, callback) {
if (!parseInt(uid, 10)) {
return callback(null, []);
}
db.getSetMembers(set, function(err, uids) {
if (err) {
return callback(err);
@@ -51,10 +55,16 @@ module.exports = function(User) {
}
User.getFollowingCount = function(uid, callback) {
if (!parseInt(uid, 10)) {
return callback(null, 0);
}
db.setCount('following:' + uid, callback);
};
User.getFollowerCount = function(uid, callback) {
if (!parseInt(uid, 10)) {
return callback(null, 0);
}
db.setCount('followers:' + uid, callback);
};
@@ -70,6 +80,9 @@ module.exports = function(User) {
};
User.isFollowing = function(uid, theirid, callback) {
if (!parseInt(uid, 10) || !parseInt(theirid, 10)) {
return callback(null, false);
}
db.isSetMember('following:' + uid, theirid, callback);
};