@tiledesk/tiledesk-server 2.3.6 → 2.3.7-1.2

package/services/modulesManager.js

@@ -24,6 +24,7 @@ var licenseKey = process.env.LICENSE_KEY;
 if (licenseKey) {
     var maskedLicenseKey = MaskData.maskPhone(licenseKey, maskOptions);
     winston.info("LicenseKey: " + maskedLicenseKey);    
+    // winston.info("LicenseKey: " + licenseKey);    
 }
 
 class ModulesManager {
@@ -35,12 +36,8 @@ class ModulesManager {
         this.facebookRoute = undefined;
         this.jwthistoryArchiver = undefined;
         this.jwthistoryRoute = undefined;
-        this.dialogflowListener = undefined;
         this.requestHistoryArchiver = undefined;
-        this.requestHistoryRoute = undefined;
-        this.routingQueue = undefined;
-        this.queue = undefined;
-        this.cache = undefined;
+        this.requestHistoryRoute = undefined;    
         this.visitorCounterRoute = undefined;
         this.visitorCounterMiddleware = undefined;
         this.widgetsRoute = undefined;
@@ -201,62 +198,19 @@ class ModulesManager {
         
 
 
-        try {
-            this.dialogflowListener = require('@tiledesk-ent/tiledesk-server-dialogflow').listener;
-            // this.dialogflowListener.listen();
-            winston.debug("this.dialogflowListener:"+ this.dialogflowListener);           
-
-            winston.info("ModulesManager dialogflow initialized");
-        } catch(err) {
-            if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init dialogflow module not found");
-            }else {
-                winston.error("ModulesManager error initializing init dialogflow module", err);
-            }
-        }
-
-
-        try {
-            this.routingQueue = require('@tiledesk-ent/tiledesk-server-routing-queue').listener;
-            // this.routingQueue.listen();
-            winston.debug("this.routingQueue:"+ this.routingQueue);           
-
-            winston.info("ModulesManager routing queue initialized");
-        } catch(err) {
-            if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init routing queue module not found");
-            }else {
-                winston.error("ModulesManager error initializing init routing queue module", err);
-            }
-        }
-
-
-
-        try {
-            this.queue = require('@tiledesk-ent/tiledesk-server-queue');            
-            winston.debug("this.queue:"+ this.queue);           
-
-            winston.info("ModulesManager queue initialized");
-        } catch(err) {
-            if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init queue module not found");
-            }else {
-                winston.error("ModulesManager error initializing init queue module", err);
-            }
-        }
-
+        // try {
+        //     this.dialogflowListener = require('@tiledesk-ent/tiledesk-server-dialogflow').listener;
+        //     // this.dialogflowListener.listen();
+        //     winston.debug("this.dialogflowListener:"+ this.dialogflowListener);           
 
-        try {            
-            this.cache = require('@tiledesk-ent/tiledesk-server-cache').cachegoose(config.mongoose);            
-            winston.debug("this.cache:"+ this.cache);           
-            winston.info("ModulesManager cache initialized");
-        } catch(err) {
-            if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init cache module not found");
-            }else {
-                winston.error("ModulesManager error initializing init cache module", err);
-            }
-        }
+        //     winston.info("ModulesManager dialogflow initialized");
+        // } catch(err) {
+        //     if (err.code == 'MODULE_NOT_FOUND') {
+        //         winston.info("ModulesManager init dialogflow module not found");
+        //     }else {
+        //         winston.error("ModulesManager error initializing init dialogflow module", err);
+        //     }
+        // }        
 
 
         
@@ -329,22 +283,15 @@ class ModulesManager {
                 winston.info("ModulesManager error starting requestHistoryArchiver module", err);            
             }
         }
-        if (this.routingQueue) {
-            try {
-                this.routingQueue.listen();
-                winston.info("ModulesManager routingQueue started");
-            } catch(err) {        
-                winston.info("ModulesManager error starting routingQueue module", err);            
-            }
-        }
-        if (this.dialogflowListener) {
-            try {
-                this.dialogflowListener.listen();
-                winston.info("ModulesManager dialogflowListener started");
-            } catch(err) {        
-                winston.info("ModulesManager error starting dialogflowListener module", err);            
-            }
-        }
+
+        // if (this.dialogflowListener) {
+        //     try {
+        //         this.dialogflowListener.listen();
+        //         winston.info("ModulesManager dialogflowListener started");
+        //     } catch(err) {        
+        //         winston.info("ModulesManager error starting dialogflowListener module", err);            
+        //     }
+        // }
 
 
         

