Increase unread message on @here mention

RocketChat · May 23, 2017 · 099e3db · 099e3db
1 parent 362ac8e
commit 099e3db
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js b/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js
@@ -44,6 +44,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 		RocketChat.models.Subscriptions.incUnreadOfDirectForRoomIdExcludingUserId(message.rid, message.u._id, 1);
 	} else {
 		let toAll = false;
+		let toHere = false;
 		const mentionIds = [];
 		const highlightsIds = [];
 		const highlights = RocketChat.models.Users.findUsersByUsernamesWithHighlights(room.usernames, { fields: { '_id': 1, 'settings.preferences.highlights': 1 }}).fetch();
@@ -53,6 +54,9 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 				if (!toAll && mention._id === 'all') {
 					toAll = true;
 				}
+				if (!toHere && mention._id === 'here') {
+					toHere = true;
+				}
 				if (mention._id !== message.u._id) {
 					mentionIds.push(mention._id);
 				}
@@ -67,7 +71,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 			}
 		});
 
-		if (toAll) {
+		if (toAll || toHere) {
 			RocketChat.models.Subscriptions.incUnreadForRoomIdExcludingUserId(room._id, message.u._id);
 		} else if ((mentionIds && mentionIds.length > 0) || (highlightsIds && highlightsIds.length > 0)) {
 			RocketChat.models.Subscriptions.incUnreadForRoomIdAndUserIds(room._id, _.compact(_.unique(mentionIds.concat(highlightsIds))));