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

moved core notifications all the way to the end

Browse Source
This commit is contained in:
barisusakli
2014-07-28 19:09:08 -04:00
parent 6e335ff29a
commit f31978aa2c
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/notifications.js
View File

@@ -135,6 +135,7 @@ var async = require('async'),
} }
async.parallel([ async.parallel([
async.apply(db.setObjectField, 'uid:' + uid + ':notifications:uniqueId:nid', notif_data.uniqueId, nid),
async.apply(db.sortedSetAdd, 'uid:' + uid + ':notifications:unread', notif_data.datetime, notif_data.uniqueId), async.apply(db.sortedSetAdd, 'uid:' + uid + ':notifications:unread', notif_data.datetime, notif_data.uniqueId),
async.apply(db.sortedSetRemove, 'uid:' + uid + ':notifications:read', notif_data.uniqueId) async.apply(db.sortedSetRemove, 'uid:' + uid + ':notifications:read', notif_data.uniqueId)
], function(err) { ], function(err) {
@@ -151,8 +152,7 @@ var async = require('async'),
// Plugins // Plugins
notif_data.uid = uid; notif_data.uid = uid;
plugins.fireHook('action:notification.pushed', notif_data); plugins.fireHook('action:notification.pushed', notif_data);
next();
db.setObjectField('uid:' + uid + ':notifications:uniqueId:nid', notif_data.uniqueId, nid, next);
}); });
}); });
}, callback); }, callback);

13
src/topics/create.js
View File

@@ -203,13 +203,6 @@ module.exports = function(Topics) {
}, },
function(data, next) { function(data, next) {
postData = data; postData = data;
if (parseInt(uid, 10)) {
Topics.notifyFollowers(tid, postData.pid, uid);
user.notifications.sendPostNotificationToFollowers(uid, tid, postData.pid);
}
next(); next();
}, },
function(next) { function(next) {
@@ -242,6 +235,12 @@ module.exports = function(Topics) {
postData.selfPost = false; postData.selfPost = false;
postData.relativeTime = utils.toISOString(postData.timestamp); postData.relativeTime = utils.toISOString(postData.timestamp);
if (parseInt(uid, 10)) {
Topics.notifyFollowers(tid, postData.pid, uid);
user.notifications.sendPostNotificationToFollowers(uid, tid, postData.pid);
}
next(null, postData); next(null, postData);
} }
], callback); ], callback);