@tiledesk/tiledesk-whatsapp-connector 0.1.69 → 0.1.71

package/index.js

@@ -776,9 +776,7 @@ router.post("/tiledesk", async (req, res) => {
   }
 
   if (!phone_number_id) {
-    return res
-      .status(400)
-      .send({ success: false, message: "Phone number id undefined" });
+    return res.status(400).send({ success: false, message: "Phone number id undefined" });
   }
 
   /*
@@ -863,17 +861,13 @@ router.post("/tiledesk", async (req, res) => {
           twClient
             .sendMessage(phone_number_id, whatsappJsonMessage)
             .then((response) => {
-              winston.verbose(
-                "(wab) Message sent to WhatsApp! " +
-                response.status +
-                " " +
-                response.statusText
-              );
+              winston.verbose("(wab) Message sent to WhatsApp! " + response.status + " " + response.statusText);
               i += 1;
               if (i < commands.length) {
                 execute(commands[i]);
               } else {
                 winston.debug("(wab) End of commands");
+                return res.sendStatus(200);
               }
             })
             .catch((err) => {
@@ -892,6 +886,7 @@ router.post("/tiledesk", async (req, res) => {
             execute(commands[i]);
           } else {
             winston.debug("(wab) End of commands");
+            return res.sendStatus(200);
           }
         }, command.time);
       }
@@ -916,35 +911,22 @@ router.post("/tiledesk", async (req, res) => {
       twClient
         .sendMessage(phone_number_id, whatsappJsonMessage)
         .then((response) => {
-          winston.verbose(
-            "(wab) Message sent to WhatsApp! " +
-            response.status +
-            " " +
-            response.statusText
-          );
+          winston.verbose("(wab) Message sent to WhatsApp! " + response.status + " " + response.statusText);
+          return res.sendStatus(200);
         })
         .catch((err) => {
           winston.error("(wab) error send message: ", err);
-          return res
-            .status(400)
-            .send({ success: false, error: "Template not existing" });
+          return res.status(400).send({ success: false, error: "Template not existing" });
         });
     } else {
       winston.error("(wab) Whatsapp Json Message is undefined!");
-      return res
-        .status(400)
-        .send({
-          success: false,
-          error: "An error occurred during message translation",
-        });
+      return res.status(400).send({ success: false, error: "An error occurred during message translation" });
     }
   } else {
     winston.debug("(wab) no command, no text --> skip");
-    return res.sendStatus(400).send({ success: false, error: "No command or text specified. Skip message."});
+    return res.sendStatus(400).send({ success: false, error: "No command or text specified. Skip message." });
   }
   
-  return res.sendStatus(200);
-
 });
 
 // Endpoint for Whatsapp Business

package/package.json

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

package/tiledesk/TemplateManager.js

@@ -115,7 +115,7 @@ class TemplateManager {
           header_params.push({ type: header_component.format, location: { latitude: null, longitude: null, name: null, address: null } })
         }
         else {
-          console.log("(Template Manager) Unrecognized Header: ", header_component)
+          winston.verbose("(Template Manager) Unrecognized Header: ", header_component)
         }
 
       }

package/tiledesk/TiledeskChannel.js

@@ -81,7 +81,6 @@ class TiledeskChannel {
     }
 
     var customToken = jwt.sign(payload, this.settings.secret);
-    console.log("\n\ncustomToken: ", customToken)
 
     return await axios({
       url: this.API_URL + "/auth/signinWithCustomToken",

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 {
@@ -261,7 +270,6 @@ const path = require('path');
         }
         else if (tiledeskChannelMessage.attributes.attachment.template) {
           winston.debug("(wab) [Translator] template: ", tiledeskChannelMessage.attributes.attachment.template)
-          console.log("(wab) [Translator] template: ", tiledeskChannelMessage.attributes.attachment.template)
 
           let template = tiledeskChannelMessage.attributes.attachment.template;
 
@@ -457,18 +465,19 @@ const path = require('path');
 
     // interactive message
     else if (whatsappChannelMessage.type == 'interactive') {
-
+      
       // list reply
       if (whatsappChannelMessage.interactive.type == 'list_reply') {
         // action button
         if (whatsappChannelMessage.interactive.list_reply.id.startsWith("action")) {
           var tiledeskMessage = {
             senderFullname: from,
-            text: ' ',
+            //text: ' ',
+            text: whatsappChannelMessage.interactive.list_reply.title,
             type: 'text',
             attributes: {
               action: whatsappChannelMessage.interactive.list_reply.id.substring(11),
-              subtype: 'info'
+              //subtype: 'info'
             },
             channel: { name: TiledeskWhatsappTranslator.CHANNEL_NAME }
           }
@@ -477,7 +486,7 @@ const path = require('path');
         // quick reply button
         if (whatsappChannelMessage.interactive.list_reply.id.startsWith("quick")) {
           var tiledeskMessage = {
-            text: whatsappChannelMessage.interactive.list_reply.id.substring(10),
+            text: whatsappChannelMessage.interactive.list_reply.title,
             senderFullname: from,
             channel: { name: TiledeskWhatsappTranslator.CHANNEL_NAME }
           }
@@ -491,11 +500,12 @@ const path = require('path');
         if (whatsappChannelMessage.interactive.button_reply.id.startsWith("action")) {
           var tiledeskMessage = {
             senderFullname: from,
-            text: ' ',
+            //text: ' ',
+            text: whatsappChannelMessage.interactive.button_reply.title,
             type: 'text',
             attributes: {
               action: whatsappChannelMessage.interactive.button_reply.id.substring(11),
-              subtype: 'info'
+              //subtype: 'info'
             },
             channel: { name: TiledeskWhatsappTranslator.CHANNEL_NAME }
           }
@@ -504,7 +514,8 @@ const path = require('path');
         // quick reply button
         if (whatsappChannelMessage.interactive.button_reply.id.startsWith("quick")) {
           var tiledeskMessage = {
-            text: whatsappChannelMessage.interactive.button_reply.id.substring(10),
+            //text: whatsappChannelMessage.interactive.button_reply.id.substring(10),
+            text: whatsappChannelMessage.interactive.button_reply.title,
             senderFullname: from,
             channel: { name: TiledeskWhatsappTranslator.CHANNEL_NAME }
           }

package/tiledesk/WhatsappLogger.js

@@ -13,8 +13,6 @@ class WhatsappLogger {
     let status_code = this.getCodeFromStatus(status);
     winston.debug("(wab) getCodeFromStatus result " + status_code);
     
-    console.log("message_id: ", message_id)
-
     MessageLog.findOneAndUpdate({ message_id: message_id }, { $set: {status: status, status_code: status_code, error: error }}, { new: true }).then((messageLog) => {
 
       if (messageLog) {