From c266fe998391ea130a34d36696d3891b73718019 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 27 Apr 2016 13:08:32 +0300
Subject: [PATCH] closes #4540

---
 src/notifications.js | 76 +++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/src/notifications.js b/src/notifications.js
index 94cb5313b8..ebf2d20585 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -1,17 +1,17 @@
 'use strict';
 
-var async = require('async'),
-	winston = require('winston'),
-	cron = require('cron').CronJob,
-	nconf = require('nconf'),
-	S = require('string'),
-	_ = require('underscore'),
-
-	db = require('./database'),
-	User = require('./user'),
-	groups = require('./groups'),
-	meta = require('./meta'),
-	plugins = require('./plugins');
+var async = require('async');
+var winston = require('winston');
+var cron = require('cron').CronJob;
+var nconf = require('nconf');
+var S = require('string');
+var _ = require('underscore');
+
+var db = require('./database');
+var User = require('./user');
+var groups = require('./groups');
+var meta = require('./meta');
+var plugins = require('./plugins');
 
 (function(Notifications) {
 
@@ -197,44 +197,46 @@ var async = require('async'),
 	};
 
 	function pushToUids(uids, notification, callback) {
+		var oneWeekAgo = Date.now() - 604800000;
 		var unreadKeys = [];
 		var readKeys = [];
 
-		uids.forEach(function(uid) {
-			unreadKeys.push('uid:' + uid + ':notifications:unread');
-			readKeys.push('uid:' + uid + ':notifications:read');
-		});
+		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) {
+			function (next) {
 				db.sortedSetsRemove(readKeys, notification.nid, next);
 			},
-			function(next) {
+			function (next) {
 				db.sortedSetsRemoveRangeByScore(unreadKeys, '-inf', oneWeekAgo, next);
 			},
-			function(next) {
+			function (next) {
 				db.sortedSetsRemoveRangeByScore(readKeys, '-inf', oneWeekAgo, next);
-			}
-		], function(err) {
-			if (err) {
-				return callback(err);
-			}
-
-			plugins.fireHook('action:notification.pushed', {notification: notification, uids: uids});
+			},
+			function (next) {
+				var websockets = require('./socket.io');
+				if (websockets.server) {
+					uids.forEach(function(uid) {
+						websockets.in('uid_' + uid).emit('event:new_notification', notification);
+					});
+				}
 
-			var websockets = require('./socket.io');
-			if (websockets.server) {
-				uids.forEach(function(uid) {
-					websockets.in('uid_' + uid).emit('event:new_notification', notification);
-				});
+				plugins.fireHook('action:notification.pushed', {notification: notification, uids: uids});
+				next();
 			}
-
-			callback();
-		});
+		], callback);
 	}
 
 	Notifications.pushGroup = function(notification, groupName, callback) {