Skip to content

Node.js based forum software built for the modern web

fix: closes #14405, check category disabled flag

Barış Soner Uşaklı7ea5e93dbadb
diff --git a/src/api/posts.js b/src/api/posts.js
index bf823e0ffa..fc3006267c 100644
--- a/src/api/posts.js
+++ b/src/api/posts.js
@@ -29,7 +29,7 @@ postsAPI.get = async function (caller, data) {
]);
const userPrivilege = userPrivileges[0];
- if (!post || !userPrivilege.read || !userPrivilege['topics:read']) {
+ if (!post || !userPrivilege.read || !userPrivilege['topics:read'] || userPrivilege.disabled) {
return null;
}
diff --git a/src/api/topics.js b/src/api/topics.js
index c08d42c837..3605bb3222 100644
--- a/src/api/topics.js
+++ b/src/api/topics.js
@@ -41,6 +41,7 @@ topicsAPI.get = async function (caller, data) {
!topic ||
!userPrivileges.read ||
!userPrivileges['topics:read'] ||
+ userPrivileges.disabled ||
!privileges.topics.canViewDeletedScheduled(topic, userPrivileges)
) {
return null;
diff --git a/src/privileges/posts.js b/src/privileges/posts.js
index 09a06aee26..e0f65011c1 100644
--- a/src/privileges/posts.js
+++ b/src/privileges/posts.js
@@ -7,6 +7,7 @@ const db = require('../database');
const meta = require('../meta');
const posts = require('../posts');
const topics = require('../topics');
+const categories = require('../categories');
const user = require('../user');
const activitypub = require('../activitypub');
const helpers = require('./helpers');
@@ -33,6 +34,7 @@ privsPosts.get = async function (pids, uid) {
'posts:edit': helpers.isAllowedTo('posts:edit', uid, uniqueCids),
'posts:history': helpers.isAllowedTo('posts:history', uid, uniqueCids),
'posts:view_deleted': helpers.isAllowedTo('posts:view_deleted', uid, uniqueCids),
+ categoryData: categories.getCategoriesFields(uniqueCids, ['disabled']),
});
const isModerator = _.zipObject(uniqueCids, results.isModerator);
@@ -42,6 +44,7 @@ privsPosts.get = async function (pids, uid) {
privData['posts:edit'] = _.zipObject(uniqueCids, results['posts:edit']);
privData['posts:history'] = _.zipObject(uniqueCids, results['posts:history']);
privData['posts:view_deleted'] = _.zipObject(uniqueCids, results['posts:view_deleted']);
+ privData.disabled = _.zipObject(uniqueCids, results.categoryData.map(c => c && c.disabled));
const privileges = cids.map((cid, i) => {
const isAdminOrMod = results.isAdmin || isModerator[cid];
@@ -57,6 +60,7 @@ privsPosts.get = async function (pids, uid) {
read: privData.read[cid] || results.isAdmin,
'posts:history': viewHistory,
'posts:view_deleted': viewDeletedPosts,
+ disabled: privData.disabled[cid],
};
});