Merge pull request #1964 from RocketChat/improvements/outgoing

Outgoing: Get the room from posted message to reply

packages/rocketchat-integrations/server/processWebhookMessage.js

@@ -46,12 +46,16 @@ this.processWebhookMessage = function(messageObj, user, defaultValues) {
 						username: channel
 					}
 				]
+			}) || {};
+			rid = [user._id, roomUser._id].sort().join('');
+			room = RocketChat.models.Rooms.findOne({
+				_id: {
+					$in: [rid, channel]
+				}
 			});
-			if (roomUser == null) {
+			if (roomUser == null && room == null) {
 				throw new Meteor.Error('invalid-channel');
 			}
-			rid = [user._id, roomUser._id].sort().join('');
-			room = RocketChat.models.Rooms.findOne(rid);
 			if (!room) {
 				Meteor.runAsUser(user._id, function() {
 					Meteor.call('createDirectMessage', roomUser.username);

packages/rocketchat-integrations/server/triggers.coffee

@@ -74,20 +74,17 @@ ExecuteTriggerUrl = (url, trigger, message, room, tries=0) ->
 				i: trigger._id
 
 			defaultValues =
-				channel: trigger.channel
 				alias: trigger.alias
 				avatar: trigger.avatar
 				emoji: trigger.emoji
 
-			try
-				message = processWebhookMessage result.data, user, defaultValues
+			if room.t is 'd'
+				defaultValues.channel = '@'+room._id
+			else
+				defaultValues.channel = '#'+room._id
 
-				if not message?
-					return RocketChat.API.v1.failure 'unknown-error'
+			message = processWebhookMessage result.data, user, defaultValues
 
-				return RocketChat.API.v1.success()
-			catch e
-				return RocketChat.API.v1.failure e.error
 
 ExecuteTrigger = (trigger, message, room) ->
 	for url in trigger.urls