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

removed extra priv checks

Browse Source 
-removed category check from recentreplies since pids are already
checked
-removed category check from topics/unread.js since topics are filtered
now
-added array checks to src/topics.js
This commit is contained in:
barisusakli
2014-11-14 19:52:25 -05:00
parent 5c7487c13b
commit 6b13a84d2f
3 changed files with 26 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/topics/unread.js
View File

@@ -105,7 +105,7 @@ module.exports = function(Topics) {
tids = tids.slice(start, stop + 1);
}
callback(err, tids);
callback(null, tids);
});
});
};
@@ -115,45 +115,22 @@ module.exports = function(Topics) {
return callback(null, tids);
}
privileges.topics.filter('read', tids, uid, function(err, tids) {
if (err || !tids.length) {
return callback(err, []);
}
var keys = tids.map(function(tid) {
return 'topic:' + tid;
});
db.getObjectsFields(keys, ['tid', 'cid'], function(err, topics) {
if (err) {
return callback(err);
}
var topicCids = topics.filter(function(topic) {
return topic && topic.cid;
async.waterfall([
function(next) {
privileges.topics.filter('read', tids, uid, next);
},
function(tids, next) {
Topics.getTopicsFields(tids, ['tid', 'cid'], next);
},
function(topics, next) {
tids = topics.filter(function(topic) {
return topic && topic.cid && ignoredCids.indexOf(topic.cid.toString()) === -1;
}).map(function(topic) {
return topic.cid.toString();
return topic.tid;
});
topicCids = topicCids.filter(function(cid) {
return ignoredCids.indexOf(cid) === -1;
});
privileges.categories.filterCids('read', topicCids, uid, function(err, readableCids) {
if (err) {
return callback(err);
}
topics = topics.filter(function(topic) {
return topic.cid && readableCids.indexOf(topic.cid.toString()) !== -1;
}).map(function(topic) {
return topic.tid;
});
callback(null, topics);
});
});
});
next(null, tids);
}
], callback);
}
Topics.pushUnreadCount = function(uid, callback) {