Merge remote-tracking branch 'refs/remotes/origin/master' into group-chat

src/socket.io/helpers.js

@@ -69,7 +69,9 @@ SocketHelpers.sendNotificationToPostOwner = function(pid, fromuid, notification)
 				bodyLong: results.postObj.content,
 				pid: pid,
 				nid: 'post:' + pid + ':uid:' + fromuid,
-				from: fromuid
+				from: fromuid,
+				mergeId: notification + '|' + postData.tid,
+				topicTitle: results.topicTitle
 			}, function(err, notification) {
 				if (!err && notification) {
 					notifications.push(notification, [postData.uid]);

src/socket.io/posts/flag.js

@@ -84,7 +84,9 @@ module.exports = function(SocketPosts) {
 					bodyLong: post.content,
 					pid: data.pid,
 					nid: 'post_flag:' + data.pid + ':uid:' + socket.uid,
-					from: socket.uid
+					from: socket.uid,
+					mergeId: 'notifications:user_flagged_post_in|' + data.pid,
+					topicTitle: post.topic.title
 				}, function(err, notification) {
 					if (err || !notification) {
 						return next(err);

src/socket.io/user.js

@@ -142,7 +142,8 @@ SocketUser.follow = function(socket, data, callback) {
 				bodyShort: '[[notifications:user_started_following_you, ' + userData.username + ']]',
 				nid: 'follow:' + data.uid + ':uid:' + socket.uid,
 				from: socket.uid,
-				path: '/user/' + userData.userslug
+				path: '/user/' + userData.userslug,
+				mergeId: 'notifications:user_started_following_you'
 			}, next);
 		},
 		function(notification, next) {