@tiledesk/tiledesk-whatsapp-connector 0.1.70 → 0.1.72

package/index.js

@@ -583,7 +583,7 @@ router.post("/tiledesk/broadcast", async (req, res) => {
         tiledeskChannelMessage,
         whatsapp_receiver
       );
-      winston.info("customTiledeskJsonMessage: ", customTiledeskJsonMessage);
+      winston.verbose("customTiledeskJsonMessage: ", customTiledeskJsonMessage);
 
       let whatsappJsonMessage = await tlr.toWhatsapp(
         customTiledeskJsonMessage,
@@ -724,7 +724,7 @@ router.post("/tiledesk", async (req, res) => {
   var tiledeskChannelMessage = req.body.payload;
   winston.debug("(wab) tiledeskChannelMessage: ", tiledeskChannelMessage);
   var project_id = req.body.payload.id_project;
-
+  
   // get settings from mongo
   let CONTENT_KEY = "whatsapp-" + project_id;
   let settings = await db.get(CONTENT_KEY);
@@ -935,15 +935,15 @@ router.post("/webhook/:project_id", async (req, res) => {
   // Parse the request body from the POST
   let project_id = req.params.project_id;
   winston.verbose("(wab) Message received from WhatsApp");
-
+  
   // Check the Incoming webhook message
   // info on WhatsApp text message payload: https://developers.facebook.com/docs/whatsapp/cloud-api/webhooks/payload-examples#text-messages
   if (req.body.object) {
-
+    
     let CONTENT_KEY = "whatsapp-" + project_id;
     let settings = await db.get(CONTENT_KEY);
     winston.debug("(wab) settings: ", settings);
-
+    
     const tdClient = new TiledeskClient({
       projectId: project_id,
       token: settings.token,
@@ -966,6 +966,11 @@ router.post("/webhook/:project_id", async (req, res) => {
         winston.verbose("(wab) Skip system message");
         return res.sendStatus(200);
       }
+      
+      if (req.body.entry[0].id !== settings.business_account_id) {
+        winston.verbose("(wab) Skip message with waba that not belong to Tiledesk project id");
+        return res.sendStatus(200);
+      }
 
       let whatsappChannelMessage =
         req.body.entry[0].changes[0].value.messages[0];
@@ -1027,7 +1032,7 @@ router.post("/webhook/:project_id", async (req, res) => {
             lastname: " ",
           },
         };
-
+        
         let tiledeskJsonMessage;
 
         /*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-whatsapp-connector",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "description": "Tiledesk Whatsapp connector",
   "main": "index.js",
   "scripts": {

package/test/test_translate_whatsapp.js

@@ -96,10 +96,11 @@ describe('Test Translator\n', function() {
   it("Translates a message containing a DOCUMENT from Tiledesk to Whatsapp", function() {
 
     let tiledeskChannelMessage = {
-      text: 'Document Caption', // can be empty --> ""
+      text: '[fakedocument.pdf](https://fakedocumenturl.com/)\n' + 'Document Caption', // can be empty --> ""
       type: 'application',
       recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-wab-104777398965560-393484506627',
       metadata: {
+        downloadURL: 'https://fakedocumenturl.com/',
         src: 'https://fakedocumenturl.com/',
         name: "fakedocument.pdf",
         type: 'application/pdf'
@@ -119,7 +120,12 @@ describe('Test Translator\n', function() {
     assert(!whatsappJsonMessage.text);
     assert(whatsappJsonMessage.document);
     assert(whatsappJsonMessage.document.link === tiledeskChannelMessage.metadata.src);
-    assert(whatsappJsonMessage.document.caption === tiledeskChannelMessage.metadata.name);
+    assert(whatsappJsonMessage.document.filename === tiledeskChannelMessage.metadata.name);
+    let index = tiledeskChannelMessage.text.indexOf(tiledeskChannelMessage.metadata.src);
+    if (index != -1) {
+      let length = tiledeskChannelMessage.metadata.src.length;
+      assert(whatsappJsonMessage.document.caption === tiledeskChannelMessage.text.substring(index + length + 2));
+    }
     if (log) {
       console.log("(test) whatsappJsonMessage: ", whatsappJsonMessage);
     }
@@ -319,6 +325,7 @@ describe('Test Translator\n', function() {
     assert(tlr != null);
     const tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, fullname, null)
     assert(tiledeskJsonMessage != null);
+    console.log("(test) tiledeskJsonMessage: ", tiledeskJsonMessage);
     assert(tiledeskJsonMessage.channel.name === TiledeskWhatsappTranslator.CHANNEL_NAME);
     assert(tiledeskJsonMessage.text === ' ');
     assert(tiledeskJsonMessage.type === 'text');

package/tiledesk/TiledeskWhatsappTranslator.js

@@ -89,12 +89,21 @@ const path = require('path');
       }
 
       else if (tiledeskChannelMessage.metadata.type.startsWith('application')) {
-        var doc = tiledeskChannelMessage.metadata.src;
+        //var doc = tiledeskChannelMessage.metadata.src;
+        var doc = tiledeskChannelMessage.metadata.downloadURL;
         whatsapp_message.type = 'document'
         whatsapp_message.document = {
           link: doc,
-          caption: tiledeskChannelMessage.metadata.name || tiledeskChannelMessage.text
+          filename: tiledeskChannelMessage.metadata.name,
+        }
+        
+        let index = tiledeskChannelMessage.text.indexOf(tiledeskChannelMessage.metadata.src);
+        if (index != -1) {
+          let length = tiledeskChannelMessage.metadata.src.length;
+          let caption = tiledeskChannelMessage.text.substring(index + length + 2);
+          whatsapp_message.document.caption = caption;
         }
+        
       }
 
       else {