mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-10-26 08:36:12 +01:00
fix: lastonline values
This commit is contained in:
@@ -15,7 +15,7 @@ const usersController = module.exports;
|
|||||||
|
|
||||||
const userFields = [
|
const userFields = [
|
||||||
'uid', 'username', 'userslug', 'email', 'postcount', 'joindate', 'banned',
|
'uid', 'username', 'userslug', 'email', 'postcount', 'joindate', 'banned',
|
||||||
'reputation', 'picture', 'flags', 'lastonline', 'email:confirmed',
|
'reputation', 'picture', 'flags', 'email:confirmed',
|
||||||
];
|
];
|
||||||
|
|
||||||
usersController.index = async function (req, res) {
|
usersController.index = async function (req, res) {
|
||||||
@@ -94,13 +94,16 @@ async function getUsers(req, res) {
|
|||||||
|
|
||||||
async function getUsersWithFields(set) {
|
async function getUsersWithFields(set) {
|
||||||
const uids = await getUids(set);
|
const uids = await getUids(set);
|
||||||
const [isAdmin, userData] = await Promise.all([
|
const [isAdmin, userData, lastonline] = await Promise.all([
|
||||||
user.isAdministrator(uids),
|
user.isAdministrator(uids),
|
||||||
user.getUsersWithFields(uids, userFields, req.uid),
|
user.getUsersWithFields(uids, userFields, req.uid),
|
||||||
|
db.sortedSetScores('users:online', uids),
|
||||||
]);
|
]);
|
||||||
userData.forEach((user, index) => {
|
userData.forEach((user, index) => {
|
||||||
if (user) {
|
if (user) {
|
||||||
user.administrator = isAdmin[index];
|
user.administrator = isAdmin[index];
|
||||||
|
user.lastonline = lastonline[index];
|
||||||
|
user.lastonlineISO = utils.toISOString(lastonline[index]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return userData;
|
return userData;
|
||||||
|
|||||||
Reference in New Issue
Block a user