@tiledesk/tiledesk-whatsapp-connector 0.1.12 → 0.1.14

package/index.js

@@ -343,7 +343,7 @@ router.post('/tiledesk', async (req, res) => {
 
   const tlr = new TiledeskWhatsappTranslator();
 
-  const whatsappJsonMessage = tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
+  let whatsappJsonMessage = await tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
   console.log("whatsappJsonMessage: ", whatsappJsonMessage);
 
   if (whatsappJsonMessage) {

package/package.json

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

package/test/test_translate_whatsapp.js

@@ -39,6 +39,7 @@ describe('Test Translator\n', function() {
       recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-wab-104777398965560-393484506627',
       metadata: {
         src: 'https://fakeimageurl.com/',
+        type: 'image/png'
       },
       attributes: {
         userFullname: 'John Doe'
@@ -69,7 +70,8 @@ describe('Test Translator\n', function() {
       type: 'video',
       recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-wab-104777398965560-393484506627',
       metadata: {
-        src: 'https://fakevideourl.com/'
+        src: 'https://fakevideourl.com/',
+        type: 'video/mp4'
       },
       attributes: {
         userFullname: 'John Doe'
@@ -100,7 +102,9 @@ describe('Test Translator\n', function() {
       type: 'application',
       recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-wab-104777398965560-393484506627',
       metadata: {
-        src: 'https://fakedocumenturl.com/'
+        src: 'https://fakedocumenturl.com/',
+        name: "Document name",
+        type: 'application/pdf'
       },
       attributes: {
         userFullname: 'John Doe'
@@ -117,7 +121,7 @@ describe('Test Translator\n', function() {
     assert(!whatsappJsonMessage.text);
     assert(whatsappJsonMessage.document);
     assert(whatsappJsonMessage.document.link === tiledeskChannelMessage.metadata.src);
-    assert(whatsappJsonMessage.document.caption === tiledeskChannelMessage.text);
+    assert(whatsappJsonMessage.document.caption === tiledeskChannelMessage.metadata.name);
     if (log) {
       console.log("(test) whatsappJsonMessage: ", whatsappJsonMessage);
     }

package/tiledesk/TiledeskWhatsapp.js

@@ -33,7 +33,7 @@ class TiledeskWhatsapp {
     // this.media = config.channelMedia;
     this.token = config.token;
     this.GRAPH_URL = config.GRAPH_URL
-    
+
     this.log = false;
     if (config.log) {
       this.log = config.log;
@@ -42,11 +42,11 @@ class TiledeskWhatsapp {
 
   async sendMessage(phone_number_id, message) {
     if (this.log) {
-      console.log("[Tiledesk Whatsapp] Sending message...", message);  
+      console.log("[Tiledesk Whatsapp] Sending message...", message);
     } else {
-      console.log("[Tiledesk Whatsapp] Sending message...");  
+      console.log("[Tiledesk Whatsapp] Sending message...");
     }
-    
+
     return await axios({
       url: this.GRAPH_URL + phone_number_id + "/messages?access_token=" + this.token,
       headers: {
@@ -65,7 +65,7 @@ class TiledeskWhatsapp {
 
   async downloadMedia(mediaId) {
     if (this.log) {
-      console.log("[Tiledesk Whatsapp] Download media with id: ", mediaId);  
+      console.log("[Tiledesk Whatsapp] Download media with id: ", mediaId);
     }
 
     return await axios({
@@ -75,7 +75,7 @@ class TiledeskWhatsapp {
         'Authorization': "Bearer " + this.token
       }
     }).then(async (response) => {
-      console.log("response 1: ", response.data)
+      console.log("response: ", response.data)
 
       let download_url = response.data.url;
       let mime_type = response.data.mime_type;
@@ -85,7 +85,7 @@ class TiledeskWhatsapp {
 
       let example_path = path.join(__dirname, '..', 'tmp', type);
       console.log("read file: ", example_path)
-            
+
       const writeStream = fs.createWriteStream(example_path);
       console.log("[Tiledesk Whatsapp] Downloading file...");
 
@@ -98,7 +98,6 @@ class TiledeskWhatsapp {
         responseType: 'stream'
       }).then((response) => {
 
-        console.log("response 2: ", response.data)
         return new Promise((resolve, reject) => {
           response.data.pipe(writeStream);
           let error = null;
@@ -116,7 +115,7 @@ class TiledeskWhatsapp {
           })
         })
       }).catch((err) => {
-        console.log("axios err: ", err);  
+        console.log("axios err: ", err);
       })
     }).catch((err) => {
       console.log("axios err: ", err);
@@ -153,7 +152,7 @@ class TiledeskWhatsapp {
     })
   }
 
-  
+
   // HTTP REQUEST
   static async myrequest(options, callback, log) {
     if (this.log) {
@@ -178,7 +177,7 @@ class TiledeskWhatsapp {
       }
       else {
         if (callback) {
-          callback(TiledeskClient.getErr({message: "Response status not 200"}, options, res), null, null);
+          callback(TiledeskClient.getErr({ message: "Response status not 200" }, options, res), null, null);
         }
       }
     }).catch((err) => {

package/tiledesk/TiledeskWhatsappTranslator.js

@@ -63,7 +63,7 @@ class TiledeskWhatsappTranslator {
 
     if (tiledeskChannelMessage.metadata) {
   
-      if (tiledeskChannelMessage.type.startsWith('image')) {
+      if (tiledeskChannelMessage.metadata.type.startsWith('image')) {
       //if (tiledeskChannelMessage.metadata.type.startsWith('image/')) {
         var imgUrl = tiledeskChannelMessage.metadata.src;
         whatsapp_message.type = 'image'
@@ -71,9 +71,9 @@ class TiledeskWhatsappTranslator {
           link: imgUrl,
           caption: text
         }
-      }
+      } 
 
-      if (tiledeskChannelMessage.type.startsWith('video')) {
+      else if (tiledeskChannelMessage.metadata.type.startsWith('video')) {
       //if (tiledeskChannelMessage.metadata.type.startsWith('video/')) {
         var videoUrl = tiledeskChannelMessage.metadata.src;
         whatsapp_message.type = 'document'
@@ -90,16 +90,21 @@ class TiledeskWhatsappTranslator {
         */
       }
 
-      if (tiledeskChannelMessage.type.startsWith('application')) {
+      else if (tiledeskChannelMessage.metadata.type.startsWith('application')) {
       //if (tiledeskChannelMessage.metadata.type.startsWith('application/')) {
         var doc = tiledeskChannelMessage.metadata.src;
         whatsapp_message.type = 'document'
         whatsapp_message.document = {
           link: doc,
-          caption: text
+          caption: tiledeskChannelMessage.metadata.name
         }
       }
 
+      else {
+        console.log("file type not supported")
+        return null
+      }
+
       if (this.log) {
         console.log("[Translator] whatsapp message: ", whatsapp_message)
       }
@@ -122,7 +127,24 @@ class TiledeskWhatsappTranslator {
             }
           }
 
-          if (buttons_count < 4) {
+          if (buttons_count == 0) {
+
+            for (let btn of buttons) {
+              if (btn.type == 'url') {
+                text = text + "\n\n👉 " + btn.value + " (" + btn.link + ")"
+              }
+            }
+
+            whatsapp_message.text = { body: text };
+
+            if (this.log) {
+              console.log("[Translator] whatsapp message: ", whatsapp_message)
+            }
+            return whatsapp_message;
+            
+          }
+
+          if (buttons_count > 0 && buttons_count < 4) {
 
             for (let btn of buttons) {
               let title = (btn.value.length > 20) ? btn.value.substr(0, 18) + '..' : btn.value;
@@ -282,7 +304,15 @@ class TiledeskWhatsappTranslator {
 
     } else {
       // Skip message - non si deve fare qui!
-      return null
+      whatsapp_message.text = { body: text };
+
+      if (this.log) {
+        console.log("[Translator] whatsapp message: ", whatsapp_message)
+      }
+      return whatsapp_message;
+
+      
+      //return null
     }
   }