Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-02 05:40:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: allow user.hidePrivateData() to handle an array of userData

Browse Source
This commit is contained in:
Julian Lam
2022-06-29 16:10:04 -04:00
parent 6fac823e64
commit 3f5ae893c6
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/user/data.js
View File

@@ -145,25 +145,33 @@ module.exports = function (User) {
return await User.getUsersFields(uids, []);
};
User.hidePrivateData = async function (userData, callerUID) {
const _userData = { ...userData };
User.hidePrivateData = async function (users, callerUID) {
if (!Array.isArray(users)) {
users = [users];
}
const isSelf = parseInt(callerUID, 10) === parseInt(_userData.uid, 10);
const [userSettings, isAdmin, isGlobalModerator] = await Promise.all([
User.getSettings(_userData.uid),
User.getMultipleUserSettings(users.map(user => user.uid)),
User.isAdministrator(callerUID),
User.isGlobalModerator(callerUID),
]);
const privilegedOrSelf = isAdmin || isGlobalModerator || isSelf;
if (!privilegedOrSelf && (!userSettings.showemail || meta.config.hideEmail)) {
_userData.email = '';
}
if (!privilegedOrSelf && (!userSettings.showfullname || meta.config.hideFullname)) {
_userData.fullname = '';
}
users = await Promise.all(users.map(async (userData, idx) => {
const _userData = { ...userData };
return _userData;
const isSelf = parseInt(callerUID, 10) === parseInt(_userData.uid, 10);
const privilegedOrSelf = isAdmin || isGlobalModerator || isSelf;
if (!privilegedOrSelf && (!userSettings[idx].showemail || meta.config.hideEmail)) {
_userData.email = '';
}
if (!privilegedOrSelf && (!userSettings[idx].showfullname || meta.config.hideFullname)) {
_userData.fullname = '';
}
return _userData;
}));
return users.length === 1 ? users.pop() : users;
};
async function modifyUserData(users, requestedFields, fieldsToRemove) {