From 0a379ca423a3d707cb61854e324dcdd11ef97262 Mon Sep 17 00:00:00 2001 From: Bradley Hilton Date: Fri, 9 Jun 2017 16:18:21 -0500 Subject: [PATCH] Allow channel property in the integrations returned content --- packages/rocketchat-integrations/server/lib/triggerHandler.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-integrations/server/lib/triggerHandler.js b/packages/rocketchat-integrations/server/lib/triggerHandler.js index a06a8f4bdaa5..5012c42e6436 100644 --- a/packages/rocketchat-integrations/server/lib/triggerHandler.js +++ b/packages/rocketchat-integrations/server/lib/triggerHandler.js @@ -165,8 +165,8 @@ RocketChat.integrations.triggerHandler = new class RocketChatIntegrationHandler } let tmpRoom; - if (nameOrId || trigger.targetRoom) { - tmpRoom = RocketChat.getRoomByNameOrIdWithOptionToJoin({ currentUserId: user._id, nameOrId: nameOrId || trigger.targetRoom, errorOnEmpty: false }) || room; + if (nameOrId || trigger.targetRoom || message.channel) { + tmpRoom = RocketChat.getRoomByNameOrIdWithOptionToJoin({ currentUserId: user._id, nameOrId: nameOrId || message.channel || trigger.targetRoom, errorOnEmpty: false }) || room; } else { tmpRoom = room; }