@tiledesk/tiledesk-server 2.3.97 → 2.3.98
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +2 -2
- package/pubmodules/trigger/rulesTrigger.js +13 -1
- package/routes/faq.js +4 -1
- package/services/emailService.js +33 -5
package/package.json
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
{
|
2
2
|
"name": "@tiledesk/tiledesk-server",
|
3
3
|
"description": "The Tiledesk server module",
|
4
|
-
"version": "2.3.
|
4
|
+
"version": "2.3.98",
|
5
5
|
"scripts": {
|
6
6
|
"start": "node ./bin/www",
|
7
7
|
"pretest": "mongodb-runner start",
|
@@ -44,7 +44,7 @@
|
|
44
44
|
"@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
|
45
45
|
"@tiledesk/tiledesk-rasa-connector": "^1.0.10",
|
46
46
|
"@tiledesk/tiledesk-tybot-connector": "^0.1.62",
|
47
|
-
"@tiledesk/tiledesk-whatsapp-connector": "^0.1.
|
47
|
+
"@tiledesk/tiledesk-whatsapp-connector": "^0.1.38",
|
48
48
|
"amqplib": "^0.5.5",
|
49
49
|
"app-root-path": "^3.0.0",
|
50
50
|
"bcrypt-nodejs": "0.0.3",
|
@@ -154,6 +154,10 @@ class RulesTrigger {
|
|
154
154
|
var recipient;
|
155
155
|
if (eventTrigger.eventKey=="request.create" || eventTrigger.eventKey=="request.participants.join") {
|
156
156
|
recipient = eventTrigger.event.request_id;
|
157
|
+
|
158
|
+
// console.log("eventTrigger.event",eventTrigger.event);
|
159
|
+
// console.log("eventTrigger.event.id_project",eventTrigger.event.id_project);
|
160
|
+
|
157
161
|
}
|
158
162
|
if (eventTrigger.eventKey=="message.create.from.requester" || eventTrigger.eventKey=="message.received") {
|
159
163
|
recipient = eventTrigger.event.recipient;
|
@@ -219,7 +223,8 @@ class RulesTrigger {
|
|
219
223
|
var fullname = action.parameters.fullName || "BOT";
|
220
224
|
winston.debug('runAction action fullname: ' + fullname);
|
221
225
|
|
222
|
-
var subject = action.parameters.
|
226
|
+
var subject = action.parameters.subject || "New Email";
|
227
|
+
|
223
228
|
winston.debug('runAction action subject: ' + subject);
|
224
229
|
|
225
230
|
var sender = "system";
|
@@ -241,6 +246,13 @@ class RulesTrigger {
|
|
241
246
|
var recipient;
|
242
247
|
if (eventTrigger.eventKey=="request.create" || eventTrigger.eventKey=="request.participants.join") {
|
243
248
|
recipient = eventTrigger.event.request_id;
|
249
|
+
|
250
|
+
//custom ocf here
|
251
|
+
if (eventTrigger.event.id_project =="6406e34727b57500120b1bd6") {
|
252
|
+
subject = "Apertura richiesta di supporto #" + eventTrigger.event.ticket_id;
|
253
|
+
// console.log("subject",subject);
|
254
|
+
}
|
255
|
+
|
244
256
|
}
|
245
257
|
if (eventTrigger.eventKey=="message.create.from.requester" || eventTrigger.eventKey=="message.received") {
|
246
258
|
recipient = eventTrigger.event.recipient;
|
package/routes/faq.js
CHANGED
@@ -88,6 +88,7 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
|
|
88
88
|
})
|
89
89
|
.on("end", function () {
|
90
90
|
winston.debug("PARSE DONE");
|
91
|
+
faqBotEvent.emit('faq_train.create', id_faq_kb)
|
91
92
|
res.json({ success: true, msg: 'CSV Parsed' });
|
92
93
|
})
|
93
94
|
.on("error", function (err) {
|
@@ -149,6 +150,7 @@ router.post('/', function (req, res) {
|
|
149
150
|
winston.debug('1. ID FAQKB GET IN THE OBJECT OF NEW FAQ CREATED ', savedFaq.id_faq_kb);
|
150
151
|
|
151
152
|
faqBotEvent.emit('faq.create', savedFaq);
|
153
|
+
faqBotEvent.emit('faq_train.create', req.body.id_faq_kb)
|
152
154
|
|
153
155
|
res.json(savedFaq);
|
154
156
|
|
@@ -211,6 +213,7 @@ router.put('/:faqid', function (req, res) {
|
|
211
213
|
}
|
212
214
|
|
213
215
|
faqBotEvent.emit('faq.update', updatedFaq);
|
216
|
+
faqBotEvent.emit('faq_train.update', updatedFaq.id_faq_kb);
|
214
217
|
|
215
218
|
res.json(updatedFaq);
|
216
219
|
|
@@ -232,7 +235,7 @@ router.delete('/:faqid', function (req, res) {
|
|
232
235
|
winston.debug('Deleted FAQ ', faq);
|
233
236
|
|
234
237
|
faqBotEvent.emit('faq.delete', faq);
|
235
|
-
|
238
|
+
faqBotEvent.emit('faq_train.delete', faq.id_faq_kb);
|
236
239
|
|
237
240
|
res.json(faq);
|
238
241
|
|
package/services/emailService.js
CHANGED
@@ -12,6 +12,9 @@ handlebars.registerHelper('ifEquals', function(arg1, arg2, options) {
|
|
12
12
|
return (arg1 == arg2) ? options.fn(this) : options.inverse(this);
|
13
13
|
});
|
14
14
|
|
15
|
+
handlebars.registerHelper('dateFormat', require('handlebars-dateformat'));
|
16
|
+
|
17
|
+
|
15
18
|
// var options = {};
|
16
19
|
// handlebars.registerHelper('markdown', markdown(options));
|
17
20
|
|
@@ -45,6 +48,8 @@ const maskOptions = {
|
|
45
48
|
|
46
49
|
const MESSAGE_ID_DOMAIN = "tiledesk.com";
|
47
50
|
|
51
|
+
// const hcustomization = require('../utils/hcustomization');
|
52
|
+
|
48
53
|
class EmailService {
|
49
54
|
|
50
55
|
constructor() {
|
@@ -1015,7 +1020,7 @@ class EmailService {
|
|
1015
1020
|
replyTo: replyTo,
|
1016
1021
|
inReplyTo: inReplyTo,
|
1017
1022
|
references: references,
|
1018
|
-
subject:`[Tiledesk ${project ? project.name : '-'}] New Offline Message`,
|
1023
|
+
subject:`[Tiledesk ${project ? project.name : '-'}] New Offline Message`, //TODO (anche per il cloud) aggiungere variabile env per cambiare i subjects
|
1019
1024
|
html:html,
|
1020
1025
|
config:configEmail,
|
1021
1026
|
headers: headers
|
@@ -1779,13 +1784,33 @@ async sendRequestTranscript(to, messages, request, project) {
|
|
1779
1784
|
|
1780
1785
|
var html = template(replacements);
|
1781
1786
|
|
1787
|
+
|
1788
|
+
|
1789
|
+
let from;
|
1782
1790
|
let configEmail;
|
1783
|
-
if (project && project.settings && project.settings.email
|
1784
|
-
|
1785
|
-
|
1791
|
+
if (project && project.settings && project.settings.email) {
|
1792
|
+
if (project.settings.email.config) {
|
1793
|
+
configEmail = project.settings.email.config;
|
1794
|
+
winston.verbose("custom email configEmail setting found: ", configEmail);
|
1795
|
+
}
|
1796
|
+
if (project.settings.email.from) {
|
1797
|
+
from = project.settings.email.from;
|
1798
|
+
winston.verbose("custom from email setting found: "+ from);
|
1799
|
+
}
|
1800
|
+
}
|
1801
|
+
|
1802
|
+
|
1803
|
+
|
1804
|
+
//custom ocf here
|
1805
|
+
// console.log("ocf",project._id);
|
1806
|
+
let subject = '[Tiledesk] Transcript';
|
1807
|
+
if (project._id =="6406e34727b57500120b1bd6") {
|
1808
|
+
subject = "Chiusura richiesta di supporto #" + request.ticket_id;
|
1809
|
+
// console.log("subject",subject);
|
1786
1810
|
}
|
1811
|
+
// hcustomization.emailTranscript(to, subject, html, configEmail)
|
1787
1812
|
|
1788
|
-
that.send({to:to, subject:
|
1813
|
+
that.send({from:from, to:to, subject: subject, html:html, config: configEmail});
|
1789
1814
|
that.send({to: that.bcc, subject: '[Tiledesk] Transcript - notification', html:html });
|
1790
1815
|
|
1791
1816
|
}
|
@@ -1798,5 +1823,8 @@ async sendRequestTranscript(to, messages, request, project) {
|
|
1798
1823
|
|
1799
1824
|
var emailService = new EmailService();
|
1800
1825
|
|
1826
|
+
// var subject = "abc";
|
1827
|
+
// hcustomization.emailTranscript({subject: subject});
|
1828
|
+
// console.log("subject", subject);
|
1801
1829
|
|
1802
1830
|
module.exports = emailService;
|