@tiledesk/tiledesk-server 2.3.17 → 2.3.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/channels/chat21/chat21Handler.js +18 -3
- package/channels/chat21/package-lock.json +663 -706
- package/channels/chat21/package.json +2 -2
- package/models/project_user.js +4 -0
- package/models/request.js +12 -1
- package/package.json +3 -3
- package/pubmodules/activities/activityArchiver.js +1 -1
- package/pubmodules/activities/routes/activity.js +1 -1
- package/pubmodules/canned/cannedResponse.js +4 -0
- package/pubmodules/canned/cannedResponseRoute.js +11 -5
- package/pubmodules/emailNotification/requestNotification.js +25 -2
- package/pubmodules/events/eventRoute.js +37 -7
- package/pubmodules/trigger/start.js +5 -1
- package/routes/auth.js +7 -2
- package/routes/project_user.js +9 -0
- package/routes/request.js +18 -0
- package/services/geoService.js +30 -4
- package/template/email/pooledRequest.html +1 -1
- package/test/cannedRoute.js +166 -0
- package/websocket/webSocketServer.js +23 -5
|
@@ -246,7 +246,18 @@ class Chat21Handler {
|
|
|
246
246
|
});
|
|
247
247
|
|
|
248
248
|
|
|
249
|
+
messageEvent.on('message.test', function(message) {
|
|
250
|
+
|
|
251
|
+
winston.info("Chat21Sender message.test");
|
|
252
|
+
|
|
253
|
+
chat21.auth.setAdminToken(adminToken);
|
|
249
254
|
|
|
255
|
+
return chat21.messages.sendToGroup(message.senderFullname, message.recipient,
|
|
256
|
+
message.recipient_fullname, message.text, message.sender, message.attributes, message.type, message.metadata, message.timestamp, message.group)
|
|
257
|
+
.then(function(data){
|
|
258
|
+
winston.info("Chat21Sender sendToGroup test: "+ JSON.stringify(data));
|
|
259
|
+
});
|
|
260
|
+
});
|
|
250
261
|
|
|
251
262
|
|
|
252
263
|
messageEvent.on('message.sending', function(message) {
|
|
@@ -299,7 +310,8 @@ class Chat21Handler {
|
|
|
299
310
|
}
|
|
300
311
|
|
|
301
312
|
var recipient_fullname = "Guest";
|
|
302
|
-
//
|
|
313
|
+
// guest_here
|
|
314
|
+
|
|
303
315
|
if (message.request && message.request.lead && message.request.lead.fullname) {
|
|
304
316
|
recipient_fullname = message.request.lead.fullname;
|
|
305
317
|
}
|
|
@@ -332,6 +344,7 @@ class Chat21Handler {
|
|
|
332
344
|
}
|
|
333
345
|
*/
|
|
334
346
|
|
|
347
|
+
|
|
335
348
|
return chat21.messages.sendToGroup(message.senderFullname, message.recipient,
|
|
336
349
|
recipient_fullname, message.text, message.sender, attributes, message.type, message.metadata, timestamp)
|
|
337
350
|
.then(function(data){
|
|
@@ -339,7 +352,7 @@ class Chat21Handler {
|
|
|
339
352
|
|
|
340
353
|
|
|
341
354
|
// chat21.conversations.stopTyping(message.recipient,message.sender);
|
|
342
|
-
|
|
355
|
+
|
|
343
356
|
chat21Event.emit('message.sent', data);
|
|
344
357
|
|
|
345
358
|
messageService.changeStatus(message._id, MessageConstants.CHAT_MESSAGE_STATUS.DELIVERED) .then(function(upMessage){
|
|
@@ -563,13 +576,15 @@ class Chat21Handler {
|
|
|
563
576
|
var groupId = request.request_id;
|
|
564
577
|
|
|
565
578
|
var group_name = "Guest";
|
|
566
|
-
|
|
579
|
+
// guest_here
|
|
580
|
+
|
|
567
581
|
if (request.lead && request.lead.fullname) {
|
|
568
582
|
group_name = request.lead.fullname;
|
|
569
583
|
}
|
|
570
584
|
if (request.subject) {
|
|
571
585
|
group_name = request.subject;
|
|
572
586
|
}
|
|
587
|
+
|
|
573
588
|
//TODO racecondition?
|
|
574
589
|
return chat21.groups.create(group_name, members, gAttributes, groupId).then(function(data) {
|
|
575
590
|
winston.verbose("Chat21 group created: " + JSON.stringify(data));
|