From 1070edfe29e8f9405083d5417251d32d1c6a53c0 Mon Sep 17 00:00:00 2001 From: Renato Becker Date: Fri, 18 May 2018 19:52:16 -0300 Subject: [PATCH] When a manager tried to send a message in a live room, an error was being displayed because there is no subscription for the manager. (#10663) [FIX] Livechat managers were not being able to send messages in some cases --- packages/rocketchat-lib/client/MessageAction.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index b61ec1d06850..8038c7d92f5c 100644 --- 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'