fix: simplify logic for fullname and email blanking in user retrieval (getUserDataByUserSlug)

Previous logic seemed to match the logic used in privileges.users.canEdit, except
the latter allows plugins to modify the value.
This commit is contained in:
Julian Lam
2021-09-03 13:36:56 -04:00
parent 1e2bda13d0
commit 60de084475

View File

@@ -43,13 +43,13 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {})
userData.emailClass = 'hide'; userData.emailClass = 'hide';
if (!isAdmin && !isGlobalModerator && !isSelf && (!userSettings.showemail || meta.config.hideEmail)) { if (!results.canEdit && (!userSettings.showemail || meta.config.hideEmail)) {
userData.email = ''; userData.email = '';
} else if (!userSettings.showemail) { } else if (!userSettings.showemail) {
userData.emailClass = ''; userData.emailClass = '';
} }
if (!isAdmin && !isGlobalModerator && !isSelf && (!userSettings.showfullname || meta.config.hideFullname)) { if (!results.canEdit && (!userSettings.showfullname || meta.config.hideFullname)) {
userData.fullname = ''; userData.fullname = '';
} }