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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-02-09 12:53:07 -05:00
parent b9244110d9 d61665c20a
commit a17c26ea45
11 changed files with 96 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/categories.js
View File

@@ -350,11 +350,11 @@ var privileges = require('./privileges');
Categories.filterIgnoringUids = function (cid, uids, callback) {
async.waterfall([
function (next) {
db.sortedSetScores('cid:' + cid + ':ignorers', uids, next);
db.isSortedSetMembers('cid:' + cid + ':ignorers', uids, next);
},
function (scores, next) {
function (isIgnoring, next) {
var readingUids = uids.filter(function (uid, index) {
return uid && !!scores[index];
return uid && !isIgnoring[index];
});
next(null, readingUids);
}

4
src/topics/follow.js
View File

@@ -153,9 +153,9 @@ module.exports = function (Topics) {
function (next) {
db.isSetMembers('tid:' + tid + ':ignorers', uids, next);
},
function (isMembers, next) {
function (isIgnoring, next) {
var readingUids = uids.filter(function (uid, index) {
return uid && isMembers[index];
return uid && !isIgnoring[index];
});
next(null, readingUids);
}