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

closes #1993

Browse Source
This commit is contained in:
barisusakli
2014-08-17 00:14:45 -04:00
parent 5ae7c92d55
commit 05fdc945f3
7 changed files with 84 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/user/notifications.js
View File

@@ -130,21 +130,74 @@ var async = require('async'),
return callback(err);
}
notifications = notifications.map(function(notification, index) {
if (!notification) {
return null;
}
notification.read = hasRead[index];
notification.datetimeISO = utils.toISOString(notification.datetime);
notification.readClass = !notification.read ? 'label-warning' : '';
return notification;
var pids = notifications.map(function(notification) {
return notification ? notification.pid : null;
});
callback(null, notifications);
generatePostPaths(pids, uid, function(err, paths) {
if (err) {
return callback(err);
}
notifications = notifications.map(function(notification, index) {
if (!notification) {
return null;
}
notification.read = hasRead[index];
notification.path = paths[index] || notification.path || '';
notification.datetimeISO = utils.toISOString(notification.datetime);
notification.readClass = !notification.read ? 'label-warning' : '';
return notification;
});
callback(null, notifications);
});
});
});
};
function generatePostPaths(pids, uid, callback) {
var postKeys = pids.map(function(pid) {
return 'post:' + pid;
});
db.getObjectsFields(postKeys, ['pid', 'tid'], function(err, postData) {
if (err) {
return callback(err);
}
var topicKeys = postData.map(function(post) {
return post ? 'topic:' + post.tid : null;
});
async.parallel({
indices: function(next) {
posts.getPostIndices(postData, uid, next);
},
topics: function(next) {
db.getObjectsFields(topicKeys, ['slug'], next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
var paths = [];
pids.forEach(function(pid, index) {
var slug = results.topics[index] ? results.topics[index].slug : null;
var postIndex = results.indices[index] ? parseInt(results.indices[index], 10) + 1 : null;
if (slug && postIndex) {
paths.push(nconf.get('relative_path') + '/topic/' + slug + '/' + postIndex);
} else {
paths.push(null);
}
});
callback(null, paths);
});
});
}
UserNotifications.getDailyUnread = function(uid, callback) {
var now = Date.now(),
yesterday = now - (1000*60*60*24); // Approximate, can be more or less depending on time changes, makes no difference really.
@@ -221,8 +274,7 @@ var async = require('async'),
async.parallel({
username: async.apply(user.getUserField, uid, 'username'),
topic: async.apply(topics.getTopicFields, tid, ['slug', 'cid', 'title']),
postIndex: async.apply(posts.getPidIndex, pid),
topic: async.apply(topics.getTopicFields, tid, ['cid', 'title']),
postContent: function(next) {
async.waterfall([
async.apply(posts.getPostField, pid, 'content'),
@@ -246,7 +298,7 @@ var async = require('async'),
notifications.create({
bodyShort: '[[notifications:user_posted_to, ' + results.username + ', ' + results.topic.title + ']]',
bodyLong: results.postContent,
path: nconf.get('relative_path') + '/topic/' + results.topic.slug + '/' + results.postIndex,
pid: pid,
uniqueId: 'topic:' + tid + ':uid:' + uid,
tid: tid,
from: uid