Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-31 11:50:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into activitypub

Browse Source
This commit is contained in:
Julian Lam
2024-12-04 15:24:26 -05:00
parent 64339e6149 5b60aee625
commit 45d2fe11dc
184 changed files with 1203 additions and 875 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

@@ -139,7 +139,7 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {})
return hookData.userData;
};
helpers.getCustomUserFields = async function (userData) {
helpers.getCustomUserFields = async function (callerUID, userData) {
// Remote users' fields are serialized in hash
if (!utils.isNumber(userData.uid)) {
const customFields = await user.getUserField(userData.uid, 'customFields');
@@ -165,9 +165,22 @@ helpers.getCustomUserFields = async function (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

@@ -27,7 +27,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;

1
src/controllers/admin/users.js
View File

@@ -310,6 +310,7 @@ usersController.customFields = async function (req, res) {
field.selectOptionsFormatted = field['select-options'].trim().split('\n').join(', ');
}
field['min:rep'] = field['min:rep'] || 0;
field.visibility = field.visibility || 'all';
});
res.render('admin/manage/users/custom-fields', { fields: fields });
};

8
src/controllers/uploads.js
View File

@@ -110,12 +110,16 @@ async function resizeImage(fileObj) {
await image.resizeImage({
path: fileObj.path,
target: file.appendToFileName(fileObj.path, '-resized'),
target: meta.config.resizeImageKeepOriginal ?
file.appendToFileName(fileObj.path, '-resized') :
fileObj.path,
width: meta.config.resizeImageWidth,
quality: meta.config.resizeImageQuality,
});
// Return the resized version to the composer/postData
fileObj.url = file.appendToFileName(fileObj.url, '-resized');
if (meta.config.resizeImageKeepOriginal) {
fileObj.url = file.appendToFileName(fileObj.url, '-resized');
}
return fileObj;
}