Node.js based forum software built for the modern web
perf: don't call getUids on every topic load
Barış Soner Uşaklı8a60d9c2bc36
diff --git a/src/controllers/topics.js b/src/controllers/topics.jsindex d5df96bf9e..178c38c869 100644--- a/src/controllers/topics.js+++ b/src/controllers/topics.js@@ -41,12 +41,10 @@ topicsController.get = async function getTopic(req, res, next) {userPrivileges,settings,rssToken,- uids,] = await Promise.all([privileges.topics.get(tid, req.uid),user.getSettings(req.uid),user.auth.getFeedToken(req.uid),- topics.getUids(tid),]);let currentPage = parseInt(req.query.page, 10) || 1;@@ -56,8 +54,7 @@ topicsController.get = async function getTopic(req, res, next) {userPrivileges.disabled ||invalidPagination ||(topicData.scheduled && !userPrivileges.view_scheduled) ||- (!req.uid && (topicData.cid === -1 && !uids.filter(uid => utils.isNumber(uid)).length))- ) {+ await shouldHideTopicFromGuest(req.uid, tid, topicData.cid)) {return next();}@@ -164,6 +161,12 @@ topicsController.get = async function getTopic(req, res, next) {res.render('topic', topicData);};+async function shouldHideTopicFromGuest(uid, tid, cid) {+ if (uid > 0 || cid !== -1) return false;+ const uids = await topics.getUids(tid);+ return !uids.some(uid => utils.isNumber(uid));+}+function generateQueryString(query) {const qString = qs.stringify(query);return qString.length ? `?${qString}` : '';