Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 22:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

interim commit

Browse Source
This commit is contained in:
Julian Lam
2013-11-13 19:54:46 -05:00
parent 625b96ba73
commit 18009ebb39
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/groups.js
View File

@@ -65,6 +65,15 @@
isMember: function (uid, gid, callback) { isMember: function (uid, gid, callback) {
RDB.sismember('gid:' + gid + ':members', uid, callback); RDB.sismember('gid:' + gid + ':members', uid, callback);
}, },
isMemberByGroupName: function(uid, groupName, callback) {
this.getGidFromName(groupName, function(err, gid) {
if (err || !gid) {
callback(null, false);
} else {
Groups.isMember(uid, gid, callback);
}
});
},
exists: function (name, callback) { exists: function (name, callback) {
RDB.hexists('group:gid', name, callback); RDB.hexists('group:gid', name, callback);
}, },

15
src/routes/api.js
View File

@@ -3,6 +3,7 @@ var user = require('./../user.js'),
topics = require('./../topics.js'), topics = require('./../topics.js'),
posts = require('./../posts.js'), posts = require('./../posts.js'),
categories = require('./../categories.js'), categories = require('./../categories.js'),
Groups = require('../groups'),
utils = require('./../../public/src/utils.js'), utils = require('./../../public/src/utils.js'),
pkg = require('../../package.json'), pkg = require('../../package.json'),
meta = require('./../meta.js'), meta = require('./../meta.js'),
@@ -127,12 +128,26 @@ var user = require('./../user.js'),
app.get('/category/:id/:slug?', function (req, res, next) { app.get('/category/:id/:slug?', function (req, res, next) {
var uid = (req.user) ? req.user.uid : 0; var uid = (req.user) ? req.user.uid : 0;
// Category Whitelisting
Groups.exists('category:' + req.params.id + ':whitelist', function(err, exists) {
if (!err && exists) {
Groups.isMember(uid, gid, function(err, isMember) {
if (!err && isMember) {
categories.getCategoryById(req.params.id, uid, function (err, data) { categories.getCategoryById(req.params.id, uid, function (err, data) {
if (!err && data && data.disabled === "0") if (!err && data && data.disabled === "0")
res.json(data); res.json(data);
else else
next(); next();
}, req.params.id, uid); }, req.params.id, uid);
} else {
res.send(403);
}
});
} else {
res.send(403);
}
});
}); });
app.get('/recent/:term?', function (req, res) { app.get('/recent/:term?', function (req, res) {