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

fix: marking remote category topics as read

Browse Source
This commit is contained in:
Julian Lam
2025-04-01 14:40:58 -04:00
parent b0236735f2
commit 4a7111d042
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/client/unread.js
View File

@@ -68,7 +68,7 @@ define('forum/unread', [
markAllRead(); markAllRead();
} else if (category.cid === 'selected') { } else if (category.cid === 'selected') {
markSelectedRead(); markSelectedRead();
} else if (parseInt(category.cid, 10) > 0) { } else if (category.cid) {
markCategoryRead(category.cid); markCategoryRead(category.cid);
} }
}, },

5
src/socket.io/topics/unread.js
View File

@@ -1,6 +1,7 @@
'use strict'; 'use strict';
const topics = require('../../topics'); const topics = require('../../topics');
const categories = require('../../categories');
const api = require('../../api'); const api = require('../../api');
const sockets = require('..'); const sockets = require('..');
@@ -32,6 +33,10 @@ module.exports = function (SocketTopics) {
}; };
SocketTopics.markCategoryTopicsRead = async function (socket, cid) { SocketTopics.markCategoryTopicsRead = async function (socket, cid) {
const exists = await categories.exists(cid);
if (!exists) {
throw new Error('[[error:invalid-cid]]');
}
const tids = await topics.getUnreadTids({ cid: cid, uid: socket.uid, filter: '' }); const tids = await topics.getUnreadTids({ cid: cid, uid: socket.uid, filter: '' });
await SocketTopics.markAsRead(socket, tids); await SocketTopics.markAsRead(socket, tids);
}; };

2
src/topics/unread.js
View File

@@ -148,7 +148,7 @@ module.exports = function (Topics) {
const categoryWatchState = await categories.getWatchState(topicCids, params.uid); const categoryWatchState = await categories.getWatchState(topicCids, params.uid);
const userCidState = _.zipObject(topicCids, categoryWatchState); const userCidState = _.zipObject(topicCids, categoryWatchState);
const filterCids = params.cid && params.cid.map(cid => parseInt(cid, 10)); 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)); const filterTags = params.tag && params.tag.map(tag => String(tag));
topicData.forEach((topic) => { topicData.forEach((topic) => {