Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: closes #10324, show recently online users as well

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2022-03-02 18:29:17 -05:00
parent 1a6c2c5534
commit eac9cd03ca
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/controllers/users.js
View File

@@ -148,14 +148,22 @@ usersController.getUsers = async function (set, uid, query) {
usersController.getUsersAndCount = async function (set, uid, start, stop) { usersController.getUsersAndCount = async function (set, uid, start, stop) {
async function getCount() { async function getCount() {
if (set === 'users:online') { if (set === 'users:online') {
return await db.sortedSetCount('users:online', Date.now() - (meta.config.onlineCutoff * 60000), '+inf'); return await db.sortedSetCount('users:online', Date.now() - 86400000, '+inf');
} else if (set === 'users:banned' || set === 'users:flags') { } else if (set === 'users:banned' || set === 'users:flags') {
return await db.sortedSetCard(set); return await db.sortedSetCard(set);
} }
return await db.getObjectField('global', 'userCount'); return await db.getObjectField('global', 'userCount');
} }
async function getUsers() {
if (set === 'users:online') {
const count = parseInt(stop, 10) === -1 ? stop : stop - start + 1;
const uids = await db.getSortedSetRevRangeByScore(set, start, count, '+inf', Date.now() - 86400000);
return await user.getUsers(uids, uid);
}
return await user.getUsersFromSet(set, uid, start, stop);
}
const [usersData, count] = await Promise.all([ const [usersData, count] = await Promise.all([
user.getUsersFromSet(set, uid, start, stop), getUsers(),
getCount(), getCount(),
]); ]);
return { return {