When a manager tried to send a message in a live room, an error was b…

…eing displayed because there is no subscription for the manager. (#10663) [FIX] Livechat managers were not being able to send messages in some cases
RocketChat · May 18, 2018 · 1070edf · 1070edf
1 parent 986cde3
commit 1070edf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
@@ -306,7 +306,7 @@ Meteor.startup(function() {
 		condition(message) {
 			const subscription = RocketChat.models.Subscriptions.findOne({rid: message.rid});
 
-			return Meteor.userId() !== message.u._id && !(subscription.ignored && subscription.ignored.indexOf(message.u._id) > -1);
+			return Meteor.userId() !== message.u._id && !(subscription && subscription.ignored && subscription.ignored.indexOf(message.u._id) > -1);
 		},
 		order: 20,
 		group: 'menu'
@@ -324,7 +324,7 @@ Meteor.startup(function() {
 		},
 		condition(message) {
 			const subscription = RocketChat.models.Subscriptions.findOne({rid: message.rid});
-			return Meteor.userId() !== message.u._id && subscription.ignored && subscription.ignored.indexOf(message.u._id) > -1;
+			return Meteor.userId() !== message.u._id && subscription && subscription.ignored && subscription.ignored.indexOf(message.u._id) > -1;
 		},
 		order: 20,
 		group: 'menu'