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

fix: closes #14073, fix teasers from child categories

Browse Source 
add a test
This commit is contained in:
Barış Soner Uşaklı
2026-03-10 09:49:23 -04:00
parent a3821ff7f4
commit a391d01d30
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/categories/recentreplies.js
View File

@@ -99,7 +99,7 @@ module.exports = function (Categories) {
const [topicData, crossposts] = await Promise.all([
topics.getTopicsFields(
tids,
['tid', 'mainPid', 'slug', 'title', 'teaserPid', 'cid', 'postcount']
['tid', 'uid', 'mainPid', 'slug', 'title', 'teaserPid', 'cid', 'postcount']
),
topics.crossposts.get(tids),
]);
@@ -137,11 +137,12 @@ module.exports = function (Categories) {
function assignTopicsToCategories(categories, topics) {
categories.forEach((category) => {
if (category) {
const categoryCid = String(category.cid);
category.posts = topics.filter(t =>
t.cid &&
(t.cid === category.cid ||
(t.parentCids && t.parentCids.includes(category.cid)) ||
(t.crossposts.some(({ cid }) => parseInt(cid, 10) === category.cid))
(String(t.cid) === categoryCid ||
(t.parentCids && t.parentCids.includes(categoryCid)) ||
(t.crossposts.some(({ cid }) => String(cid) === categoryCid))
))
.sort((a, b) => b.timestamp - a.timestamp)
.slice(0, parseInt(category.numRecentReplies, 10));

26
test/categories.js
View File

@@ -85,21 +85,31 @@ describe('Categories', () => {
});
describe('Categories.getRecentTopicReplies', () => {
it('should not throw', (done) => {
Categories.getCategoryById({
it('should not throw', async () => {
const categoryData = await Categories.getCategoryById({
cid: categoryObj.cid,
set: `cid:${categoryObj.cid}:tids`,
reverse: true,
start: 0,
stop: -1,
uid: 0,
}, (err, categoryData) => {
assert.ifError(err);
Categories.getRecentTopicReplies(categoryData, 0, {}, (err) => {
assert.ifError(err);
done();
});
});
await Categories.getRecentTopicReplies([categoryData], 0, {});
});
it('should return posts in child category as teaser on parent category' , async () => {
const { cid: parentCid } = await Categories.create({ name: 'theparent' });
const { cid: childCid } = await Categories.create({ name: 'thechild', parentCid });
await Topics.post({ uid: posterUid, title: 'inparent', content: 'post in parent', cid: parentCid });
await Topics.post({ uid: posterUid, title: 'inchild', content: 'post in child', cid: childCid });
const categoryData = await Categories.getCategories([parentCid, childCid]);
Categories.getTree(categoryData, 0);
await Categories.getRecentTopicReplies(categoryData, 0, {}),
assert.strictEqual(String(categoryData[0].cid), String(parentCid));
assert.strictEqual(categoryData[0].posts[0].uid, posterUid);
assert.strictEqual(categoryData[0].posts[0].content, 'post in child');
});
});