@tiledesk/tiledesk-server 2.1.40 → 2.2.3

package/services/faqBotSupport.js

@@ -4,6 +4,7 @@
 
 const Faq = require('../models/faq');
 const Faq_kb = require('../models/faq_kb');
+const MessageConstants = require('../models/messageConstants');
 var winston = require('../config/winston');
 
 var jwt = require('jsonwebtoken');
@@ -51,15 +52,32 @@ class FaqBotSupport {
     }
 // usa api di sponziello parseReply: https://github.com/Tiledesk/tiledesk-nodejs-libs/blob/master/tiledesk-chatbot-util/index.js 
 
-    parseMicrolanguage(text, message, bot, faq, disableWebHook) { 
+    parseMicrolanguage(text, message, bot, faq, disableWebHook, json) { 
         var that = this;
         return new Promise(async (resolve, reject) => {
+            winston.debug('parseMicrolanguage message: ' + JSON.stringify(message) );
             var reply = TiledeskChatbotUtil.parseReply(text);
             winston.debug('parseReply: ' + JSON.stringify(reply) );
             var messageReply = reply.message;
             
             var msg_attributes = {"_raw_message": text};
 
+            // prendi attributi e li mergi
+            // metadata prendi da messageReply SOLO SE CI SONO (DIVERSI NULL). Se riesci fai il merge
+            // prendi type e text
+
+            // if (message && message.attributes) {
+            //     for(const [key, value] of Object.entries(message.attributes)) {
+            //       msg_attributes[key] = value
+            //     }
+            // }
+
+            if (json && json.attributes) {
+                for(const [key, value] of Object.entries(json.attributes)) {
+                  msg_attributes[key] = value
+                }
+            }
+
             if (messageReply && messageReply.attributes) {
                 for(const [key, value] of Object.entries(messageReply.attributes)) {
                   msg_attributes[key] = value
@@ -67,10 +85,28 @@ class FaqBotSupport {
             }
 
             messageReply.attributes = msg_attributes;
-              
-        
+            
+            // not used in faqBotHandler but used when the message is returned by webhook (subscription). So you must clone(add) all message fields here.
+            // winston.debug('message.language: '+ message.language );
+            // if (message.language) {
+            //     messageReply.language = message.language;
+            // }
+
+            if (json && json.language) {
+                messageReply.language = json.language;
+            }
+
+            if (json && json.type) {
+                messageReply.type = json.type;
+            } 
+            
+            if (json && json.metadata) {
+                messageReply.metadata = json.metadata;
+            }
 
-            if (disableWebHook === false && (faq.webhook_enabled  === true || reply.webhook)) {
+        
+            winston.debug('faq: ', faq );
+            if (disableWebHook === false && bot.webhook_enabled ===true && (faq.webhook_enabled  === true || reply.webhook)) {
 
                 winston.debug("bot.webhook_url "+ bot.webhook_url)
                 var webhookurl = bot.webhook_url;
@@ -85,6 +121,11 @@ class FaqBotSupport {
                         webhookurl = reply.webhook;
                     }
                 }
+
+                if (!webhookurl) {
+                    winston.debug("webhookurl is undefined return standard");
+                    return resolve(messageReply);
+                }
                     
                 var botWithSecret = await Faq_kb.findById(bot._id).select('+secret').exec();
 
@@ -111,11 +152,11 @@ class FaqBotSupport {
                        },
                     method: 'POST',
                     json: true,
-                    body: {payload:{text: text, bot: bot, message: message, faq: faq}, token: token},
+                    body: {payload:{text: text, bot: bot, message: message, intent: faq}, token: token},
                     // }).then(response => {
                     }, function(err, response, json){
                         if (err) {
-                            winston.error("Error from webhook reply of getParsedMessage", err);
+                            winston.error("Error from webhook reply of getParsedMessage. Return standard reply", err);
 
                             return resolve(messageReply);
 
@@ -131,22 +172,45 @@ class FaqBotSupport {
                             return resolve(bot_answer);
                             */
                         }
+                         if (response.statusCode >= 400) {      
+                            winston.verbose("The ChatBot webhook return error http status code. Return standard reply", response);            
+                            return resolve(messageReply);
+                        }
+
                         if (!json) { //the webhook return empty body
+                            winston.verbose("The ChatBot webhook return no json. Return standard reply", response);
                             return resolve(messageReply);
                         }
-                        // if (response.statusCode >= 400) {                  
-                        //     return reject(`HTTP Error: ${response.statusCode}`);
-                        // }
+                       
                         winston.debug("webhookurl repl_message ", response);
 
                         var text = undefined;
                         if(json && json.text===undefined) {
+                            winston.verbose("webhookurl json is defined but text not. return standard reply",{json:json, response:response});
                             // text = 'Field text is not defined in the webhook respose of the faq with id: '+ faq._id+ ". Error: " + JSON.stringify(response);
                             return resolve(messageReply);
                         }else {
                             text = json.text;
                         }
-                        that.parseMicrolanguage(text, message, bot, faq, true).then(function(bot_answer) {
+                        winston.debug("webhookurl text:  "+ text);
+
+                        // // let cloned_message = Object.assign({}, messageReply);
+                        // let cloned_message =  message;
+                        // winston.debug("cloned_message :  ",cloned_message);
+
+                        // if (json.attributes) {
+                        //     if (!cloned_message.attributes) {
+                        //         cloned_message.attributes = {}
+                        //     }
+                        //     winston.debug("ChatBot webhook json.attributes: ",json.attributes);
+                        //     for(const [key, value] of Object.entries(json.attributes)) {
+                        //         cloned_message.attributes[key] = value
+                        //     }
+                        // }
+
+                        // winston.debug("cloned_message after attributes:  ",cloned_message);
+
+                        that.parseMicrolanguage(text, message, bot, faq, true, json).then(function(bot_answer) {
                             return resolve(bot_answer);
                         });
                     });
@@ -161,115 +225,115 @@ class FaqBotSupport {
         // return this.parseMicrolanguageOld(text, message, bot, faq);
     }
 
-    parseMicrolanguageOld(text, message, bot, faq) { 
-        var that = this;
-        // text = "*"
-        return new Promise(function(resolve, reject) {
-            winston.debug("getParsedMessage ******",text);
-            var repl_message = {};
-
-            // cerca i bottoni eventualmente definiti
-            var button_pattern = /^\*.*/mg; // buttons are defined as a line starting with an asterisk            
-            var text_buttons = text.match(button_pattern);
-            if (text_buttons) {
-                var text_with_removed_buttons = text.replace(button_pattern,"").trim();
-                repl_message.text = text_with_removed_buttons
-                var buttons = []
-                text_buttons.forEach(element => {
-                winston.debug("button ", element)
-                var remove_extra_from_button = /^\*/mg;
-                var button_text = element.replace(remove_extra_from_button, "").trim()
-                var button = {}
-                button["type"] = "text"
-                button["value"] = button_text
-                buttons.push(button)
-                });
-                repl_message.attributes =
-                { 
-                attachment: {
-                    type:"template",
-                    buttons: buttons
-                }
-                }
-                repl_message.type = "text";
-            } else {
-                // no buttons
-                repl_message.text = text
-                repl_message.type = "text";
-            }
-
-            var image_pattern = /^\\image:.*/mg; 
-            var imagetext = text.match(image_pattern);
-            if (imagetext && imagetext.length>0) {
-                var imageurl = imagetext[0].replace("\\image:","").trim();
-                winston.debug("imageurl ", imageurl)
-                var text_with_removed_image = text.replace(image_pattern,"").trim();
-                repl_message.text = text_with_removed_image + " " + imageurl
-                repl_message.metadata = {src: imageurl, width:200, height:200};
-                repl_message.type = "image";
-            }
-
-            var frame_pattern = /^\\frame:.*/mg; 
-            var frametext = text.match(frame_pattern);
-            if (frametext && frametext.length>0) {
-                var frameurl = frametext[0].replace("\\frame:","").trim();
-                winston.debug("frameurl ", frameurl)
-                // var text_with_removed_image = text.replace(frame_pattern,"").trim();
-                // repl_message.text = text_with_removed_image + " " + imageurl
-                repl_message.metadata = {src: frameurl};
-                repl_message.type = "frame";
-            }
-
-
-            var webhook_pattern = /^\\webhook:.*/mg; 
-            var webhooktext = text.match(webhook_pattern);
-            if (webhooktext && webhooktext.length>0) {
-                var webhookurl = webhooktext[0].replace("\\webhook:","").trim();
-                winston.debug("webhookurl ", webhookurl)
-
-                return request({                        
-                    uri :  webhookurl,
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    method: 'POST',
-                    json: true,
-                    body: {payload:{text: text, bot: bot, message: message, faq: faq}},
-                    // }).then(response => {
-                    }, function(err, response, json){
-                        if (err) {
-                            bot_answer.text = err +' '+ response.text;
-                            bot_answer.type = "text";
-                            winston.error("Error from webhook reply of getParsedMessage", err);
-                            return resolve(bot_answer);
-                        }
-                        // if (response.statusCode >= 400) {                  
-                        //     return reject(`HTTP Error: ${response.statusCode}`);
-                        // }
-                        winston.debug("webhookurl repl_message ", response);
-
-                        var text = undefined;
-                        if(json && json.text===undefined) {
-                            text = 'Field text is not defined in the webhook respose of the faq with id: '+ faq._id+ ". Error: " + JSON.stringify(response);
-                        }else {
-                            text = json.text;
-                        }
-
-
-                        that.getParsedMessage(text,message, bot, faq).then(function(bot_answer) {
-                            return resolve(bot_answer);
-                        });
-                    });
+    // parseMicrolanguageOld(text, message, bot, faq) { 
+    //     var that = this;
+    //     // text = "*"
+    //     return new Promise(function(resolve, reject) {
+    //         winston.debug("getParsedMessage ******",text);
+    //         var repl_message = {};
+
+    //         // cerca i bottoni eventualmente definiti
+    //         var button_pattern = /^\*.*/mg; // buttons are defined as a line starting with an asterisk            
+    //         var text_buttons = text.match(button_pattern);
+    //         if (text_buttons) {
+    //             var text_with_removed_buttons = text.replace(button_pattern,"").trim();
+    //             repl_message.text = text_with_removed_buttons
+    //             var buttons = []
+    //             text_buttons.forEach(element => {
+    //             winston.debug("button ", element)
+    //             var remove_extra_from_button = /^\*/mg;
+    //             var button_text = element.replace(remove_extra_from_button, "").trim()
+    //             var button = {}
+    //             button["type"] = "text"
+    //             button["value"] = button_text
+    //             buttons.push(button)
+    //             });
+    //             repl_message.attributes =
+    //             { 
+    //             attachment: {
+    //                 type:"template",
+    //                 buttons: buttons
+    //             }
+    //             }
+    //             repl_message.type = MessageConstants.MESSAGE_TYPE.TEXT;
+    //         } else {
+    //             // no buttons
+    //             repl_message.text = text
+    //             repl_message.type =  MessageConstants.MESSAGE_TYPE.TEXT;
+    //         }
+
+    //         var image_pattern = /^\\image:.*/mg; 
+    //         var imagetext = text.match(image_pattern);
+    //         if (imagetext && imagetext.length>0) {
+    //             var imageurl = imagetext[0].replace("\\image:","").trim();
+    //             winston.debug("imageurl ", imageurl)
+    //             var text_with_removed_image = text.replace(image_pattern,"").trim();
+    //             repl_message.text = text_with_removed_image + " " + imageurl
+    //             repl_message.metadata = {src: imageurl, width:200, height:200};
+    //             repl_message.type =  MessageConstants.MESSAGE_TYPE.IMAGE;
+    //         }
+
+    //         var frame_pattern = /^\\frame:.*/mg; 
+    //         var frametext = text.match(frame_pattern);
+    //         if (frametext && frametext.length>0) {
+    //             var frameurl = frametext[0].replace("\\frame:","").trim();
+    //             winston.debug("frameurl ", frameurl)
+    //             // var text_with_removed_image = text.replace(frame_pattern,"").trim();
+    //             // repl_message.text = text_with_removed_image + " " + imageurl
+    //             repl_message.metadata = {src: frameurl};
+    //             repl_message.type = MessageConstants.MESSAGE_TYPE.FRAME;
+    //         }
+
+
+    //         var webhook_pattern = /^\\webhook:.*/mg; 
+    //         var webhooktext = text.match(webhook_pattern);
+    //         if (webhooktext && webhooktext.length>0) {
+    //             var webhookurl = webhooktext[0].replace("\\webhook:","").trim();
+    //             winston.debug("webhookurl ", webhookurl)
+
+    //             return request({                        
+    //                 uri :  webhookurl,
+    //                 headers: {
+    //                     'Content-Type': 'application/json'
+    //                 },
+    //                 method: 'POST',
+    //                 json: true,
+    //                 body: {payload:{text: text, bot: bot, message: message, faq: faq}},
+    //                 // }).then(response => {
+    //                 }, function(err, response, json){
+    //                     if (err) {
+    //                         bot_answer.text = err +' '+ response.text;
+    //                         bot_answer.type =  MessageConstants.MESSAGE_TYPE.TEXT;
+    //                         winston.error("Error from webhook reply of getParsedMessage", err);
+    //                         return resolve(bot_answer);
+    //                     }
+    //                     // if (response.statusCode >= 400) {                  
+    //                     //     return reject(`HTTP Error: ${response.statusCode}`);
+    //                     // }
+    //                     winston.debug("webhookurl repl_message ", response);
+
+    //                     var text = undefined;
+    //                     if(json && json.text===undefined) {
+    //                         text = 'Field text is not defined in the webhook respose of the faq with id: '+ faq._id+ ". Error: " + JSON.stringify(response);
+    //                     }else {
+    //                         text = json.text;
+    //                     }
+
+
+    //                     that.getParsedMessage(text,message, bot, faq).then(function(bot_answer) {
+    //                         return resolve(bot_answer);
+    //                     });
+    //                 });
              
-            }else {
-                winston.debug("repl_message ", repl_message)
-                return resolve(repl_message);
-            }
+    //         }else {
+    //             winston.debug("repl_message ", repl_message)
+    //             return resolve(repl_message);
+    //         }
 
 
            
-        });
-    }
+    //     });
+    // }
 
 
     getBotMessage(botAnswer, projectid, bot, message, threshold) {
@@ -304,8 +368,8 @@ class FaqBotSupport {
                                 // found = true;
                                 // return resolve(bot_answer);
 
-                                if (message.channel.name == "chat21") {
-
+                                if (message.channel.name == "chat21") {    //why this contition on chat21 channel? bacause only chat21 support parsed replies?
+                                    winston.debug("faqBotSupport message.channel.name is chat21",message);
                                     that.getParsedMessage(bot_answer.text,message, bot, faqs[0]).then(function(bot_answerres) {
                                     
                                         bot_answerres.defaultFallback=true;
@@ -314,6 +378,7 @@ class FaqBotSupport {
                                     });
 
                                 } else {
+                                    winston.debug("faqBotSupport message.channel.name is not chat21 returning default",message);
                                     return resolve(bot_answer);
                                 }
                                 

package/services/faqService.js

@@ -2,12 +2,13 @@ var Faq = require("../models/faq");
 var Faq_kb = require("../models/faq_kb");
 var winston = require('../config/winston');
 const botEvent = require('../event/botEvent');
+const ActionsConstants = require('../models/actionsConstants');
 
 
 class FaqService {
 
 
-  create(name, url, projectid, user_id, type, description, webhook_url) {
+  create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language) {
     var that = this;
     return new Promise(function (resolve, reject) {
 
@@ -18,7 +19,9 @@ class FaqService {
           url: url,
           id_project: projectid,
           webhook_url: webhook_url,
+          webhook_enabled: webhook_enabled,
           type: type,
+          language: language,
           trashed: false,
           createdBy: user_id,
           updatedBy: user_id
@@ -55,19 +58,20 @@ class FaqService {
       var faqsArray = [
         { 'question': 'Hi', 'answer': 'Hi', 'topic': 'greetings' },
         { 'question': 'Hello', 'answer': 'Hello', 'topic': 'greetings' },
-        { 'question': 'Who are you?', 'answer': 'Hi, I\'m a bot 🤖. You can find more about me [here](https://tiledesk.com/chatbot-for-customer-service).\ntdImage:http://dialogflow-proxy-tiledesk.herokuapp.com/images/tily-welcomebot.gif\n* See the website https://tiledesk.com/\n* Menu', 'topic': 'greetings' },   
-        { 'question': '👨🏻‍🦰 I want an agent', 'answer': '\\agent', 'intent_display_name': 'agent_handoff', 'topic': 'internal' },
-        //TODO RIABILITARE? { 'question': 'Ok close', 'answer': '\\close', 'topic': 'internal' }, 
-        { 'question': '\\start', 'answer': 'Hello 👋. I\'m a bot 🤖.\n\nChoose one of the options below or write a message to reach our staff.\n* Who are you?\n* Where are you?\n* What can you do?\n* 👨🏻‍🦰 I want an agent','topic': 'internal' },            
-        { 'question': 'Menu', 'answer': 'Choose one of the options below or write a message to reach our staff.\n* Who are you?\n* Where are you?\n* What can you do?\n* 👨🏻‍🦰 I want an agent','topic': 'internal' },            
-        { 'question': 'defaultFallback', 'answer': 'I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Menu\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent', 'topic': 'internal' }, //TODO se metto spazio n * nn va      
-        { 'question': 'What can you do?', 'answer': 'Using natural language processing, I\'m able to find the best answer for your users. I also support images, videos etc.. Let\'s try:\n* Sample Image\n* Sample Video\n* Sample Action tdAction:action1\n* Sample Frame\n* Sample Webhook\n* Menu', 'topic': 'sample' },    
-        { 'question': 'Sample Image', 'answer': 'tdImage:https://tiledesk.com/tiledesk-logo-x1.png\n* What can you do?\n* Menu', 'topic': 'sample' },    
-        { 'question': 'Sample Frame', 'answer': 'tdFrame:https://www.emanueleferonato.com/wp-content/uploads/2019/02/runner/\n* What can you do?\n* Menu', 'topic': 'sample' },    
-        { 'question': 'Sample Video', 'answer': 'tdVideo:https://www.youtube.com/embed/EngW7tLk6R8\n* What can you do?\n* Menu', 'topic': 'sample' },    
-        { 'question': 'Where are you', 'answer': 'We are here ❤️\ntdFrame:https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d6087916.923447935!2d8.234804542117423!3d41.836572992140624!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x12d4fe82448dd203%3A0xe22cf55c24635e6f!2sItaly!5e0!3m2!1sen!2sit!4v1613657475377!5m2!1sen!2sit\n* Menu', 'topic': 'sample' },    
-        { 'question': 'Sample Webhook', 'answer': 'tdWebhook:https://tiledesk-bot-webhook.tiledesk.repl.co', 'topic': 'sample' },    
-        { 'question': 'Sample Action', 'answer': 'Hello 👋 Would you like to take a closer look at our offer?\n* Yes, please tdAction:yes_action\n* No tdAction:no_action', 'topic': 'sample' },    
+        { 'question': 'Who are you?', 'answer': 'Hi, I\'m a bot 🤖. You can find more about me [here](https://tiledesk.com/chatbot-for-customer-service).\ntdImage:https://console.tiledesk.com/assets/images/tily-welcomebot.gif\n* See the website https://tiledesk.com/\n* Back to start tdAction:start', 'topic': 'greetings' },   
+        { 'question': '👨🏻‍🦰 I want an agent', 'answer': 'We are looking for an operator.. '+ActionsConstants.CHAT_ACTION_MESSAGE.AGENT, 'intent_display_name': 'agent_handoff', 'topic': 'internal' },
+        { 'question': 'Close\nResolved', 'answer': ActionsConstants.CHAT_ACTION_MESSAGE.CLOSE, 'topic': 'internal' }, 
+        { 'question': '\\start', 'answer': 'Hello 👋. I\'m a bot 🤖.\n\nChoose one of the options below or write a message to reach our staff.\n* Who are you?\n* Where are you?\n* What can you do?\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'start', 'topic': 'internal' },            
+        // { 'question': 'Menu', 'answer': 'Choose one of the options below or write a message to reach our staff.\n* Who are you?\n* Where are you?\n* What can you do?\n* 👨🏻‍🦰 I want an agent','topic': 'internal' },            
+        { 'question': 'defaultFallback', 'answer': 'I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Back to start tdAction:start\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent', 'topic': 'internal' }, //TODO se metto spazio n * nn va      
+        { 'question': 'What can you do?', 'answer': 'Using natural language processing, I\'m able to find the best answer for your users. I also support images, videos etc.. Let\'s try:\n* Sample Image\n* Sample Video\n* Sample Action tdAction:action1\n* Sample Frame\n* Back to start tdAction:start', 'topic': 'sample' },    
+        { 'question': 'Sample Image', 'answer': 'tdImage:https://tiledesk.com/tiledesk-logo-x1.png\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
+        { 'question': 'Sample Frame', 'answer': 'tdFrame:https://www.emanueleferonato.com/wp-content/uploads/2019/02/runner/\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
+        { 'question': 'Sample Video', 'answer': 'tdVideo:https://www.youtube.com/embed/EngW7tLk6R8\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
+        { 'question': 'Where are you', 'answer': 'We are here ❤️\ntdFrame:https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d6087916.923447935!2d8.234804542117423!3d41.836572992140624!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x12d4fe82448dd203%3A0xe22cf55c24635e6f!2sItaly!5e0!3m2!1sen!2sit!4v1613657475377!5m2!1sen!2sit\n* Back to start tdAction:start', 'topic': 'sample' },    
+
+        // { 'question': 'Sample Webhook', 'answer': 'tdWebhook:https://tiledesk-bot-webhook.tiledesk.repl.co', 'topic': 'sample' },    
+        { 'question': 'Sample Action', 'answer': 'Hello 👋 Would you like to take a closer look at our offer?\n* Yes, please tdAction:yes_action\n* No tdAction:no_action','intent_display_name': 'action1', 'topic': 'sample' },    
         { 'question': 'Yes Action', 'answer': 'Great! Take a look here:\n* Tiledesk Pricing https://tiledesk.com/pricing-cloud/',  'intent_display_name': 'yes_action','topic': 'sample' },    
         { 'question': 'No Action', 'answer': 'All right! If you need anything, let us know.',  'intent_display_name': 'no_action','topic': 'sample' },    
 

package/services/messageService.js

@@ -21,33 +21,81 @@ class MessageService {
             return this.changeStatus(id, status);
        }
    }
-  create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language, channel_type, channel) {
 
-    winston.debug('message.create called');
+   create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language, channel_type, channel) {
+    let message = {
+        sender: sender, 
+        senderFullname: senderFullname, 
+        recipient: recipient, 
+        text: text, 
+        id_project: id_project, 
+        createdBy: createdBy, 
+        status: status, 
+        attributes: attributes, 
+        type: type, 
+        metadata: metadata, 
+        language: language, 
+        channel_type: channel_type, 
+        channel: channel
+    };
+    return this.save(message);
+   }
 
+   save(message) {
     var that = this;
+    winston.debug('message.save called');
+
+    let sender = message.sender;
+    let senderFullname = message.senderFullname;
+    let recipient = message.recipient;
+    let recipientFullname = message.recipientFullname;
+    let text = message.text;
+    let id_project = message.id_project;
+    let createdBy = message.createdBy;
+    let status = message.status;
+    let attributes = message.attributes;
+    let type = message.type;
+    let metadata = message.metadata;
+    let language = message.language;
+    let channel_type = message.channel_type;
+    let channel = message.channel;
+
+
+    
     return new Promise(function (resolve, reject) {
 
         if (!createdBy) {
             createdBy = sender;
         }
     
-          var beforeMessage = {sender:sender, senderFullname:senderFullname, recipient:recipient
+          var beforeMessage = {sender:sender, senderFullname:senderFullname
+            , recipient:recipient, recipientFullname: recipientFullname
             , text:text, id_project:id_project, createdBy:createdBy, status:status, attributes:attributes,
              type:type, metadata:metadata, language:language, channel_type: channel_type, channel: channel};
 
           var messageToCreate = beforeMessage;
-          winston.debug('messageToCreate',messageToCreate);
+          winston.debug('messageToCreate before',messageToCreate);
         //   messageEvent.emit('message.create.simple.before', {beforeMessage:beforeMessage});
 
        
 
           messagePromiseEvent.emit('message.create.simple.before', {beforeMessage:beforeMessage}).then(results => {
-            winston.debug('message.create.simple.before', results);
-
-            if (results && results.beforeMessage) {
-                messageToCreate =  results.beforeMessage;
+            winston.debug('message.create.simple.before results', results);
+            winston.debug('message.create.simple.before results prototype: ' + Object.prototype.toString.call(results));
+            
+            if (results) {
+                winston.debug('message.create.simple.before results.length: '+ results.length); //TODO ELIMINA DOPO CHE CREA CRASH
+            }
+            
+            /*
+            if (results ) { //NN HA MAI FUNZIONATO. LA MADIFICA DEL VALORE AVVENIVA PER PUNTATORE
+                winston.info('message.create.simple.before results.beforeMessage', results[0].beforeMessage);
+                messageToCreate =  results[0].beforeMessage;
             }
+            */
+           
+            winston.debug('messageToCreate', messageToCreate);
+
 
                  // if (id_project) {
 
@@ -55,8 +103,8 @@ class MessageService {
                         sender: messageToCreate.sender,
                         senderFullname: messageToCreate.senderFullname,
                         recipient: messageToCreate.recipient,
+                        recipientFullname: messageToCreate.recipientFullname, //for direct
                         type: messageToCreate.type,
-                        // recipientFullname: recipientFullname,
                         text: messageToCreate.text,
                         id_project: messageToCreate.id_project,
                         createdBy: messageToCreate.createdBy,