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

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

Browse Source
This commit is contained in:
Baris Usakli
2013-06-24 16:16:55 -04:00
parent 51842a32da 5671f80bbc
commit 87a786c1b0
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/user.js
View File

@@ -757,7 +757,7 @@ var utils = require('./../public/src/utils.js'),
get: function(uid, callback) {
async.parallel({
unread: function(next) {
RDB.zrangebyscore('uid:' + uid + ':notifications:unread', 0, 10, function(err, nids) {
RDB.zrevrangebyscore('uid:' + uid + ':notifications:unread', 10, 0, function(err, nids) {
var unread = [];
if (nids && nids.length > 0) {
async.eachSeries(nids, function(nid, next) {
@@ -772,7 +772,7 @@ var utils = require('./../public/src/utils.js'),
});
},
read: function(next) {
RDB.zrangebyscore('uid:' + uid + ':notifications:read', 0, 10, function(err, nids) {
RDB.zrevrangebyscore('uid:' + uid + ':notifications:read', 10, 0, function(err, nids) {
var read = [];
if (nids && nids.length > 0) {
async.eachSeries(nids, function(nid, next) {
@@ -787,6 +787,13 @@ var utils = require('./../public/src/utils.js'),
});
}
}, function(err, notifications) {
// While maintaining score sorting, sort by time
notifications.read.sort(function(a, b) {
if (a.score === b.score) return (a.datetime - b.datetime) > 0 ? -1 : 1;
});
notifications.unread.sort(function(a, b) {
if (a.score === b.score) return (a.datetime - b.datetime) > 0 ? -1 : 1;
});
callback(notifications);
});
},