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

fix: #13459, unread indicators for remote categories

Browse Source
This commit is contained in:
Julian Lam
2025-06-02 11:58:54 -04:00
parent e1eb76feba
commit 6411c19765
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/topics/unread.js
View File

@@ -351,8 +351,23 @@ module.exports = function (Topics) {
if (!(parseInt(uid, 10) > 0)) {
return tids.map(() => false);
}
const [topicScores, userScores, tids_unread, blockedUids] = await Promise.all([
// Remote tids do not get slotted into topics:recent; separate calculation follows
async function getRemoteTopicScores(tids) {
let cids = await Topics.getTopicsFields(tids, ['cid']);
cids = cids.map(({ cid }) => cid);
return await Promise.all(tids.map(async (tid, idx) => {
const cid = cids[idx];
if (utils.isNumber(tid) || !cid) {
return null;
}
return await db.sortedSetScore(`cid:${cid}:tids`, tid);
}));
}
const [topicScores, remoteTopicScores, userScores, tids_unread, blockedUids] = await Promise.all([
db.sortedSetScores('topics:recent', tids),
getRemoteTopicScores(tids),
db.sortedSetScores(`uid:${uid}:tids_read`, tids),
db.sortedSetScores(`uid:${uid}:tids_unread`, tids),
user.blocks.list(uid),
@@ -361,7 +376,7 @@ module.exports = function (Topics) {
const cutoff = await Topics.unreadCutoff(uid);
const result = tids.map((tid, index) => {
const read = !tids_unread[index] &&
(topicScores[index] < cutoff ||
((topicScores[index] || remoteTopicScores[index]) < cutoff ||
!!(userScores[index] && userScores[index] >= topicScores[index]));
return { tid: tid, read: read, index: index };
});