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

fix: don't show deleted topics on unread

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2019-10-09 18:03:07 -04:00
parent 6b3eb0144e
commit 661a0f5068
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/topics/unread.js
View File

@@ -120,24 +120,17 @@ module.exports = function (Topics) {
recentTids: categoryTids, recentTids: categoryTids,
}); });
tids = await privileges.topics.filterTids('topics:read', tids, params.uid);
const topicData = await Topics.getTopicsFields(tids, ['tid', 'cid', 'uid', 'postcount']); const topicData = await Topics.getTopicsFields(tids, ['tid', 'cid', 'uid', 'postcount']);
const topicCids = _.uniq(topicData.map(topic => topic.cid)).filter(Boolean); 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); 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) { if (isTopicsFollowed[topic.tid] || userCidState[topic.cid] === categories.watchStates.watching) {
tidsByFilter[''].push(topic.tid); tidsByFilter[''].push(topic.tid);
} }

8
test/topics.js
View File

@@ -1461,6 +1461,14 @@ describe('Topic\'s', function () {
}, },
], done); ], 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 () { describe('tags', function () {