fix: don't show deleted topics on unread

NodeBB · Oct 9, 2019 · 661a0f5 · 661a0f5
1 parent 6b3eb01
commit 661a0f5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/topics/unread.js b/src/topics/unread.js
@@ -120,24 +120,17 @@ module.exports = function (Topics) {
 			recentTids: categoryTids,
 		});
 
+		tids = await privileges.topics.filterTids('topics:read', tids, params.uid);
 		const topicData = await Topics.getTopicsFields(tids, ['tid', 'cid', 'uid', 'postcount']);
 		const topicCids = _.uniq(topicData.map(topic => topic.cid)).filter(Boolean);
 
-		const [categoryWatchState, readCids] = await Promise.all([
+		const categoryWatchState = await categories.getWatchState(topicCids, params.uid);
-			categories.getWatchState(topicCids, params.uid),
-			privileges.categories.filterCids('topics:read', topicCids, params.uid),
-		]);
-
-		const filterCids = params.cid && params.cid.map(String);
-		const readableCids = readCids.map(String);
 		const userCidState = _.zipObject(topicCids, categoryWatchState);
 
-		topicData.forEach(function (topic) {
+		const filterCids = params.cid && params.cid.map(cid => parseInt(cid, 10));
-			function cidMatch() {
-				return (!filterCids || (filterCids.length && filterCids.includes(String(topic.cid)))) && readableCids.includes(String(topic.cid));
-			}
 
-			if (topic && topic.cid && cidMatch() && !blockedUids.includes(topic.uid)) {
+		topicData.forEach(function (topic) {
+			if (topic && topic.cid && (!filterCids || filterCids.includes(topic.cid)) && !blockedUids.includes(topic.uid)) {
 				if (isTopicsFollowed[topic.tid] || userCidState[topic.cid] === categories.watchStates.watching) {
 					tidsByFilter[''].push(topic.tid);
 				}

diff --git a/test/topics.js b/test/topics.js
@@ -1461,6 +1461,14 @@ describe('Topic\'s', function () {
 				},
 			], done);
 		});
+
+		it('should not return topic as unread if topic is deleted', async function () {
+			const uid = await User.create({ username: 'regularJoe' });
+			const result = await topics.post({ uid: adminUid, title: 'deleted unread', content: 'not unread', cid: categoryObj.cid });
+			await topics.delete(result.topicData.tid, adminUid);
+			const unreadTids = await topics.getUnreadTids({ cid: 0, uid: uid });
+			assert(!unreadTids.includes(result.topicData.tid));
+		});
 	});
 
 	describe('tags', function () {