Node.js based forum software built for the modern web
fix: #14219, show crossposted topics in unread
Julian Lam6cffd1c26f70
diff --git a/src/topics/recent.js b/src/topics/recent.jsindex f31f8a3509..d4c46240b6 100644--- a/src/topics/recent.js+++ b/src/topics/recent.js@@ -61,8 +61,11 @@ module.exports = function (Topics) {Topics.updateLastPostTime = async function (tid, lastposttime) {await Topics.setTopicField(tid, 'lastposttime', lastposttime);const topicData = await Topics.getTopicFields(tid, ['cid', 'deleted', 'pinned']);+ const crossposts = await Topics.crossposts.get(tid);+ const crosspostCids = crossposts.map(({ cid }) => cid);+ const keys = [topicData.cid, ...crosspostCids].map(cid => `cid:${cid}:tids:lastposttime`);- await db.sortedSetAdd(`cid:${topicData.cid}:tids:lastposttime`, lastposttime, tid);+ await db.sortedSetsAdd(keys, lastposttime, tid);await Topics.updateRecent(tid, lastposttime);diff --git a/src/topics/unread.js b/src/topics/unread.jsindex 6ee52cd6c6..4d191b7201 100644--- a/src/topics/unread.js+++ b/src/topics/unread.js@@ -145,8 +145,19 @@ module.exports = function (Topics) {.filter(t => !t.deleted);const topicCids = _.uniq(topicData.map(topic => topic.cid)).filter(Boolean);- const categoryWatchState = await categories.getWatchState(topicCids, params.uid);- const userCidState = _.zipObject(topicCids, categoryWatchState);+ let crosspostCids = await Topics.crossposts.get(tids);+ crosspostCids = crosspostCids.map((crossposts) => {+ return crossposts.map(({ cid }) => cid);+ });+ const crosspostMap = crosspostCids.reduce((memo, cids, idx) => {+ const tid = tids[idx];+ memo.set(tid, cids);+ return memo;+ }, new Map());+ const combinedCids = Array.from(new Set([...topicCids, ...crosspostCids.flat()]));++ const categoryWatchState = await categories.getWatchState(combinedCids, params.uid);+ const userCidState = _.zipObject(combinedCids, categoryWatchState);const filterCids = params.cid && params.cid.map(cid => utils.isNumber(cid) ? parseInt(cid, 10) : cid);const filterTags = params.tag && params.tag.map(tag => String(tag));@@ -156,8 +167,12 @@ module.exports = function (Topics) {(!filterCids || filterCids.includes(topic.cid)) &&(!filterTags || filterTags.every(tag => topic.tags.find(topicTag => topicTag.value === tag))) &&!blockedUids.includes(topic.uid)) {- if (isTopicsFollowed[topic.tid] ||- [categories.watchStates.watching, categories.watchStates.tracking].includes(userCidState[topic.cid])) {+ if (isTopicsFollowed[topic.tid] || // π follows tid directly, or its cid π+ [categories.watchStates.watching, categories.watchStates.tracking].includes(userCidState[topic.cid]) ||+ crosspostMap.get(topic.tid).some((cid) => { // user follows a crossposted cid+ return [categories.watchStates.watching, categories.watchStates.tracking].includes(userCidState[cid]);+ })+ ) {tidsByFilter[''].push(topic.tid);unreadCids.push(topic.cid);}