Node.js based forum software built for the modern web
fix: prune expired topic view timestamps from the session (#14789)
palmoni5a21aaf179674
diff --git a/src/topics/posts.js b/src/topics/posts.jsindex 861ab11021..9ed7263809 100644--- a/src/topics/posts.js+++ b/src/topics/posts.js@@ -329,17 +329,23 @@ module.exports = function (Topics) {Topics.increaseViewCount = async function (req, tid) {const allow = req.uid > 0 || (meta.config.guestsIncrementTopicViews && req.uid === 0);if (allow) {- req.session.tids_viewed = req.session.tids_viewed || {};const now = Date.now();- const interval = meta.config.incrementTopicViewsInterval * 60000;- if (!req.session.tids_viewed[tid] || req.session.tids_viewed[tid] < now - interval) {+ const cutoff = now - (meta.config.incrementTopicViewsInterval * 60000);+ const viewed = req.session.tids_viewed || {};+ for (const [viewedTid, timestamp] of Object.entries(viewed)) {+ if (timestamp < cutoff) {+ delete viewed[viewedTid];+ }+ }+ req.session.tids_viewed = viewed;+ if (!viewed[tid]) {const cid = await Topics.getTopicField(tid, 'cid');const isRemoteCid = !utils.isNumber(cid) || cid === -1;const value = await db.incrObjectFieldBy(`topic:${tid}`, 'viewcount', 1);await db.sortedSetsAdd(isRemoteCid ? [`cid:${cid}:tids:views`] : ['topics:views', `cid:${cid}:tids:views`], value, tid);- req.session.tids_viewed[tid] = now;+ viewed[tid] = now;}}};diff --git a/test/topics.js b/test/topics.jsindex 4e24016d21..77e1683b0e 100644--- a/test/topics.js+++ b/test/topics.js@@ -1996,6 +1996,36 @@ describe('Topic\'s', () => {});});+ describe('topic views', () => {+ let viewsTid;++ before(async () => {+ const result = await topics.post({+ uid: adminUid,+ title: 'topic views test',+ content: 'topic views test content',+ cid: categoryObj.cid,+ });+ viewsTid = result.topicData.tid;+ });++ it('should only increment the view count once per interval', async () => {+ const req = { uid: fooUid, session: {} };+ await topics.increaseViewCount(req, viewsTid);+ await topics.increaseViewCount(req, viewsTid);+ assert.strictEqual(await topics.getTopicField(viewsTid, 'viewcount'), 1);+ assert.deepStrictEqual(Object.keys(req.session.tids_viewed), [String(viewsTid)]);+ });++ it('should prune expired entries from the session', async () => {+ const expired = Date.now() - ((meta.config.incrementTopicViewsInterval + 1) * 60000);+ const req = { uid: fooUid, session: { tids_viewed: { 1: expired, 2: expired } } };+ await topics.increaseViewCount(req, viewsTid);+ assert.deepStrictEqual(Object.keys(req.session.tids_viewed), [String(viewsTid)]);+ assert.strictEqual(await topics.getTopicField(viewsTid, 'viewcount'), 2);+ });+ });+it('should check if user is moderator', (done) => {socketTopics.isModerator({ uid: adminUid }, topic.tid, (err, isModerator) => {assert.ifError(err);