mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-07 06:25:50 +01:00
moved core notifications all the way to the end
This commit is contained in:
@@ -135,6 +135,7 @@ var async = require('async'),
|
||||
}
|
||||
|
||||
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.sortedSetRemove, 'uid:' + uid + ':notifications:read', notif_data.uniqueId)
|
||||
], function(err) {
|
||||
@@ -151,8 +152,7 @@ var async = require('async'),
|
||||
// Plugins
|
||||
notif_data.uid = uid;
|
||||
plugins.fireHook('action:notification.pushed', notif_data);
|
||||
|
||||
db.setObjectField('uid:' + uid + ':notifications:uniqueId:nid', notif_data.uniqueId, nid, next);
|
||||
next();
|
||||
});
|
||||
});
|
||||
}, callback);
|
||||
|
||||
@@ -203,13 +203,6 @@ module.exports = function(Topics) {
|
||||
},
|
||||
function(data, next) {
|
||||
postData = data;
|
||||
|
||||
if (parseInt(uid, 10)) {
|
||||
Topics.notifyFollowers(tid, postData.pid, uid);
|
||||
|
||||
user.notifications.sendPostNotificationToFollowers(uid, tid, postData.pid);
|
||||
}
|
||||
|
||||
next();
|
||||
},
|
||||
function(next) {
|
||||
@@ -242,6 +235,12 @@ module.exports = function(Topics) {
|
||||
postData.selfPost = false;
|
||||
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);
|
||||
}
|
||||
], callback);
|
||||
|
||||
Reference in New Issue
Block a user