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

final pass, #999

Browse Source
This commit is contained in:
Julian Lam
2014-02-14 11:04:00 -05:00
parent 8bd6f85478
commit d0d3160fc7
2 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/notifications.js
View File

@@ -19,18 +19,37 @@ var async = require('async'),
Notifications.get = function(nid, uid, callback) { Notifications.get = function(nid, uid, callback) {
db.exists('notifications:' + nid, function(err, exists) { db.exists('notifications:' + nid, function(err, exists) {
if(!exists) { if (err) {
winston.error('[notifications.get] Could not retrieve nid ' + nid + ': ' + err.message);
return callback(null); return callback(null);
} }
db.sortedSetRank('uid:' + uid + ':notifications:read', nid, function(err, rank) { if (exists) {
db.sortedSetRank('uid:' + uid + ':notifications:read', nid, function(err, rank) {
db.getObjectFields('notifications:' + nid, ['nid', 'text', 'score', 'path', 'datetime', 'uniqueId'], function(err, notification) { db.getObjectFields('notifications:' + nid, ['nid', 'text', 'score', 'path', 'datetime', 'uniqueId'], function(err, notification) {
notification.read = rank !== null ? true:false; notification.read = rank !== null ? true:false;
callback(notification); callback(notification);
});
}); });
}); } else {
// Remove from the user's boxes
if (process.env.NODE_ENV === 'development') {
winston.info('[notifications.get] nid ' + nid + ' not found. Removing.');
}
async.parallel([
function(next) {
db.sortedSetRemove('uid:' + uid + ':notifications:unread', nid, next);
},
function(next) {
db.sortedSetRemove('uid:' + uid + ':notifications:read', nid, next);
}
], function(err) {
callback(null);
});
}
}); });
}; };

20
src/user.js
View File

@@ -999,12 +999,8 @@ var bcrypt = require('bcryptjs'),
async.map(nids, function(nid, next) { async.map(nids, function(nid, next) {
notifications.get(nid, uid, function(notif_data) { notifications.get(nid, uid, function(notif_data) {
if(!notif_data) { if(typeof iterator === 'function') {
db.sortedSetRemove(set, nid); iterator(notif_data);
} else {
if(typeof iterator === 'function') {
iterator(notif_data);
}
} }
next(null, notif_data); next(null, notif_data);
@@ -1018,7 +1014,9 @@ var bcrypt = require('bcryptjs'),
async.parallel({ async.parallel({
unread: function(next) { unread: function(next) {
getNotifications('uid:' + uid + ':notifications:unread', 0, 9, function(notif_data) { getNotifications('uid:' + uid + ':notifications:unread', 0, 9, function(notif_data) {
notif_data.readClass = !notif_data.read ? 'label-warning' : ''; if (notif_data) {
notif_data.readClass = !notif_data.read ? 'label-warning' : '';
}
}, next); }, next);
}, },
read: function(next) { read: function(next) {
@@ -1029,6 +1027,14 @@ var bcrypt = require('bcryptjs'),
return calback(err); return calback(err);
} }
// Remove empties
notifications.read = notifications.read.filter(function(notifObj) {
return notifObj;
});
notifications.unread = notifications.unread.filter(function(notifObj) {
return notifObj;
});
// Limit the number of notifications to `maxNotifs`, prioritising unread notifications // Limit the number of notifications to `maxNotifs`, prioritising unread notifications
if (notifications.read.length + notifications.unread.length > maxNotifs) { if (notifications.read.length + notifications.unread.length > maxNotifs) {
notifications.read.length = maxNotifs - notifications.unread.length; notifications.read.length = maxNotifs - notifications.unread.length;