Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 20:16:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

part of #3912

Browse Source
This commit is contained in:
Julian Lam
2015-12-16 11:20:21 -05:00
parent 33a3a56fd7
commit 9db0f59432
4 changed files with 62 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/user/notifications.js
View File

@@ -64,28 +64,21 @@ var async = require('async'),
}
function getNotificationsFromSet(set, read, uid, start, stop, callback) {
db.getSortedSetRevRange(set, start, stop, function(err, nids) {
if (err) {
return callback(err);
}
if(!Array.isArray(nids) || !nids.length) {
return callback(null, []);
}
UserNotifications.getNotifications(nids, uid, function(err, notifications) {
if (err) {
return callback(err);
async.waterfall([
async.apply(db.getSortedSetRevRange, set, start, stop),
function(nids, next) {
if(!Array.isArray(nids) || !nids.length) {
return callback(null, []);
}
UserNotifications.getNotifications(nids, uid, next);
},
function(notifs, next) {
var deletedNids = [];
notifications.forEach(function(notification, index) {
notifs.forEach(function(notification, index) {
if (!notification) {
if (process.env.NODE_ENV === 'development') {
winston.info('[notifications.get] nid ' + nids[index] + ' not found. Removing.');
}
winston.verbose('[notifications.get] nid ' + nids[index] + ' not found. Removing.');
deletedNids.push(nids[index]);
} else {
notification.read = read;
@@ -97,9 +90,9 @@ var async = require('async'),
db.sortedSetRemove(set, deletedNids);
}
callback(null, notifications);
});
});
notifications.merge(notifs, next);
}
], callback);
}
UserNotifications.getNotifications = function(nids, uid, callback) {