From 4b3565884af62256b00feb6ccff1ee7365d22a1e Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Wed, 14 Feb 2018 20:57:15 -0200 Subject: [PATCH] Merge pull request #9720 from RocketChat/fix/quoting-integration-message-breaking [FIX] Messages can't be quoted sometimes --- .../rocketchat-integrations/server/processWebhookMessage.js | 2 +- packages/rocketchat-oembed/server/jumpToMessage.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-integrations/server/processWebhookMessage.js b/packages/rocketchat-integrations/server/processWebhookMessage.js index 993f1a9acb6d..91b3a85f55ab 100644 --- a/packages/rocketchat-integrations/server/processWebhookMessage.js +++ b/packages/rocketchat-integrations/server/processWebhookMessage.js @@ -50,7 +50,7 @@ this.processWebhookMessage = function(messageObj, user, defaultValues = { channe const message = { alias: messageObj.username || messageObj.alias || defaultValues.alias, msg: s.trim(messageObj.text || messageObj.msg || ''), - attachments: messageObj.attachments, + attachments: messageObj.attachments || [], parseUrls: messageObj.parseUrls !== undefined ? messageObj.parseUrls : !messageObj.attachments, bot: messageObj.bot, groupable: (messageObj.groupable !== undefined) ? messageObj.groupable : false diff --git a/packages/rocketchat-oembed/server/jumpToMessage.js b/packages/rocketchat-oembed/server/jumpToMessage.js index 366a4089ba67..c5c5b5c19506 100644 --- a/packages/rocketchat-oembed/server/jumpToMessage.js +++ b/packages/rocketchat-oembed/server/jumpToMessage.js @@ -5,7 +5,7 @@ import QueryString from 'querystring'; const recursiveRemove = (message, deep = 1) => { if (message) { - if ('attachments' in message && deep < RocketChat.settings.get('Message_QuoteChainLimit')) { + if ('attachments' in message && message.attachments !== null && deep < RocketChat.settings.get('Message_QuoteChainLimit')) { message.attachments.map((msg) => recursiveRemove(msg, deep + 1)); } else { delete(message.attachments);