Optimize query - Highlight words

packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js

@@ -32,7 +32,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 		mentionIds = [];
 		highlightsIds = [];
 		toAll = false;
-		highlights = RocketChat.models.Users.find({}, { fields: { '_id': 1, 'settings.preferences.highlights': 1 }}).fetch();
+		highlights = RocketChat.models.Users.findUsersByUsernames(room.usernames, { fields: { '_id': 1, 'settings.preferences.highlights': 1 }}).fetch();
 
 		if (message.mentions != null) {
 			message.mentions.forEach(function(mention) {

packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js

@@ -74,7 +74,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 	userIdsToNotify = [];
 	userIdsToPushNotify = [];
 	usersWithHighlights = [];
-	highlights = RocketChat.models.Users.find({}, { fields: { '_id': 1, 'settings.preferences.highlights': 1 }}).fetch();
+	highlights = RocketChat.models.Users.findUsersByUsernames(room.usernames, { fields: { '_id': 1, 'settings.preferences.highlights': 1 }}).fetch();
 
 	highlights.forEach(function (user) {
 		if (user && user.settings && user.settings.preferences && messageContainsHighlight(message, user.settings.preferences.highlights)) {

packages/rocketchat-lib/server/models/Users.coffee

@@ -131,6 +131,13 @@ RocketChat.models.Users = new class extends RocketChat.models._Base
 
 		return @find(query, options)?.fetch?()?[0]?.lastLogin
 
+	findUsersByUsernames: (usernames, options) ->
+		query =
+			username:
+				$in: usernames
+
+		return @find query, options
+
 	# UPDATE
 	updateLastLoginById: (_id) ->
 		update =