delayed notification test

src/messaging/notifications.js

@@ -14,17 +14,20 @@ module.exports = function (Messaging) {
 
 	Messaging.notifyQueue = {};	// Only used to notify a user of a new chat message, see Messaging.notifyUser
 
-	Messaging.notifyUsersInRoom = function (fromUid, roomId, messageObj) {
+	Messaging.notificationSendDelay = 1000 * 60;
-		Messaging.getUidsInRoom(roomId, 0, -1, function (err, uids) {
-			if (err) {
-				return;
-			}
 
+	Messaging.notifyUsersInRoom = function (fromUid, roomId, messageObj) {
+		async.waterfall([
+			function (next) {
+				Messaging.getUidsInRoom(roomId, 0, -1, next);
+			},
+			function (uids, next) {
 				var data = {
 					roomId: roomId,
 					fromUid: fromUid,
 					message: messageObj
 				};
+
 				uids.forEach(function (uid) {
 					data.self = parseInt(uid, 10) === parseInt(fromUid) ? 1 : 0;
 					Messaging.pushUnreadCount(uid);
@@ -43,27 +46,25 @@ module.exports = function (Messaging) {
 				}
 
 				queueObj.timeout = setTimeout(function () {
-				sendNotifications(fromUid, uids, roomId, queueObj.message, function (err) {
+					sendNotifications(fromUid, uids, roomId, queueObj.message);
-					if (!err) {
+				}, Messaging.notificationSendDelay);
-						delete Messaging.notifyQueue[fromUid + ':' + roomId];
+				next();
 			}
-				});
+		]);
-			}, 1000 * 60); // wait 60s before sending
-		});
 	};
 
-	function sendNotifications(fromuid, uids, roomId, messageObj, callback) {
+	function sendNotifications(fromuid, uids, roomId, messageObj) {
-		user.isOnline(uids, function (err, isOnline) {
+		async.waterfall([
-			if (err) {
+			function (next) {
-				return callback(err);
+				user.isOnline(uids, next);
-			}
+			},
-
+			function (isOnline, next) {
 				uids = uids.filter(function (uid, index) {
 					return !isOnline[index] && parseInt(fromuid, 10) !== parseInt(uid, 10);
 				});
 
 				if (!uids.length) {
-				return callback();
+					return;
 				}
 
 				notifications.create({
@@ -72,13 +73,16 @@ module.exports = function (Messaging) {
 					nid: 'chat_' + fromuid + '_' + roomId,
 					from: fromuid,
 					path: '/chats/' + messageObj.roomId
-			}, function (err, notification) {
+				}, next);
-				if (!err && notification) {
+			}
-					notifications.push(notification, uids, callback);
+		], function (err, notification) {
+			if (!err) {
+				delete Messaging.notifyQueue[fromuid + ':' + roomId];
+				if (notification) {
+					notifications.push(notification, uids);
 				}
-			});
-
 				sendNotificationEmails(uids, messageObj);
+			}
 		});
 	}
 
@@ -87,6 +91,8 @@ module.exports = function (Messaging) {
 			return;
 		}
 
+		async.waterfall([
+			function (next) {
 				async.parallel({
 					userData: function (next) {
 						user.getUsersFields(uids, ['uid', 'username', 'userslug'], next);
@@ -94,15 +100,12 @@ module.exports = function (Messaging) {
 					userSettings: function (next) {
 						user.getMultipleUserSettings(uids, next);
 					}
-		}, function (err, results) {
+				}, next);
-			if (err) {
+			},
-				return winston.error(err);
+			function (results, next) {
-			}
-
 				results.userData = results.userData.filter(function (userData, index) {
 					return userData && results.userSettings[index] && results.userSettings[index].sendChatNotifications;
 				});
-
 				async.each(results.userData, function (userData, next) {
 					emailer.send('notif_chat', userData.uid, {
 						subject: '[[email:notif.chat.subject, ' + messageObj.fromUser.username + ']]',
@@ -114,11 +117,12 @@ module.exports = function (Messaging) {
 						username: userData.username,
 						userslug: userData.userslug
 					}, next);
-			}, function (err) {
+				}, next);
+			}
+		], function (err) {
 			if (err) {
-					winston.error(err);
+				return winston.error(err);
 			}
 		});
-		});
 	}
 };

test/messaging.js

@@ -121,6 +121,28 @@ describe('Messaging Library', function () {
 			});
 		});
 
+		it('should notify offline users of message', function (done) {
+			Messaging.notificationSendDelay = 100;
+
+			db.sortedSetAdd('users:online', Date.now() - 350000, herpUid, function (err) {
+				assert.ifError(err);
+				socketModules.chats.send({uid: fooUid}, {roomId: roomId, message: 'second chat message'}, function (err) {
+					assert.ifError(err);
+					setTimeout(function () {
+						User.notifications.get(herpUid, function (err, data) {
+							assert.ifError(err);
+							assert(data.unread[0]);
+							var notification = data.unread[0];
+							assert.equal(notification.bodyShort, '[[notifications:new_message_from, foo]]');
+							assert.equal(notification.nid, 'chat_' + fooUid + '_' + roomId);
+							assert.equal(notification.path, '/chats/' + roomId);
+							done();
+						});
+					}, 1500);
+				});
+			});
+		});
+
 		it('should get messages from room', function (done) {
 			socketModules.chats.getMessages({uid: fooUid}, {
 				uid: fooUid,