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

fix: post indices if there is a blocked user in topic

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2022-01-18 20:31:06 -05:00
parent 3b72ff8742
commit f9279b636b
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/posts/index.js
View File

@@ -45,8 +45,7 @@ Posts.getPostsByPids = async function (pids, uid) {
return [];
}
let posts = await Posts.getPostsData(pids);
posts = await Promise.all(posts.map(p => Posts.parsePost(p)));
posts = await user.blocks.filter(uid, posts);
posts = await Promise.all(posts.map(Posts.parsePost));
const data = await plugins.hooks.fire('filter:post.getPosts', { posts: posts, uid: uid });
if (!data || !Array.isArray(data.posts)) {
return [];

4
src/posts/topics.js
View File

@@ -2,12 +2,14 @@
'use strict';
const topics = require('../topics');
const user = require('../user');
const utils = require('../utils');
module.exports = function (Posts) {
Posts.getPostsFromSet = async function (set, start, stop, uid, reverse) {
const pids = await Posts.getPidsFromSet(set, start, stop, reverse);
return await Posts.getPostsByPids(pids, uid);
const posts = await Posts.getPostsByPids(pids, uid);
return await user.blocks.filter(uid, posts);
};
Posts.isMain = async function (pids) {

1
src/socket.io/posts.js
View File

@@ -98,6 +98,7 @@ SocketPosts.getReplies = async function (socket, pid) {
postData = await topics.addPostData(postData, socket.uid);
postData.forEach((postData, index) => posts.modifyPostByPrivilege(postData, postPrivileges[index]));
postData = postData.filter((postData, index) => postData && postPrivileges[index].read);
postData = await user.blocks.filter(socket.uid, postData);
return postData;
};

3
src/topics/index.js
View File

@@ -252,7 +252,8 @@ Topics.getMainPosts = async function (tids, uid) {
};
async function getMainPosts(mainPids, uid) {
const postData = await posts.getPostsByPids(mainPids, uid);
let postData = await posts.getPostsByPids(mainPids, uid);
postData = await user.blocks.filter(uid, postData);
postData.forEach((post) => {
if (post) {
post.index = 0;

4
src/topics/posts.js
View File

@@ -44,7 +44,7 @@ module.exports = function (Topics) {
if (topicData.mainPid && start === 0) {
pids.unshift(topicData.mainPid);
}
const postData = await posts.getPostsByPids(pids, uid);
let postData = await posts.getPostsByPids(pids, uid);
if (!postData.length) {
return [];
}
@@ -55,7 +55,7 @@ module.exports = function (Topics) {
}
Topics.calculatePostIndices(replies, repliesStart);
postData = await user.blocks.filter(uid, postData);
await addEventStartEnd(postData, set, reverse, topicData);
const result = await plugins.hooks.fire('filter:topic.getPosts', {
topic: topicData,