Merge pull request #3966 from RocketChat/hotfix/selfmade-notifications

Prevent selfmade notifications

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

@@ -43,13 +43,17 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 				if (!toAll && mention._id === 'all') {
 					toAll = true;
 				}
-				mentionIds.push(mention._id);
+				if (mention._id !== message.u._id) {
+					mentionIds.push(mention._id);
+				}
 			});
 		}
 
 		highlights.forEach(function(user) {
 			if (user && user.settings && user.settings.preferences && messageContainsHighlight(message, user.settings.preferences.highlights)) {
-				highlightsIds.push(user._id);
+				if (user._id !== message.u._id) {
+					highlightsIds.push(user._id);
+				}
 			}
 		});
 

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

@@ -266,8 +266,8 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 			userIdsToPushNotify = userIdsToPushNotify.concat(highlightsIds);
 		}
 
-		userIdsToNotify = _.compact(_.unique(userIdsToNotify));
-		userIdsToPushNotify = _.compact(_.unique(userIdsToPushNotify));
+		userIdsToNotify = _.without(_.compact(_.unique(userIdsToNotify)), message.u._id);
+		userIdsToPushNotify = _.without(_.compact(_.unique(userIdsToPushNotify)), message.u._id);
 
 		if (userIdsToNotify.length > 0) {
 			for (j = 0, len1 = userIdsToNotify.length; j < len1; j++) {

packages/rocketchat-oembed/.npm/package/npm-shrinkwrap.json

 {
   "dependencies": {
+    "he": {
+      "version": "1.1.0"
+    },
     "iconv-lite": {
       "version": "0.4.13"
     },