don't parse URLs in body if an attachment was sent

RocketChat · Feb 22, 2016 · 5f10f70 · 5f10f70
1 parent 0e6c175
commit 5f10f70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,7 @@
 ## NEXT
 
 - Re authorize streams on reconnect
+- Don't automatically parse URLs in incoming webhooks message body if an attachment is also present
 
 ## 0.18.0, 2016-Feb-15
 

diff --git a/packages/rocketchat-integrations/server/processWebhookMessage.js b/packages/rocketchat-integrations/server/processWebhookMessage.js
@@ -71,7 +71,7 @@ this.processWebhookMessage = function(messageObj, user, defaultValues) {
 		alias: messageObj.username || messageObj.alias || defaultValues.alias,
 		msg: _.trim(messageObj.text || messageObj.msg || ''),
 		attachments: messageObj.attachments,
-		parseUrls: messageObj.parseUrls || true,
+		parseUrls: messageObj.parseUrls || !messageObj.attachments,
 		bot: messageObj.bot,
 		groupable: false
 	};