minor cleanups

v1.18.x
Baris Soner Usakli 11 years ago
parent a83d4a9dd5
commit 7f2d70d7f6

@ -63,7 +63,7 @@ var db = require('./database'),
category: function(next) { category: function(next) {
Categories.getCategoryData(cid, next); Categories.getCategoryData(cid, next);
}, },
topics : function(next) { topics: function(next) {
Categories.getCategoryTopics(cid, start, end, uid, next); Categories.getCategoryTopics(cid, start, end, uid, next);
}, },
pageCount: function(next) { pageCount: function(next) {
@ -287,14 +287,14 @@ var db = require('./database'),
Categories.getCategories = function(cids, uid, callback) { Categories.getCategories = function(cids, uid, callback) {
if (!cids || !Array.isArray(cids) || cids.length === 0) { if (!cids || !Array.isArray(cids) || cids.length === 0) {
return callback(new Error('invalid-cids'), null); return callback(new Error('invalid-cids'));
} }
function getCategory(cid, callback) { function getCategory(cid, callback) {
Categories.getCategoryData(cid, function(err, categoryData) { Categories.getCategoryData(cid, function(err, categoryData) {
if (err) { if (err) {
winston.warn('Attempted to retrieve cid ' + cid + ', but nothing was returned!'); winston.warn('Attempted to retrieve cid ' + cid + ', but nothing was returned!');
return callback(err, null); return callback(err);
} }
Categories.hasReadCategory(cid, uid, function(hasRead) { Categories.hasReadCategory(cid, uid, function(hasRead) {
@ -326,7 +326,7 @@ var db = require('./database'),
db.getSortedSetRange('uid:' + uid + ':posts', 0, -1, function(err, pids) { db.getSortedSetRange('uid:' + uid + ':posts', 0, -1, function(err, pids) {
if (err) { if (err) {
return callback(err, null); return callback(err);
} }
var index = 0, var index = 0,
@ -347,15 +347,11 @@ var db = require('./database'),
} }
++index; ++index;
callback(null); callback();
}); });
}, },
function(err) { function(err) {
if (err) { callback(err, active);
return callback(err, null);
}
callback(null, active);
} }
); );
}); });

Loading…
Cancel
Save