diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.html b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.html index 47414a49043..aade56c81bd 100644 --- a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.html +++ b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.html @@ -25,7 +25,6 @@ {{else}}
Nothing to show here.
{{/each}} - diff --git a/packages/rocketchat-livechat/server/hooks/sendToFacebook.js b/packages/rocketchat-livechat/server/hooks/sendToFacebook.js index 438a602964a..b31ee0e5486 100644 --- a/packages/rocketchat-livechat/server/hooks/sendToFacebook.js +++ b/packages/rocketchat-livechat/server/hooks/sendToFacebook.js @@ -1,13 +1,12 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { // skips this callback if the message was edited - // if (message.editedAt) { - // return message; - // } + if (message.editedAt) { + return message; + } - // TODO: check facebook integration - // if (!RocketChat.SMS.enabled) { - // return message; - // } + if (!RocketChat.settings.get('Livechat_Facebook_Enabled') || !RocketChat.settings.get('Livechat_Facebook_API_Key')) { + return message; + } // only send the sms by SMS if it is a livechat room with SMS set to true if (!(typeof room.t !== 'undefined' && room.t === 'l' && room.facebook && room.v && room.v.token)) { @@ -24,9 +23,9 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { return message; } - const result = HTTP.call('POST', 'http://localhost:3000/facebook/reply', { + HTTP.call('POST', 'https://omni.rocket.chat/facebook/reply', { headers: { - 'x-rocketchat-instance': RocketChat.settings.get('Livechat_Facebook_API_Key') + 'authorization': `Bearer ${ RocketChat.settings.get('Livechat_Facebook_API_Key') }` }, data: { page: room.facebook.page, @@ -35,8 +34,6 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { } }); - console.log('result ->', result); - return message; }, RocketChat.callbacks.priority.LOW, 'sendMessageToFacebook'); diff --git a/packages/rocketchat-livechat/server/methods/facebook.js b/packages/rocketchat-livechat/server/methods/facebook.js index 6ec48908b8c..45a3a805cd7 100644 --- a/packages/rocketchat-livechat/server/methods/facebook.js +++ b/packages/rocketchat-livechat/server/methods/facebook.js @@ -70,6 +70,7 @@ Meteor.methods({ if (e.response && e.response.data && e.response.data.error && e.response.data.error.message) { throw new Meteor.Error('integration-error', e.response.data.error.message); } + console.error('Error contacting omni.rocket.chat:', e); throw new Meteor.Error('integration-error', e.error); } }