closes #4540

src/notifications.js

@@ -1,17 +1,17 @@
 'use strict';
 
-var async = require('async'),
+var async = require('async');
-	winston = require('winston'),
+var winston = require('winston');
-	cron = require('cron').CronJob,
+var cron = require('cron').CronJob;
-	nconf = require('nconf'),
+var nconf = require('nconf');
-	S = require('string'),
+var S = require('string');
-	_ = require('underscore'),
+var _ = require('underscore');
 
-	db = require('./database'),
+var db = require('./database');
-	User = require('./user'),
+var User = require('./user');
-	groups = require('./groups'),
+var groups = require('./groups');
-	meta = require('./meta'),
+var meta = require('./meta');
-	plugins = require('./plugins');
+var plugins = require('./plugins');
 
 (function(Notifications) {
 
@@ -197,17 +197,23 @@ var async = require('async'),
 	};
 
 	function pushToUids(uids, notification, callback) {
+		var oneWeekAgo = Date.now() - 604800000;
 		var unreadKeys = [];
 		var readKeys = [];
 
+		async.waterfall([
+			function (next) {
+				plugins.fireHook('filter:notification.push', {notification: notification, uids: uids}, next);
+			},
+			function (data, next) {
+				uids = data.uids;
+				notification = data.notification;
+
 				uids.forEach(function(uid) {
 					unreadKeys.push('uid:' + uid + ':notifications:unread');
 					readKeys.push('uid:' + uid + ':notifications:read');
 				});
 
-		var oneWeekAgo = Date.now() - 604800000;
-		async.series([
-			function(next) {
 				db.sortedSetsAdd(unreadKeys, notification.datetime, notification.nid, next);
 			},
 			function (next) {
@@ -218,14 +224,8 @@ var async = require('async'),
 			},
 			function (next) {
 				db.sortedSetsRemoveRangeByScore(readKeys, '-inf', oneWeekAgo, next);
-			}
+			},
-		], function(err) {
+			function (next) {
-			if (err) {
-				return callback(err);
-			}
-
-			plugins.fireHook('action:notification.pushed', {notification: notification, uids: uids});
-
 				var websockets = require('./socket.io');
 				if (websockets.server) {
 					uids.forEach(function(uid) {
@@ -233,8 +233,10 @@ var async = require('async'),
 					});
 				}
 
-			callback();
+				plugins.fireHook('action:notification.pushed', {notification: notification, uids: uids});
-		});
+				next();
+			}
+		], callback);
 	}
 
 	Notifications.pushGroup = function(notification, groupName, callback) {