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

Merge branch 'master' into webpack5

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2022-03-02 18:31:57 -05:00
parent 643efbee12 c75714b7e3
commit 4dbe116715
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/package.json
View File

@@ -35,7 +35,7 @@
"autoprefixer": "10.4.2",
"bcryptjs": "2.4.3",
"benchpressjs": "2.4.3",
"body-parser": "1.19.1",
"body-parser": "1.19.2",
"bootbox": "5.5.2",
"bootstrap": "3.4.1",
"chalk": "4.1.2",
@@ -118,7 +118,7 @@
"sanitize-html": "2.7.0",
"semver": "7.3.5",
"serve-favicon": "2.5.0",
"sharp": "0.30.1",
"sharp": "0.30.2",
"sitemap": "7.1.1",
"slideout": "1.0.1",
"socket.io": "4.4.1",

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) {
async function getCount() {
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') {
return await db.sortedSetCard(set);
}
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([
user.getUsersFromSet(set, uid, start, stop),
getUsers(),
getCount(),
]);
return {