package/services/operatingHoursService.js

@@ -4,16 +4,19 @@ var Project = require("../models/project");
 var moment_tz = require('moment-timezone');
 var winston = require('../config/winston');
 var cacheUtil = require('../utils/cacheUtil');
-
+var cacheEnabler = require("../services/cacheEnabler");
 
 class OperatingHoursService {
 
   projectIsOpenNow(projectId, callback) {
 
     // winston.debug('O ---> [ OHS ] -> PROJECT ID ', projectId)
-    Project.findOne({_id: projectId, status: 100})
-    //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "projects:id:"+projectId)
-    .exec(function (err, project) {
+    let q = Project.findOne({_id: projectId, status: 100});
+    if (cacheEnabler.project) { 
+      q.cache(cacheUtil.longTTL, "projects:id:"+projectId)  //project_cache
+      winston.debug('project cache enabled');
+    }
+    q.exec(function (err, project) {
       // winston.debug("XXXXXXXX project", project);
       if (err) {
         winston.error("O ---> [ OHS ] -> ERROR GETTING PROJECT ", err);
@@ -36,6 +39,8 @@ class OperatingHoursService {
 
         // IF THE TRIAL IS EXPIRED OR IF THE SUBSCIPTION IS NOT ACTIVE THE PROJECT IS ALWAYS OPEN EVEN IF activeOperatingHours IS SETTED TO true AND, FOR EXAMPLE,
         // THE USER HAS SETTED ALL DAYS TO CLOSED
+
+                              //secondo me qui manca un parentesi tonda per gli or
         if (project.profile && (project.profile.type === 'free' && project.trialExpired === true) || (project.profile.type === 'payment' && project.isActiveSubscription === false)) {
           winston.debug('O ---> [ OHS ] -> trial Expired OR Subscription NOT Active - PROJECT ALWAYS OPEN') 
           callback(true, null) ;

package/services/requestService.js

@@ -7,11 +7,12 @@ var messageService = require('../services/messageService');
 const requestEvent = require('../event/requestEvent');
 const leadEvent = require('../event/leadEvent');
 var winston = require('../config/winston');
-const uuidv4 = require('uuid/v4');
 var RequestConstants = require("../models/requestConstants");
 var requestUtil = require("../utils/requestUtil");
 var cacheUtil = require("../utils/cacheUtil");
 var arrayUtil = require("../utils/arrayUtil");
+var cacheEnabler = require("../services/cacheEnabler");
+var UIDGenerator = require("../utils/UIDGenerator");
 
 class RequestService {
 
@@ -62,7 +63,8 @@ class RequestService {
 
 
   sendMessageUpdateLead() {
-    leadEvent.on('lead.fullname.update', function(lead) {
+    leadEvent.on('lead.fullname.email.update', function(lead) {
+      winston.debug("lead.fullname.email.update ");
       // leadEvent.on('lead.update', function(lead) {
       
       setImmediate(() => {
@@ -226,16 +228,21 @@ class RequestService {
      winston.debug("id_project:" + id_project);
      winston.debug("nobot:"+ nobot);
 
-        return Request       
-        .findOne({request_id: request_id, id_project: id_project})     
-        //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id)     
-        .exec( function(err, request) {
+        let q= Request       
+        .findOne({request_id: request_id, id_project: id_project});
+
+        // if (cacheEnabler.request) {  //(node:60837) UnhandledPromiseRejectionWarning: VersionError: No matching document found for id "633efe246a6cc0eda5732684" version 0 modifiedPaths "status, participants, participantsAgents, department, assigned_at, snapshot, snapshot.department, snapshot.department.updatedAt, snapshot.agents"
+        //   q.cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id+":simple")      //request_cache
+        //   winston.debug('request cache enabled');
+        // }
+        return q.exec( function(err, request) {
 
           if (err) {
             winston.error(err);
             return reject(err);
           }
                    
+          winston.debug('request return',request);
 
           // cambia var in let
 
@@ -378,10 +385,15 @@ class RequestService {
       // winston.debug("request_id", request_id);
       // winston.debug("newstatus", newstatus);
  
-         return Request       
-         .findOne({request_id: request_id, id_project: id_project})
-         //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id)
-         .exec( function(err, request) {
+         let q = Request       
+         .findOne({request_id: request_id, id_project: id_project});
+
+         if (cacheEnabler.request) {
+          q.cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id+":simple")      //request_cache
+          winston.debug('request cache enabled');
+        }
+
+         return q.exec( function(err, request) {
  
            if (err) {
              winston.error(err);
@@ -407,7 +419,7 @@ class RequestService {
 
   createWithRequester(project_user_id, lead_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status, createdBy, attributes, subject, preflight) {
 
-    var request_id = 'support-group-'+ id_project + "-" + uuidv4();
+    var request_id = 'support-group-'+ id_project + "-" + UIDGenerator.generate();  
     winston.debug("request_id: "+request_id);
     
     return this.createWithIdAndRequester(request_id, project_user_id, lead_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status, createdBy, attributes, subject, preflight);
@@ -502,6 +514,8 @@ class RequestService {
            try {
             //  getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
               var result = await departmentService.getOperators(departmentid, id_project, false, undefined, context);
+              // console.log("************* after get operator: "+new Date().toISOString());
+
               winston.debug("getOperators", result);
            } catch(err) {
             return reject(err);
@@ -809,6 +823,7 @@ class RequestService {
 
 
     return new Promise(function (resolve, reject) {
+      winston.debug("changeFirstTextAndPreflightByRequestId", request_id);
      // winston.debug("request_id", request_id);
      // winston.debug("newstatus", newstatus);
 
@@ -933,41 +948,53 @@ class RequestService {
 
   }
 
-  // unused
-  incrementMessagesCountByRequestId(request_id, id_project) {
 
-    return new Promise(function (resolve, reject) {
-     // winston.debug("request_id", request_id);
-     // winston.debug("newstatus", newstatus);
 
-        return Request       
-        .findOneAndUpdate({request_id: request_id, id_project: id_project}, {$inc : {'messages_count' : 1}}, {new: true, upsert:false}, function(err, updatedRequest) {
-            if (err) {
-              winston.error(err);
-              return reject(err);
-            }
-            winston.debug("Message count +1");
-            return resolve(updatedRequest);
-          });
-    });
+    // unused
+    incrementMessagesCountByRequestId(request_id, id_project) {
 
-  }
+      return new Promise(function (resolve, reject) {
+       // winston.debug("request_id", request_id);
+       // winston.debug("newstatus", newstatus);
+  
+          return Request       
+          .findOneAndUpdate({request_id: request_id, id_project: id_project}, {$inc : {'messages.messages_count' : 1}}, {new: true, upsert:false}, function(err, updatedRequest) {
+              if (err) {
+                winston.error(err);
+                return reject(err);
+              }
+              winston.debug("Message count +1");
+              return resolve(updatedRequest);
+            });
+      });
+  
+    }
 
-  updateWaitingTimeByRequestId(request_id, id_project) {
+  updateWaitingTimeByRequestId(request_id, id_project, enable_populate) {
 
     return new Promise(function (resolve, reject) {
      // winston.debug("request_id", request_id);
      // winston.debug("newstatus", newstatus);
 
-      return Request       
-      .findOne({request_id: request_id, id_project: id_project})
-      .populate('lead')
-      .populate('department')
-      .populate('participatingBots')
-      .populate('participatingAgents')  
-      .populate({path:'requester',populate:{path:'id_user'}})
-      //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id)     
-      .exec(function(err, request) {
+      let q = Request       
+      .findOne({request_id: request_id, id_project: id_project});
+
+      if (enable_populate==true) {
+        winston.debug("updateWaitingTimeByRequestId  enable_populate");
+
+        q.populate('lead')
+        .populate('department')
+        .populate('participatingBots')
+        .populate('participatingAgents')  
+        .populate({path:'requester',populate:{path:'id_user'}});
+      }
+      
+
+      // if (cacheEnabler.request) {  //attention this cache is not usable bacause cacheoose don't support populate without .lean.. so if cached populated field is not returned with cacheoose, updateWaitingTime is only used in chat21webhook but i thik it is important for messages route
+      //   q.cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id)           //request_cache
+      //   winston.debug('request cache enabled');
+      // }
+      q.exec(function(err, request) {
         if (err) {
           winston.error(err);
           return reject(err);
@@ -999,12 +1026,19 @@ class RequestService {
   }
 
 
-  closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by) {
+  closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by, force) {
 
     var that = this;
     return new Promise(function (resolve, reject) {
      // winston.debug("request_id", request_id);
      
+     if (force==undefined) {
+      winston.debug("force is undefined ");
+      force = false;
+     } 
+    //  else {
+    //   winston.info("force is: " + force);
+    //  }
 
      return Request      
      .findOne({request_id: request_id, id_project: id_project})
@@ -1025,13 +1059,15 @@ class RequestService {
          winston.error("Request not found for request_id "+ request_id + " and id_project " + id_project);
          return reject({"success":false, msg:"Request not found for request_id "+ request_id + " and id_project " + id_project});
        }      
-       if (request.status == RequestConstants.CLOSED) {
+       if (force == false && request.status == RequestConstants.CLOSED) {
          // qui1000
       //  if (request.statusObj.closed) {
         winston.debug("Request already closed for request_id "+ request_id + " and id_project " + id_project);
         return resolve(request);
        }
 
+       winston.debug("sono qui");
+
       //  un utente può chiudere se appartiene a participatingAgents oppure meglio agents del progetto?
       
      

package/services/subscriptionNotifier.js

@@ -21,6 +21,7 @@ var jwt = require('jsonwebtoken');
 var config = require('../config/database'); // get db config file
 var cacheUtil = require("../utils/cacheUtil");
 
+var cacheEnabler = require("../services/cacheEnabler");
 
 var webhook_origin = process.env.WEBHOOK_ORIGIN || "http://localhost:3000";
 winston.debug("webhook_origin: "+webhook_origin);
@@ -36,9 +37,13 @@ class SubscriptionNotifier {
    
   findSubscriber(event, id_project) {
     return new Promise(function (resolve, reject) {
-      Subscription.find({event:event, $or:[{id_project: id_project}, {global: true}]})
-      .cache(cacheUtil.longTTL, id_project+":subscriptions:event:"+event)
-      .select("+secret +global")
+      let q = Subscription.find({event:event, $or:[{id_project: id_project}, {global: true}]});
+      if (cacheEnabler.subscription) {
+        q.cache(cacheUtil.longTTL, id_project+":subscriptions:event:"+event);  //CACHE_SUBSCRIPTION
+        winston.debug('subscription cache enabled');
+      }
+      
+      q.select("+secret +global")
       .exec(function (err, subscriptions) {
         // if (subscriptions && subscriptions.length>0) {
         //   winston.debug("Subscription.notify", event, item , "length", subscriptions.length);
@@ -81,7 +86,7 @@ class SubscriptionNotifier {
 
           if (s.global==true){
             signOptions.audience = 'https://tiledesk.com';
-            secret = config.secret;
+            secret = process.env.GLOBAL_SECRET || config.secret;
           }
     
           var token = jwt.sign(sJson, secret, signOptions);

package/services/trainingService.js

@@ -0,0 +1,106 @@
+const faqBotEvent = require('../event/faqBotEvent');
+const Faq_kb = require('../models/faq_kb');
+const Faq = require('../models/faq');
+var winston = require('../config/winston');
+const axios = require("axios").default;
+
+
+let chatbot_training_api_url = "http://34.65.210.38/model/train"
+
+class TrainingService {
+
+
+
+    train(eventName, faq) {
+
+        Faq_kb.findById(faq.id_faq_kb, (err, faq_kb) => {
+            winston.debug("faq_kb: ", faq_kb)
+
+            if (faq_kb.intentsEngine !== 'tiledesk-ai') {
+                winston.info("intentsEngine: off")
+                return null;
+            }
+
+            winston.info("intentsEngine: on")
+            Faq.find({ id_faq_kb: faq.id_faq_kb }, (err, faqs) => {
+
+                if (err) {
+                    winston.error("[Training] find all error: ", err);
+                } else {
+
+                    let json = {
+                        "configuration": {
+                            "language": faq_kb.language,
+                            "pipeline": [""]
+                        },
+                        "model": faq_kb._id,
+                        "nlu": []
+                    }
+
+                    faqs.forEach((f) => {
+                        if (f.enabled == true) {
+                            let intent = {
+                                "intent": f.intent_display_name,
+                                "examples": []
+                            }
+                            let questions = f.question.split("\n");
+                            intent.examples = questions;
+                            json.nlu.push(intent);
+                        }
+                    })
+
+                    winston.debug("training json: \n" + JSON.stringify(json, null, 2));
+
+                    axios({
+                        url: chatbot_training_api_url,
+                        headers: {
+                            'Content-Type': 'application/json'
+                        },
+                        data: json,
+                        method: 'POST'
+                    }).then((resbody) => {
+                        winston.info("[Training] resbody: ", resbody.data);
+                        return true;
+                    }).catch((err) => {
+                        winston.error("[Training] error: ", err.response.data);
+                    })
+                }
+            })
+
+        })
+
+
+
+    }
+
+    start() {
+        winston.info('TrainingService start');
+
+        faqBotEvent.on('faq.create', (faq) => {
+            setImmediate(() => {
+                trainingService.train('faq.create', faq);
+            })
+        })
+
+        faqBotEvent.on('faq.update', (faq) => {
+            winston.debug("--> event faq: ", faq);
+            setImmediate(() => {
+                trainingService.train('faq.update', faq);
+            })
+        })
+
+        faqBotEvent.on('faq.delete', (faq) => {
+            console.log("--> event faq: ", faq);
+            setImmediate(() => {
+                trainingService.train('faq.delete', faq);
+            })
+        })
+
+
+    }
+
+}
+
+var trainingService = new TrainingService();
+
+module.exports = trainingService;

package/template/email/assignedEmailMessage.html

@@ -11,9 +11,19 @@
     img {
         max-width: 100%;
         margin-left:16px;
-        margin-bottom:16px;
         text-align:center !important;
     }
+    img.CToWUd {
+        margin-bottom: 16px;
+        max-width: 200px !important;
+        width: 200px !important;
+        min-width: 200px !important;
+        outline: none;
+        text-decoration: none;
+        border: none;
+        height: auto;
+        margin-left: 0px;
+    }
     body {
         -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em;
     }
@@ -82,7 +92,7 @@
 
             <div style="text-align:center">
             <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:10%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd">
+                <img src="https://tiledesk.com/wp-content/uploads/2023/01/tiledesk_log_email_200.png" class="CToWUd">
             </a>
             </div>
             </tr>
@@ -102,7 +112,7 @@
                 <table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 
             <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">              
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
 {{#ifEquals message.type "text"}}
 <div style="white-space: pre-wrap;">{{{msgText}}}</div>
 {{/ifEquals}}
@@ -120,26 +130,26 @@
 
 
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                 Project name : <strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">{{project.name}}</strong>
                 </td>
                 </tr>
                                 
 
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                 Department name : <strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">{{request.department.name}}</strong>
                 </td>
                 </tr>
 
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                 From email : <strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">{{request.lead.email}}</strong>
                 </td>
                 </tr>
 
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                 Contact name : <strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">{{request.lead.fullname}}</strong>
                 </td>
                 </tr>
@@ -151,7 +161,7 @@
                 </tr> -->
 
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                 Channel : <strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
                     {{#ifEquals request.channel.name "chat21"}}
                         Chat
@@ -163,7 +173,7 @@
                 </tr>
 
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                 <a href="{{baseScope.baseUrl}}/#/project/{{request.id_project}}/wsrequest/{{request.request_id}}/messages">Open the dashboard</a>.
                     
                 </td>
@@ -174,7 +184,7 @@
 
                 
                     <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                    <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                    <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                     </td>
                     </tr>
                 </table>
@@ -184,7 +194,7 @@
             <div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
             <table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">
+                <td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0;" align="center" valign="top">
                     <span><a href="http://www.tiledesk.com" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;" > Tiledesk.com </a></span>
                     <br><span><a href="%unsubscribe_url%"  style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">Unsubscribe</a></span>
                 </td>