mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-10-26 16:46:12 +01:00
feat: remove administrator property from public routes
This commit is contained in:
@@ -533,8 +533,6 @@ UserObjectSlim:
|
||||
type: string
|
||||
description: An ISO 8601 formatted date string representing the moment a ban will be lifted, or the words "Not Banned"
|
||||
example: Not Banned
|
||||
administrator:
|
||||
type: boolean
|
||||
UserObjectACP:
|
||||
type: object
|
||||
properties:
|
||||
|
||||
@@ -3009,8 +3009,6 @@ paths:
|
||||
type: number
|
||||
banned_until_readable:
|
||||
type: string
|
||||
administrator:
|
||||
type: boolean
|
||||
userCount:
|
||||
type: number
|
||||
title:
|
||||
|
||||
@@ -175,7 +175,16 @@ async function getUsers(set, section, min, max, req, res) {
|
||||
} else {
|
||||
uids = await user.getUidsFromSet(set, start, stop);
|
||||
}
|
||||
return await user.getUsersWithFields(uids, userFields, req.uid);
|
||||
const [isAdmin, userData] = await Promise.all([
|
||||
user.isAdministrator(uids),
|
||||
user.getUsersWithFields(uids, userFields, req.uid),
|
||||
]);
|
||||
userData.forEach((user, index) => {
|
||||
if (user) {
|
||||
user.administrator = isAdmin[index];
|
||||
}
|
||||
});
|
||||
return userData;
|
||||
}
|
||||
|
||||
const [count, users] = await Promise.all([
|
||||
|
||||
@@ -66,15 +66,7 @@ User.getUsersFromSet = async function (set, uid, start, stop) {
|
||||
User.getUsersWithFields = async function (uids, fields, uid) {
|
||||
let results = await plugins.fireHook('filter:users.addFields', { fields: fields });
|
||||
results.fields = _.uniq(results.fields);
|
||||
const [userData, isAdmin] = await Promise.all([
|
||||
User.getUsersFields(uids, results.fields),
|
||||
User.isAdministrator(uids),
|
||||
]);
|
||||
userData.forEach(function (user, index) {
|
||||
if (user) {
|
||||
user.administrator = isAdmin[index];
|
||||
}
|
||||
});
|
||||
const userData = await User.getUsersFields(uids, results.fields);
|
||||
results = await plugins.fireHook('filter:userlist.get', { users: userData, uid: uid });
|
||||
return results.users;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user