Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-23 17:00:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #661

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-31 22:25:59 -05:00
parent 2cdddd2637
commit db309ce8a1
2 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/routes/api.js
View File

@@ -58,13 +58,18 @@ var path = require('path'),
app.get('/home', function (req, res) { app.get('/home', function (req, res) {
var uid = (req.user) ? req.user.uid : 0; var uid = (req.user) ? req.user.uid : 0;
categories.getAllCategories(uid, function (err, data) { categories.getAllCategories(uid, function (err, data) {
// Remove disabled categories
data.categories = data.categories.filter(function (category) { data.categories = data.categories.filter(function (category) {
return (!category.disabled || parseInt(category.disabled, 10) === 0); return (!category.disabled || parseInt(category.disabled, 10) === 0);
}); });
// Retrieve category information for / function canSee(category, next) {
function iterator(category, callback) { categoryTools.privileges(category.cid, ((req.user) ? req.user.uid || 0 : 0), function(err, privileges) {
next(!err && privileges.read);
});
}
function getRecentReplies(category, callback) {
categories.getRecentReplies(category.cid, uid, parseInt(category.numRecentReplies, 10), function (err, posts) { categories.getRecentReplies(category.cid, uid, parseInt(category.numRecentReplies, 10), function (err, posts) {
category.posts = posts; category.posts = posts;
category.post_count = posts.length > 2 ? 2 : posts.length; // this was a hack to make metro work back in the day, post_count should just = length category.post_count = posts.length > 2 ? 2 : posts.length; // this was a hack to make metro work back in the day, post_count should just = length
@@ -72,8 +77,11 @@ var path = require('path'),
}); });
} }
async.each(data.categories, iterator, function (err) { async.filter(data.categories, canSee, function(visibleCategories) {
// Assemble the MOTD data.categories = visibleCategories;
async.each(data.categories, getRecentReplies, function (err) {
var motdString, var motdString,
assemble = function() { assemble = function() {
data.motd_class = (parseInt(meta.config.show_motd, 10) === 1 || meta.config.show_motd === undefined) ? '' : ' none'; data.motd_class = (parseInt(meta.config.show_motd, 10) === 1 || meta.config.show_motd === undefined) ? '' : ' none';
@@ -83,8 +91,8 @@ var path = require('path'),
data.motd = require('marked')(motdString); data.motd = require('marked')(motdString);
res.json(data); res.json(data);
}; };
if (!meta.config.motd) { if (!meta.config.motd) {
// Construct default MOTD
translator.translate('\n\n# NodeBB <small><span>v' + pkg.version + '</span></small>\n\n<h5>[[global:motd.welcome]]</h5>\ translator.translate('\n\n# NodeBB <small><span>v' + pkg.version + '</span></small>\n\n<h5>[[global:motd.welcome]]</h5>\
<div class="btn-group">\ <div class="btn-group">\
<a target="_blank" href="https://www.nodebb.org" class="btn btn-link btn-md">\ <a target="_blank" href="https://www.nodebb.org" class="btn btn-link btn-md">\
@@ -115,6 +123,7 @@ var path = require('path'),
}); });
}); });
}); });
});
app.get('/login', function (req, res) { app.get('/login', function (req, res) {
var data = {}, var data = {},

15
src/webserver.js
View File

@@ -487,17 +487,22 @@ module.exports.server = server;
}, next); }, next);
}, },
"categories": function (next) { "categories": function (next) {
function canSee(category, next) {
CategoryTools.privileges(category.cid, ((req.user) ? req.user.uid || 0 : 0), function(err, privileges) {
next(!err && privileges.read);
});
}
categories.getAllCategories(0, function (err, returnData) { categories.getAllCategories(0, function (err, returnData) {
returnData.categories = returnData.categories.filter(function (category) { returnData.categories = returnData.categories.filter(function (category) {
if (parseInt(category.disabled, 10) !== 1) { return parseInt(category.disabled, 10) !== 1;
return true;
} else {
return false;
}
}); });
async.filter(returnData.categories, canSee, function(visibleCategories) {
returnData.categories = visibleCategories;
next(null, returnData); next(null, returnData);
}); });
});
} }
}, function (err, data) { }, function (err, data) {
res.send( res.send(