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

added additional visibility masks for profile menu hook, also added isPrivileged user method, closes #5306

Browse Source
This commit is contained in:
Julian Lam
2017-01-11 15:06:28 -05:00
parent 8eb47e1987
commit d29361f4c9
3 changed files with 65 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/controllers/accounts/helpers.js
View File

@@ -119,7 +119,13 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) {
userData['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1;
userData['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1;
userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10);
userData.profile_links = filterLinks(results.profile_links.concat(results.profile_menu.links), isSelf);
userData.profile_links = filterLinks(results.profile_links.concat(results.profile_menu.links), {
self: isSelf,
other: !isSelf,
moderator: isModerator,
globalMod: isGlobalModerator,
admin: isAdmin
});
userData.sso = results.sso.associations;
userData.status = user.getStatus(userData);
@@ -154,9 +160,30 @@ helpers.getBaseUser = function (userslug, callerUID, callback) {
helpers.getUserDataByUserSlug(userslug, callerUID, callback);
};
function filterLinks(links, self) {
return links.filter(function (link) {
return link && (link.public || self);
function filterLinks(links, states) {
return links.filter(function (link, index) {
// "public" is the old property, if visibility is defined, discard `public`
if (link.hasOwnProperty('public') && !link.hasOwnProperty('visibility')) {
winston.warn('[account/profileMenu (' + link.id + ')] Use of the `.public` property is deprecated, use `visibility` now');
return link && (link.public || states.self);
}
// Default visibility
link.visibility = Object.assign({
self: true,
other: true,
moderator: true,
globalMod: true,
admin: true
}, link.visibility);
// Iterate through states and permit if every test passes (or is not defined)
var permit = Object.keys(states).some(function (state) {
return states[state] === link.visibility[state];
});
links[index].public = permit;
return permit;
});
}