From c5723da83f6651b98359ffa6172e3eca02afd013 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Fri, 9 Jun 2017 13:40:04 -0300 Subject: [PATCH] Merge pull request #7208 from RocketChat/fix-oembed-previews-not-showing [FIX] Fix oembed previews not being shown --- packages/rocketchat-ui-message/client/message.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js index bf7675a7f515..6925a48df807 100644 --- a/packages/rocketchat-ui-message/client/message.js +++ b/packages/rocketchat-ui-message/client/message.js @@ -193,10 +193,13 @@ Template.message.helpers({ } }, hasOembed() { - if (!(this.urls && this.urls.length > 0 && Template.oembedBaseWidget != null && RocketChat.settings.get('API_Embed'))) { + // there is no URLs, there is no template to show the oembed (oembed package removed) or oembed is not enable + if (!(this.urls && this.urls.length > 0) || !Template.oembedBaseWidget || !RocketChat.settings.get('API_Embed')) { return false; } - if (!(RocketChat.settings.get('API_EmbedDisabledFor')||'').split(',').map(username => username.trim()).includes(this.u && this.u.username)) { + + // check if oembed is disabled for message's sender + if ((RocketChat.settings.get('API_EmbedDisabledFor')||'').split(',').map(username => username.trim()).includes(this.u && this.u.username)) { return false; } return true;