Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-05 05:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: add visibility option to, closes #12942

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2024-11-28 10:12:00 -05:00
parent a16c0c3b89
commit 77382e3b7b
9 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/accounts/edit.js
View File

@@ -29,7 +29,7 @@ editController.get = async function (req, res, next) {
const [canUseSignature, canManageUsers, customUserFields] = await Promise.all([
privileges.global.can('signature', req.uid),
privileges.admin.can('admin:users', req.uid),
accountHelpers.getCustomUserFields(userData),
accountHelpers.getCustomUserFields(req.uid, userData),
]);
userData.customUserFields = customUserFields;

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

@@ -129,13 +129,26 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {})
return hookData.userData;
};
helpers.getCustomUserFields = async function (userData) {
helpers.getCustomUserFields = async function (callerUID, userData) {
const keys = await db.getSortedSetRange('user-custom-fields', 0, -1);
const allFields = (await db.getObjects(keys.map(k => `user-custom-field:${k}`))).filter(Boolean);
const isSelf = String(callerUID) === String(userData.uid);
const [isAdmin, isModOfAny] = await Promise.all([
privileges.users.isAdministrator(callerUID),
user.isModeratorOfAnyCategory(callerUID),
]);
const fields = allFields.filter((field) => {
const visibilityCheck = isAdmin || isModOfAny || isSelf || field.visibility === 'all' ||
(
field.visibility === 'loggedin' &&
String(callerUID) !== '0' &&
String(callerUID) !== '-1'
);
const minRep = field['min:rep'] || 0;
return userData.reputation >= minRep || meta.config['reputation:disabled'];
const repCheck = userData.reputation >= minRep || meta.config['reputation:disabled'];
return visibilityCheck && repCheck;
});
fields.forEach((f) => {

2
src/controllers/accounts/profile.js
View File

@@ -25,7 +25,7 @@ profileController.get = async function (req, res, next) {
const [latestPosts, bestPosts, customUserFields] = await Promise.all([
getLatestPosts(req.uid, userData),
getBestPosts(req.uid, userData),
accountHelpers.getCustomUserFields(userData),
accountHelpers.getCustomUserFields(req.uid, userData),
posts.parseSignature(userData, req.uid),
]);
userData.customUserFields = customUserFields;