From 1a6c2c55341088c9ee6b94c00f1a58a46e1b3a5b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 17:56:06 -0500 Subject: [PATCH 1/3] fix(deps): update dependency sharp to v0.30.2 (#10359) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index c15b546c4f..5e3118d55a 100644 --- a/install/package.json +++ b/install/package.json @@ -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", From eac9cd03ca27c0b0f31494a27752f4bd7c4938bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 2 Mar 2022 18:29:17 -0500 Subject: [PATCH 2/3] feat: closes #10324, show recently online users as well --- src/controllers/users.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/controllers/users.js b/src/controllers/users.js index 818cb86123..ee57bf1afe 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -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 { From c75714b7e3382bff4116a14ce4563e2cc500058b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 18:31:19 -0500 Subject: [PATCH 3/3] fix(deps): update dependency body-parser to v1.19.2 (#10298) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 5e3118d55a..2e311df9dd 100644 --- a/install/package.json +++ b/install/package.json @@ -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",