Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: add new hook to get custom category tids for unread

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2019-10-01 22:14:50 -04:00
parent 05e753c73b
commit b192605450
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/controllers/unread.js
View File

@@ -38,6 +38,7 @@ unreadController.get = async function (req, res, next) {
stop: stop, stop: stop,
filter: filter, filter: filter,
cutoff: cutoff, cutoff: cutoff,
query: req.query,
}); });
data.title = meta.config.homePageTitle || '[[pages:home]]'; data.title = meta.config.homePageTitle || '[[pages:home]]';

14
src/topics/unread.js
View File

@@ -90,10 +90,10 @@ module.exports = function (Topics) {
const cutoff = params.cutoff || Topics.unreadCutoff(); const cutoff = params.cutoff || Topics.unreadCutoff();
const [followedTids, ignoredTids, recentTids, userScores, tids_unread] = await Promise.all([ const [followedTids, ignoredTids, categoryTids, userScores, tids_unread] = await Promise.all([
getFollowedTids(params), getFollowedTids(params),
user.getIgnoredTids(params.uid, 0, -1), user.getIgnoredTids(params.uid, 0, -1),
getRecentTids(params), getCategoryTids(params),
db.getSortedSetRevRangeByScoreWithScores('uid:' + params.uid + ':tids_read', 0, -1, '+inf', cutoff), db.getSortedSetRevRangeByScoreWithScores('uid:' + params.uid + ':tids_read', 0, -1, '+inf', cutoff),
db.getSortedSetRevRangeWithScores('uid:' + params.uid + ':tids_unread', 0, -1), db.getSortedSetRevRangeWithScores('uid:' + params.uid + ':tids_unread', 0, -1),
]); ]);
@@ -101,7 +101,7 @@ module.exports = function (Topics) {
const userReadTime = _.mapValues(_.keyBy(userScores, 'value'), 'score'); const userReadTime = _.mapValues(_.keyBy(userScores, 'value'), 'score');
const isTopicsFollowed = _.mapValues(_.keyBy(followedTids, 'value'), 'score'); const isTopicsFollowed = _.mapValues(_.keyBy(followedTids, 'value'), 'score');
const unreadTopics = _.unionWith(recentTids, followedTids.concat(tids_unread), (a, b) => a.value === b.value) const unreadTopics = _.unionWith(categoryTids, followedTids.concat(tids_unread), (a, b) => a.value === b.value)
.filter(t => !ignoredTids.includes(t.value) && (!userReadTime[t.value] || t.score > userReadTime[t.value])) .filter(t => !ignoredTids.includes(t.value) && (!userReadTime[t.value] || t.score > userReadTime[t.value]))
.sort((a, b) => b.score - a.score); .sort((a, b) => b.score - a.score);
@@ -117,7 +117,7 @@ module.exports = function (Topics) {
uid: params.uid, uid: params.uid,
tids: tids, tids: tids,
blockedUids: blockedUids, blockedUids: blockedUids,
recentTids: recentTids, recentTids: categoryTids,
}); });
const topicData = await Topics.getTopicsFields(tids, ['tid', 'cid', 'uid', 'postcount']); const topicData = await Topics.getTopicsFields(tids, ['tid', 'cid', 'uid', 'postcount']);
@@ -168,7 +168,11 @@ module.exports = function (Topics) {
}; };
} }
async function getRecentTids(params) { async function getCategoryTids(params) {
if (plugins.hasListeners('filter:topics.unread.getCategoryTids')) {
const result = await plugins.fireHook('filter:topics.unread.getCategoryTids', { params: params, tids: [] });
return result.tids;
}
if (params.filter === 'watched') { if (params.filter === 'watched') {
return []; return [];
} }