Skip to content

Node.js based forum software built for the modern web

fix: closes #14429, dont load thumbs if privateUpload is on

Barış Soner Uşaklıc45dc245c899
diff --git a/src/topics/index.js b/src/topics/index.js
index 2f25387bbd..4b7ccfb052 100644
--- a/src/topics/index.js
+++ b/src/topics/index.js
@@ -54,10 +54,10 @@ Topics.getTopicsFromSet = async function (set, uid, start, stop) {
};
Topics.getTopics = async function (tids, options) {
- let uid = options;
- if (typeof options === 'object') {
- uid = options.uid;
+ if (typeof options !== 'object' || options === null) {
+ options = { uid: options };
}
+ const { uid } = options;
tids = await privileges.topics.filterTids('topics:read', tids, uid);
return await Topics.getTopicsByTids(tids, options);
@@ -67,10 +67,11 @@ Topics.getTopicsByTids = async function (tids, options) {
if (!Array.isArray(tids) || !tids.length) {
return [];
}
- let uid = options;
- if (typeof options === 'object') {
- uid = options.uid;
+
+ if (typeof options !== 'object' || options === null) {
+ options = { uid: options };
}
+ const { uid } = options;
async function loadTopics() {
const topics = await Topics.getTopicsData(tids);
@@ -189,7 +190,7 @@ Topics.getTopicWithPosts = async function (topicData, set, uid, start, stop, rev
getMerger(topicData),
getForker(topicData),
Topics.getRelatedTopics(topicData, uid),
- Topics.thumbs.load([topicData]),
+ Topics.thumbs.load([topicData], { uid }),
Topics.events.get(topicData.tid, uid, reverse),
]);
diff --git a/src/topics/teaser.js b/src/topics/teaser.js
index 1ee9f0d437..5d3fda2ee3 100644
--- a/src/topics/teaser.js
+++ b/src/topics/teaser.js
@@ -15,15 +15,16 @@ module.exports = function (Topics) {
if (!Array.isArray(topics) || !topics.length) {
return [];
}
- let uid = options;
- let { teaserPost } = meta.config;
- let teaserParseType = 'plaintext';
- if (typeof options === 'object') {
- uid = options.uid;
- teaserPost = options.teaserPost || meta.config.teaserPost;
- teaserParseType = options.teaserParseType || 'plaintext';
+ if (typeof options !== 'object' || options === null) {
+ options = { uid: options };
}
+ const {
+ uid,
+ teaserPost = meta.config.teaserPost,
+ teaserParseType = 'plaintext',
+ } = options;
+
const counts = [];
const teaserPids = [];
const tidToPost = {};
diff --git a/src/topics/thumbs.js b/src/topics/thumbs.js
index af29eb6b8c..a6b9313721 100644
--- a/src/topics/thumbs.js
+++ b/src/topics/thumbs.js
@@ -21,6 +21,9 @@ Thumbs.exists = async function (tid, path) {
};
Thumbs.load = async function (topicData, options = {}) {
+ if (meta.config.privateUploads && parseInt(options.uid, 10) <= 0) {
+ return topicData.map(() => ([]));
+ }
const mainPids = topicData.filter(Boolean).map(t => t.mainPid);
const mainPostData = await posts.getPostsFields(mainPids, ['attachments', 'uploads']);
const hasUploads = mainPostData.map(p => Array.isArray(p.uploads) && p.uploads.length > 0);