delayed notification test

src/messaging/notifications.js

@@ -14,71 +14,75 @@ 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;
-			}
-
-			var data = {
-				roomId: roomId,
-				fromUid: fromUid,
-				message: messageObj
-			};
-			uids.forEach(function (uid) {
-				data.self = parseInt(uid, 10) === parseInt(fromUid) ? 1 : 0;
-				Messaging.pushUnreadCount(uid);
-				sockets.in('uid_' + uid).emit('event:chats.receive', data);
-			});
 
-			// Delayed notifications
+	Messaging.notifyUsersInRoom = function (fromUid, roomId, messageObj) {
-			var queueObj = Messaging.notifyQueue[fromUid + ':' + roomId];
+		async.waterfall([
-			if (queueObj) {
+			function (next) {
-				queueObj.message.content += '\n' + messageObj.content;
+				Messaging.getUidsInRoom(roomId, 0, -1, next);
-				clearTimeout(queueObj.timeout);
+			},
-			} else {
+			function (uids, next) {
-				queueObj = Messaging.notifyQueue[fromUid + ':' + roomId] = {
+				var data = {
+					roomId: roomId,
+					fromUid: fromUid,
 					message: messageObj
 				};
-			}
 
-			queueObj.timeout = setTimeout(function () {
+				uids.forEach(function (uid) {
-				sendNotifications(fromUid, uids, roomId, queueObj.message, function (err) {
+					data.self = parseInt(uid, 10) === parseInt(fromUid) ? 1 : 0;
-					if (!err) {
+					Messaging.pushUnreadCount(uid);
-						delete Messaging.notifyQueue[fromUid + ':' + roomId];
+					sockets.in('uid_' + uid).emit('event:chats.receive', data);
-					}
 				});
-			}, 1000 * 60); // wait 60s before sending
-		});
-	};
 
-	function sendNotifications(fromuid, uids, roomId, messageObj, callback) {
+				// Delayed notifications
-		user.isOnline(uids, function (err, isOnline) {
+				var queueObj = Messaging.notifyQueue[fromUid + ':' + roomId];
-			if (err) {
+				if (queueObj) {
-				return callback(err);
+					queueObj.message.content += '\n' + messageObj.content;
-			}
+					clearTimeout(queueObj.timeout);
-
+				} else {
-			uids = uids.filter(function (uid, index) {
+					queueObj = Messaging.notifyQueue[fromUid + ':' + roomId] = {
-				return !isOnline[index] && parseInt(fromuid, 10) !== parseInt(uid, 10);
+						message: messageObj
-			});
+					};
+				}
 
-			if (!uids.length) {
+				queueObj.timeout = setTimeout(function () {
-				return callback();
+					sendNotifications(fromUid, uids, roomId, queueObj.message);
+				}, Messaging.notificationSendDelay);
+				next();
 			}
+		]);
+	};
 
-			notifications.create({
+	function sendNotifications(fromuid, uids, roomId, messageObj) {
-				bodyShort: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]',
+		async.waterfall([
-				bodyLong: messageObj.content,
+			function (next) {
-				nid: 'chat_' + fromuid + '_' + roomId,
+				user.isOnline(uids, next);
-				from: fromuid,
+			},
-				path: '/chats/' + messageObj.roomId
+			function (isOnline, next) {
-			}, function (err, notification) {
+				uids = uids.filter(function (uid, index) {
-				if (!err && notification) {
+					return !isOnline[index] && parseInt(fromuid, 10) !== parseInt(uid, 10);
-					notifications.push(notification, uids, callback);
+				});
+
+				if (!uids.length) {
+					return;
 				}
-			});
 
-			sendNotificationEmails(uids, messageObj);
+				notifications.create({
+					bodyShort: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]',
+					bodyLong: messageObj.content,
+					nid: 'chat_' + fromuid + '_' + roomId,
+					from: fromuid,
+					path: '/chats/' + messageObj.roomId
+				}, next);
+			}
+		], function (err, notification) {
+			if (!err) {
+				delete Messaging.notifyQueue[fromuid + ':' + roomId];
+				if (notification) {
+					notifications.push(notification, uids);
+				}
+				sendNotificationEmails(uids, messageObj);
+			}
 		});
 	}
 
@@ -87,38 +91,38 @@ module.exports = function (Messaging) {
 			return;
 		}
 
-		async.parallel({
+		async.waterfall([
-			userData: function (next) {
+			function (next) {
-				user.getUsersFields(uids, ['uid', 'username', 'userslug'], next);
+				async.parallel({
+					userData: function (next) {
+						user.getUsersFields(uids, ['uid', 'username', 'userslug'], next);
+					},
+					userSettings: function (next) {
+						user.getMultipleUserSettings(uids, next);
+					}
+				}, next);
 			},
-			userSettings: function (next) {
+			function (results, next) {
-				user.getMultipleUserSettings(uids, 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 + ']]',
+						summary: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]',
+						message: messageObj,
+						site_title: meta.config.title || 'NodeBB',
+						url: nconf.get('url'),
+						roomId: messageObj.roomId,
+						username: userData.username,
+						userslug: userData.userslug
+					}, next);
+				}, next);
 			}
-		}, function (err, results) {
+		], function (err) {
 			if (err) {
 				return winston.error(err);
 			}
-
-			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 + ']]',
-					summary: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]',
-					message: messageObj,
-					site_title: meta.config.title || 'NodeBB',
-					url: nconf.get('url'),
-					roomId: messageObj.roomId,
-					username: userData.username,
-					userslug: userData.userslug
-				}, next);
-			}, function (err) {
-				if (err) {
-					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,