Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-08 08:32:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:designcreateplay/NodeBB

Browse Source
This commit is contained in:
Julian Lam
2014-02-13 12:26:46 -05:00
parent e2c6eca36e 99a212d141
commit 750ce1f7f8
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/topics.js
View File

@@ -26,8 +26,6 @@ var async = require('async'),
return callback(err);
}
db.setAdd('topics:tid', tid);
var slug = tid + '/' + utils.slugify(title),
timestamp = Date.now();
@@ -48,6 +46,8 @@ var async = require('async'),
if(err) {
return callback(err);
}
db.setAdd('topics:tid', tid);
db.searchIndex('topic', title, tid);
user.addTopicIdToUser(uid, tid, timestamp);

12
src/user.js
View File

@@ -1017,26 +1017,30 @@ var bcrypt = require('bcryptjs'),
async.parallel({
unread: function(next) {
getNotifications('uid:' + uid + ':notifications:unread', 0, 10, function(notif_data) {
getNotifications('uid:' + uid + ':notifications:unread', 0, 9, function(notif_data) {
notif_data.readClass = !notif_data.read ? 'label-warning' : '';
}, next);
},
read: function(next) {
getNotifications('uid:' + uid + 'notifications:read', 0, 10, null, next);
getNotifications('uid:' + uid + ':notifications:read', 0, 9, null, next);
}
}, function(err, notifications) {
if(err) {
return calback(err);
}
// 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;
}
callback(err, notifications);
callback(null, notifications);
});
},
getAll: function(uid, limit, before, callback) {
var now = new Date();
if (!limit || parseInt(limit,10) <= 0) {
if (!limit || parseInt(limit, 10) <= 0) {
limit = 25;
}
if (before) {