From 920efad04d5f537212b7005ccafa9e20466febad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 26 Jan 2019 23:44:41 -0500 Subject: [PATCH] fix: #7300 --- src/controllers/recent.js | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/src/controllers/recent.js b/src/controllers/recent.js index e18c853c68..2b58bd9b99 100644 --- a/src/controllers/recent.js +++ b/src/controllers/recent.js @@ -10,6 +10,7 @@ var topics = require('../topics'); var meta = require('../meta'); var helpers = require('./helpers'); var pagination = require('../pagination'); +var privileges = require('../privileges'); var recentController = module.exports; @@ -36,6 +37,7 @@ recentController.getData = function (req, url, sort, callback) { var filter = req.query.filter || ''; var categoryData; var rssToken; + var canPost; if (!helpers.validFilters[filter] || (!term && req.query.term)) { return callback(null, null); @@ -54,12 +56,16 @@ recentController.getData = function (req, url, sort, callback) { rssToken: function (next) { user.auth.getFeedToken(req.uid, next); }, + canPost: function (next) { + canPostTopic(req.uid, next); + }, }, next); }, function (results, next) { rssToken = results.rssToken; settings = results.settings; categoryData = results.categories; + canPost = results.canPost; var start = Math.max(0, (page - 1) * settings.topicsPerPage); stop = start + settings.topicsPerPage - 1; @@ -76,6 +82,7 @@ recentController.getData = function (req, url, sort, callback) { }, next); }, function (data, next) { + data.canPost = canPost; data.categories = categoryData.categories; data.allCategoriesUrl = url + helpers.buildQueryString('', filter, ''); data.selectedCategory = categoryData.selectedCategory; @@ -88,13 +95,9 @@ recentController.getData = function (req, url, sort, callback) { data.title = meta.config.homePageTitle || '[[pages:home]]'; data.filters = helpers.buildFilters(url, filter, req.query); - data.selectedFilter = data.filters.find(function (filter) { - return filter && filter.selected; - }); + data.selectedFilter = data.filters.find(filter => filter && filter.selected); data.terms = helpers.buildTerms(url, term, req.query); - data.selectedTerm = data.terms.find(function (term) { - return term && term.selected; - }); + data.selectedTerm = data.terms.find(term => term && term.selected); var pageCount = Math.max(1, Math.ceil(data.topicCount / settings.topicsPerPage)); data.pagination = pagination.create(page, pageCount, req.query); @@ -108,3 +111,17 @@ recentController.getData = function (req, url, sort, callback) { }, ], callback); }; + +function canPostTopic(uid, callback) { + async.waterfall([ + function (next) { + categories.getAllCidsFromSet('categories:cid', next); + }, + function (cids, next) { + privileges.categories.filterCids('topics:create', cids, uid, next); + }, + function (cids, next) { + next(null, cids.length > 0); + }, + ], callback); +}