Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 11:35: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

20
src/user.js
View File

@@ -999,12 +999,8 @@ var bcrypt = require('bcryptjs'),
async.map(nids, function(nid, next) {
notifications.get(nid, uid, function(notif_data) {
if(!notif_data) {
db.sortedSetRemove(set, nid);
} else {
if(typeof iterator === 'function') {
iterator(notif_data);
}
if(typeof iterator === 'function') {
iterator(notif_data);
}
next(null, notif_data);
@@ -1018,7 +1014,9 @@ var bcrypt = require('bcryptjs'),
async.parallel({
unread: function(next) {
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);
},
read: function(next) {
@@ -1029,6 +1027,14 @@ var bcrypt = require('bcryptjs'),
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
if (notifications.read.length + notifications.unread.length > maxNotifs) {
notifications.read.length = maxNotifs - notifications.unread.length;