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

fix: #11512, filter by cid

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-04-24 10:17:31 -04:00
parent a8a2ebbe2b
commit e8fb6711b8
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/groups/posts.js
View File

@@ -1,7 +1,6 @@
'use strict'; 'use strict';
const db = require('../database'); const db = require('../database');
const groups = require('.');
const privileges = require('../privileges'); const privileges = require('../privileges');
const posts = require('../posts'); const posts = require('../posts');
@@ -15,7 +14,7 @@ module.exports = function (Groups) {
groupNames = groupNames[0]; groupNames = groupNames[0];
// Only process those groups that have the cid in its memberPostCids setting (or no setting at all) // Only process those groups that have the cid in its memberPostCids setting (or no setting at all)
const groupData = await groups.getGroupsFields(groupNames, ['memberPostCids']); const groupData = await Groups.getGroupsFields(groupNames, ['memberPostCids']);
groupNames = groupNames.filter((groupName, idx) => ( groupNames = groupNames.filter((groupName, idx) => (
!groupData[idx].memberPostCidsArray.length || !groupData[idx].memberPostCidsArray.length ||
groupData[idx].memberPostCidsArray.includes(postData.cid) groupData[idx].memberPostCidsArray.includes(postData.cid)
@@ -23,7 +22,7 @@ module.exports = function (Groups) {
const keys = groupNames.map(groupName => `group:${groupName}:member:pids`); const keys = groupNames.map(groupName => `group:${groupName}:member:pids`);
await db.sortedSetsAdd(keys, postData.timestamp, postData.pid); await db.sortedSetsAdd(keys, postData.timestamp, postData.pid);
await Promise.all(groupNames.map(name => truncateMemberPosts(name))); await Promise.all(groupNames.map(truncateMemberPosts));
}; };
async function truncateMemberPosts(groupName) { async function truncateMemberPosts(groupName) {
@@ -37,8 +36,13 @@ module.exports = function (Groups) {
} }
Groups.getLatestMemberPosts = async function (groupName, max, uid) { Groups.getLatestMemberPosts = async function (groupName, max, uid) {
let pids = await db.getSortedSetRevRange(`group:${groupName}:member:pids`, 0, max - 1); const [allPids, groupData] = await Promise.all([
pids = await privileges.posts.filter('topics:read', pids, uid); db.getSortedSetRevRange(`group:${groupName}:member:pids`, 0, max - 1),
return await posts.getPostSummaryByPids(pids, uid, { stripTags: false }); Groups.getGroupFields(groupName, ['memberPostCids']),
]);
const cids = groupData.memberPostCidsArray;
const pids = await privileges.posts.filter('topics:read', allPids, uid);
const postData = await posts.getPostSummaryByPids(pids, uid, { stripTags: false });
return postData.filter(p => p && p.topic && (!cids.length || cids.includes(p.topic.cid)));
}; };
}; };