@tiledesk/tiledesk-server 2.3.97 → 2.3.99

package/models/lead.js

@@ -60,7 +60,10 @@ var LeadSchema = new Schema({
     type: String,
     required: false
   },
-  tags: [TagSchema],
+  // tags: [TagSchema],
+  tags: [{
+    type: String
+  }],
   // aggiungi location e togli flat fields
   attributes: {
     type: Object,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.97",
+  "version": "2.3.99",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -44,7 +44,7 @@
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-tybot-connector": "^0.1.62",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.33",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.38",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/pubmodules/trigger/rulesTrigger.js

@@ -154,6 +154,10 @@ class RulesTrigger {
           var recipient;
           if (eventTrigger.eventKey=="request.create" || eventTrigger.eventKey=="request.participants.join") {
             recipient = eventTrigger.event.request_id;
+
+            // console.log("eventTrigger.event",eventTrigger.event);
+            // console.log("eventTrigger.event.id_project",eventTrigger.event.id_project);
+            
           }
           if (eventTrigger.eventKey=="message.create.from.requester" || eventTrigger.eventKey=="message.received") {
             recipient = eventTrigger.event.recipient;
@@ -219,7 +223,8 @@ class RulesTrigger {
             var fullname = action.parameters.fullName || "BOT";
             winston.debug('runAction action fullname: ' + fullname);
   
-            var subject = action.parameters.fullName || "New Email";
+            var subject = action.parameters.subject || "New Email";                                   
+
             winston.debug('runAction action subject: ' + subject);
 
             var sender = "system";
@@ -241,6 +246,13 @@ class RulesTrigger {
             var recipient;
             if (eventTrigger.eventKey=="request.create" || eventTrigger.eventKey=="request.participants.join") {
               recipient = eventTrigger.event.request_id;
+
+              //custom ocf here
+              if (eventTrigger.event.id_project =="6406e34727b57500120b1bd6") {
+                subject = "Apertura richiesta di supporto #" + eventTrigger.event.ticket_id;
+                // console.log("subject",subject);
+              }
+
             }
             if (eventTrigger.eventKey=="message.create.from.requester" || eventTrigger.eventKey=="message.received") {
               recipient = eventTrigger.event.recipient;

package/routes/faq.js

@@ -88,6 +88,7 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
       })
       .on("end", function () {
         winston.debug("PARSE DONE");
+        faqBotEvent.emit('faq_train.create', id_faq_kb)
         res.json({ success: true, msg: 'CSV Parsed' });
       })
       .on("error", function (err) {
@@ -149,6 +150,7 @@ router.post('/', function (req, res) {
       winston.debug('1. ID FAQKB GET IN THE OBJECT OF NEW FAQ CREATED ', savedFaq.id_faq_kb);
 
       faqBotEvent.emit('faq.create', savedFaq);
+      faqBotEvent.emit('faq_train.create', req.body.id_faq_kb)
 
       res.json(savedFaq);
 
@@ -211,6 +213,7 @@ router.put('/:faqid', function (req, res) {
     }
 
     faqBotEvent.emit('faq.update', updatedFaq);
+    faqBotEvent.emit('faq_train.update', updatedFaq.id_faq_kb);
 
     res.json(updatedFaq);
 
@@ -232,7 +235,7 @@ router.delete('/:faqid', function (req, res) {
     winston.debug('Deleted FAQ ', faq);
 
     faqBotEvent.emit('faq.delete', faq);
-
+    faqBotEvent.emit('faq_train.delete', faq.id_faq_kb);
 
     res.json(faq);
 

package/services/emailService.js

@@ -12,6 +12,9 @@ handlebars.registerHelper('ifEquals', function(arg1, arg2, options) {
   return (arg1 == arg2) ? options.fn(this) : options.inverse(this);
 });
 
+handlebars.registerHelper('dateFormat', require('handlebars-dateformat'));
+
+
 // var options = {};
 // handlebars.registerHelper('markdown', markdown(options));
 
@@ -45,6 +48,8 @@ const maskOptions = {
 
 const MESSAGE_ID_DOMAIN = "tiledesk.com";
 
+// const hcustomization = require('../utils/hcustomization');
+
 class EmailService {
 
   constructor() {
@@ -1015,7 +1020,7 @@ class EmailService {
       replyTo: replyTo, 
       inReplyTo: inReplyTo,
       references: references,
-      subject:`[Tiledesk ${project ? project.name : '-'}] New Offline Message`, 
+      subject:`[Tiledesk ${project ? project.name : '-'}] New Offline Message`,    //TODO (anche per il cloud) aggiungere variabile env per cambiare i subjects
       html:html, 
       config:configEmail, 
       headers: headers
@@ -1779,13 +1784,33 @@ async sendRequestTranscript(to, messages, request, project) {
 
     var html = template(replacements);
 
+  
+
+    let from;
     let configEmail;
-    if (project && project.settings && project.settings.email && project.settings.email.config) {
-      configEmail = project.settings.email.config;
-      winston.verbose("custom email setting found: ", configEmail);
+    if (project && project.settings && project.settings.email) {
+      if (project.settings.email.config) {
+        configEmail = project.settings.email.config;
+        winston.verbose("custom email configEmail setting found: ", configEmail);
+      }
+      if (project.settings.email.from) {
+        from = project.settings.email.from;
+        winston.verbose("custom from email setting found: "+ from);
+      }
+    }
+
+
+
+    //custom ocf here
+    // console.log("ocf",project._id);
+    let subject = '[Tiledesk] Transcript';
+    if (project._id =="6406e34727b57500120b1bd6") {
+      subject = "Chiusura richiesta di supporto #" + request.ticket_id;
+      // console.log("subject",subject);
     }
+    // hcustomization.emailTranscript(to, subject, html, configEmail)
 
-    that.send({to:to, subject: '[Tiledesk] Transcript', html:html, config: configEmail});
+    that.send({from:from, to:to, subject: subject, html:html, config: configEmail});
     that.send({to: that.bcc, subject: '[Tiledesk] Transcript - notification', html:html });
 
 }
@@ -1798,5 +1823,8 @@ async sendRequestTranscript(to, messages, request, project) {
 
 var emailService = new EmailService();
 
+// var subject = "abc";
+// hcustomization.emailTranscript({subject: subject});
+// console.log("subject", subject);
 
 module.exports = emailService;