@tiledesk/tiledesk-server 2.2.31 → 2.2.34

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 
 
 
+# 2.2.33  -> PROD  
+- Request fulltext sort fix
+
+# 2.2.32
+- Added Arabic language for the widget
+- Updated dependencies with npm update
+- Filter requests by lead email
+
 # 2.2.31 (compatible with: Dashboard 2.2.37, Widget 5.0.25)
 - Fix email template reading from project.
 - Added transcript webpage for users without system messages
@@ -8,10 +16,10 @@
 - Fix ip address resolver
 - Exclude poweredBy field from widget endpoint
 - Bugfix when a conversation has a first_text with \agent
-- Added rasa chatbot chatbot type 
+- Added rasa chatbot chatbot type
 - Added visitor email and fullname in the fulltext index 
 
-# 2.2.30 -> PROD 
+# 2.2.30
 - Log fix
 
 # 2.2.29 

package/config/labels/widget.json

@@ -696,9 +696,7 @@
     },
 
 
-    {
-        "default":false,
-        "_id":"6245d677f3058400357d1091",
+    {       
         "lang":"SR",
         "data":{
            "LABEL_PLACEHOLDER":"откуцај своју поруку..",
@@ -776,7 +774,88 @@
            "LABEL_PRECHAT_ACCEPT_TERMS_PRIVACY":"Слазем се",
            "PRECHAT_REQUIRED_ERROR":"Ово поље је захтевано"
         }
-     }
+     },
+
+
+     {
+     "lang":"AR",
+        "data": {
+            "LABEL_PLACEHOLDER": "اكتب رسالتك ..",
+            "LABEL_START_NW_CONV": "محادثة جديدة",
+            "LABEL_FIRST_MSG": "صِف مشكلتك بعد قليل ، وسيتواصل معك أحد الوكلاء.",
+            "LABEL_FIRST_MSG_NO_AGENTS": "🤔 جميع المشغلين غير متصلين في الوقت الحالي. يمكنك على أي حال وصف مشكلتك. سيتم تعيينه لفريق الدعم الذي سيعود إليك في أقرب وقت ممكن.",
+            "LABEL_FIRST_MSG_OPERATING_HOURS_CLOSED": "🤔 مكاتبنا مغلقة. يمكنك على أي حال وصف مشكلتك. سيتم تعيينه لفريق الدعم الذي سيعود إليك في أقرب وقت ممكن.",
+            "LABEL_SELECT_TOPIC": "اختر عنوانا",
+            "LABEL_COMPLETE_FORM": "أكمل النموذج لبدء محادثة مع الوكيل المتاح التالي.",
+            "LABEL_FIELD_NAME": "اسم",
+            "LABEL_ERROR_FIELD_NAME": "حقل مطلوب (بحد أدنى 5 أحرف).",
+            "LABEL_FIELD_EMAIL": "البريد الإلكتروني",
+            "LABEL_ERROR_FIELD_EMAIL": "أدخل عنوان بريد إلكتروني صالح.",
+            "LABEL_WRITING": "يكتب...",
+            "AGENT_NOT_AVAILABLE": " غير متصل على الانترنت",
+            "AGENT_AVAILABLE": " متصل",
+            "GUEST_LABEL": "زائر",
+            "ALL_AGENTS_OFFLINE_LABEL": "جميع المشغلين غير متصلون في الوقت الحالي",
+            "LABEL_LOADING": "جار التحميل...",
+            "CALLOUT_TITLE_PLACEHOLDER": "🖐 بحاجة الى مساعدة؟",
+            "CALLOUT_MSG_PLACEHOLDER": "انقر هنا وابدأ الدردشة معنا!",
+            "CUSTOMER_SATISFACTION": "رضا العملاء",
+            "YOUR_OPINION_ON_OUR_CUSTOMER_SERVICE": "رأيك في خدمة العملاء لدينا",
+            "DOWNLOAD_TRANSCRIPT": "تنزيل النص",
+            "BACK": "خلف",
+            "YOUR_RATING": "تقييمك",
+            "WRITE_YOUR_OPINION": "أكتب رأيك ... (اختياري)",
+            "SUBMIT": "يُقدِّم",
+            "THANK_YOU_FOR_YOUR_EVALUATION": "شكرا لتقييمك",
+            "YOUR_RATING_HAS_BEEN_RECEIVED": "لقد تم استلام تقييمك",
+            "ALERT_LEAVE_CHAT": "هل تريد مغادرة الدردشة؟",
+            "YES": "نعم",
+            "NO": "لا",
+            "BUTTON_CLOSE_TO_ICON": "تصغير الدردشة",
+            "BUTTON_EDIT_PROFILE": "تحديث الملف",
+            "BUTTON_DOWNLOAD_TRANSCRIPT": "تنزيل النص",
+            "RATE_CHAT": "معدل الدردشة",
+            "WELLCOME_TITLE": "مرحبًا ، مرحبًا بك في Tiledesk 👋",
+            "WELLCOME_MSG": "كيف يمكن أن نساعد؟",
+            "WELLCOME": "أهلا وسهلا",
+            "WELCOME_TITLE": "مرحبًا ، مرحبًا بك في Tiledesk 👋",
+            "WELCOME_MSG": "كيف يمكن أن نساعد؟",
+            "WELCOME": "أهلا وسهلا",
+            "OPTIONS": "والخيارات",
+            "SOUND_OFF": "الصوت مقفل",
+            "SOUND_ON": "الصوت مفعل",
+            "LOGOUT": "تسجيل خروج",
+            "CLOSE": "قريب",
+            "PREV_CONVERSATIONS": "محادثاتك",
+            "YOU": "أنت",
+            "SHOW_ALL_CONV": "عرض الكل",
+            "START_A_CONVERSATION": "بدء محادثة",
+            "NO_CONVERSATION": "لا محادثة",
+            "SEE_PREVIOUS": "انظر السابق",
+            "WAITING_TIME_FOUND": "يرد الفريق عادةً بـ $reply_time",
+            "WAITING_TIME_NOT_FOUND": "سيقوم الفريق بالرد في أقرب وقت ممكن",
+            "CLOSED": "مغلق",
+            "INFO_SUPPORT_USER_ADDED_SUBJECT": "أنت",
+            "INFO_SUPPORT_USER_ADDED_YOU_VERB": "لقد تم اضافتك ",
+            "INFO_SUPPORT_USER_ADDED_COMPLEMENT": "المحادثة",
+            "INFO_SUPPORT_USER_ADDED_VERB": "انضم",
+            "INFO_SUPPORT_CHAT_REOPENED": "تمت إعادة فتح الدردشة",
+            "INFO_SUPPORT_CHAT_CLOSED": "الدردشة مغلقة",
+            "TICKET_TAKING": "تم استلام الطلب ويقوم طاقم المساعدة بالتعامل معه.\nلإضافة المزيد من التعليقات ، قم بالرد على هذا البريد الإلكتروني.",
+            "LABEL_ERROR_FIELD_REQUIRED": "يتطلب حقلا",
+            "SENT_AN_ATTACHMENT": "أرسل مرفقًا",
+            "SENT_AN_IMAGE": "أرسل صورة",
+            "LABEL_PRECHAT_USER_FULLNAME": "الاسم الكامل",
+            "LABEL_PRECHAT_USER_EMAIL": "البريد الإلكتروني",
+            "LABEL_PRECHAT_USER_EMAIL_ERROR": "عنوان البريد الإلكتروني غير صالح",
+            "LABEL_PRECHAT_USER_PHONE": "هاتف",
+            "LABEL_PRECHAT_USER_PHONE_ERROR": "الهاتف مطلوب",
+            "LABEL_PRECHAT_FIRST_MESSAGE": "رسالتك لفريق الدعم",
+            "LABEL_PRECHAT_STATIC_TERMS_PRIVACY": "قبل متابعة المحادثة ، يرجى الموافقة على سياسة الخصوصية الخاصة بشروط <a href='https://tiledesk.com/termsofservice/' target='_blank'></a> و <a href='https://tiledesk.com/privacy.html' target='_blank'></a>",
+            "LABEL_PRECHAT_ACCEPT_TERMS_PRIVACY": "أنا موافق",
+            "PRECHAT_REQUIRED_ERROR": "هذه الخانة مطلوبه"
+        }
+    }
      
     ]
     

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.2.31",
+  "version": "2.2.34",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -49,46 +49,46 @@
   },
   "dependencies": {
     "@tiledesk/tiledesk-chat21-app": "^1.1.4",
-    "@tiledesk/tiledesk-chatbot-util": "^0.8.23",
+    "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",
-    "body-parser": "^1.19.0",
-    "cookie-parser": "~1.4.5",
+    "body-parser": "^1.20.0",
+    "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "csv-express": "^1.2.2",
-    "debug": "^4.3.2",
+    "debug": "^4.3.4",
     "dotenv": "^8.6.0",
-    "email-templates": "^8.0.8",
+    "email-templates": "^8.1.0",
     "eventemitter2": "^6.4.4",
-    "express": "~4.17.1",
+    "express": "^4.17.3",
     "express-ipfilter": "^1.2.0",
-    "express-session": "^1.17.2",
-    "express-validator": "^6.12.1",
+    "express-session": "^1.17.3",
+    "express-validator": "^6.14.2",
     "fast-csv": "^4.3.6",
-    "geoip-lite": "^1.4.2",
+    "geoip-lite": "^1.4.5",
     "handlebars": "^4.7.7",
-    "html-entities": "^2.3.2",
+    "html-entities": "^2.3.3",
     "http": "0.0.0",
-    "immutable": "^4.0.0-rc.14",
+    "immutable": "^4.1.0",
     "jade": "~1.11.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
     "marked": "^3.0.4",
-    "maskdata": "^1.1.6",
+    "maskdata": "^1.1.10",
     "migrate-mongoose": "^4.0.0",
     "mix-hash": "^1.0.7",
-    "moment": "^2.29.1",
+    "moment": "^2.29.3",
     "moment-timezone": "^0.5.33",
-    "mongoose": "^5.13.12",
+    "mongoose": "^5.13.14",
     "mongoose-auto-increment": "^5.0.1",
     "mongoose-sequence": "^5.3.1",
     "morgan": "^1.10.0",
-    "multer": "^1.4.3",
+    "multer": "^1.4.4",
     "multer-gridfs-storage": "^4.2.0",
-    "nanoid": "^3.1.25",
+    "nanoid": "^3.3.4",
     "node-rsa": "^1.1.1",
-    "node-schedule": "^2.0.0",
-    "nodemailer": "^6.6.3",
+    "node-schedule": "^2.1.0",
+    "nodemailer": "^6.7.5",
     "passport": "^0.4.1",
     "passport-http": "^0.3.0",
     "passport-jwt": "^4.0.0",
@@ -100,18 +100,18 @@
     "sharp": "^0.27.2",
     "uniqid": "^5.4.0",
     "uuid": "^3.3.3",
-    "winston": "^3.3.3",
+    "winston": "^3.7.2",
     "winston-mongodb": "^5.0.7",
-    "ws": "^7.5.4"
+    "ws": "^7.5.8"
   },
   "devDependencies": {
-    "chai": "^4.3.4",
+    "chai": "^4.3.6",
     "chai-http": "^4.3.0",
     "chai-string": "^1.5.0",
-    "loadtest": "^5.1.2",
+    "loadtest": "^5.2.0",
     "mocha": "^8.4.0",
     "mongodb-runner": "4.8.3",
-    "nodemon": "^2.0.12",
+    "nodemon": "^2.0.16",
     "sinon": "^9.2.4",
     "sinon-mongoose": "^2.3.0"
   },

package/routes/public-request.js

@@ -49,4 +49,25 @@ var winston = require('../config/winston');
   });
 
 
+  router.get('/:requestid/messages-user.html', function(req, res) {
+  
+    winston.debug(req.params);
+    winston.debug("here");    
+    return Message.find({"recipient": req.params.requestid}).sort({createdAt: 'asc'}).exec(function(err, messages) { 
+      if (err) {
+        return res.status(500).send({success: false, msg: 'Error getting object.'});
+      }
+
+      var messages = messages.filter(m => m.sender != "system" );
+
+      //skip info message
+      if(!messages){
+        return res.status(404).send({success: false, msg: 'Object not found.'});
+      }
+
+      return res.render('messages', { title: 'Tiledesk', messages: messages});
+    });
+
+  });
+
 module.exports = router;

package/routes/request.js

@@ -807,6 +807,11 @@ router.get('/', function (req, res, next) {
     winston.debug('REQUEST ROUTE - QUERY snap_lead_lead_id', query.snap_lead_lead_id);
   }
 
+  if (req.query.snap_lead_email) {
+    query["snapshot.lead.email"] = req.query.snap_lead_email;
+    winston.debug('REQUEST ROUTE - QUERY snap_lead_email', query.snap_lead_email);
+  }
+
   if (req.query.channel) {
     query["channel.name"] =  req.query.channel
     winston.debug('REQUEST ROUTE - QUERY channel', query.channel);
@@ -832,11 +837,21 @@ router.get('/', function (req, res, next) {
 
   winston.verbose('REQUEST ROUTE - REQUEST FIND ', query);
 
+  var projection = undefined;
+
+  if (req.query.full_text) {  
+    winston.info('fulltext projection'); 
+
+    projection = {score: { $meta: "textScore" } };
+  }
   // requestcachefarequi populaterequired
-  var q1 = Request.find(query).
+  var q1 = Request.find(query, projection).
     skip(skip).limit(limit);
 
-   
+
+     
+
+
     winston.debug('REQUEST ROUTE no_populate:' + req.query.no_populate);
 
     if (req.query.no_populate != "true" && req.query.no_populate != true) {        
@@ -857,7 +872,13 @@ router.get('/', function (req, res, next) {
     //   // q1.select({ "snapshot": 1});
     // }
 
-    q1.sort(sortQuery);
+    if (req.query.full_text) {     
+      winston.info('fulltext sort'); 
+      q1.sort( { score: { $meta: "textScore" } } ) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
+    } else {
+      q1.sort(sortQuery);
+    }
+    
 
     // winston.info('q1',q1);
 
@@ -1003,6 +1024,8 @@ router.get('/csv', function (req, res, next) {
 
   winston.debug("sort query", sortQuery);
 
+
+
   winston.debug('REQUEST ROUTE - REQUEST FIND ', query)
     return Request.find(query, '-transcript -status -__v').
     skip(skip).limit(limit).
@@ -1111,7 +1134,6 @@ router.get('/csv', function (req, res, next) {
           // };
           // console.log('REQUEST ROUTE - objectToReturn ', objectToReturn);
           return res.csv(requests, true);
-          // return res.csv([ { name: "joe", id: 1 }])
         });
        
       // });

package/routes/user-request.js

@@ -321,11 +321,16 @@ router.get('/me', function (req, res, next) {
 
   winston.verbose('REQUEST ROUTE - REQUEST FIND ', query);
 
+  if (req.query.full_text) {  
+    winston.info('fulltext projection'); 
+
+    projection = {score: { $meta: "textScore" } };
+  }
   // requestcachefarequi populaterequired
-  var q1 = Request.find(query).
+  var q1 = Request.find(query, projection).
     skip(skip).limit(limit);
 
-   
+
     winston.debug('REQUEST ROUTE no_populate:' + req.query.no_populate);
 
     if (req.query.no_populate != "true" && req.query.no_populate != true) {        
@@ -346,7 +351,12 @@ router.get('/me', function (req, res, next) {
     //   // q1.select({ "snapshot": 1});
     // }
 
-    q1.sort(sortQuery);
+    if (req.query.full_text) {     
+      winston.info('fulltext sort'); 
+      q1.sort( { score: { $meta: "textScore" } } ) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
+    } else {
+      q1.sort(sortQuery);
+    }
 
     // winston.info('q1',q1);
 

package/routes/widget.js

@@ -116,7 +116,7 @@ router.get('/', function(req, res, next) {
 
 
   var getProject = function(req) {
-    winston.info('getProject.');
+    winston.debug('getProject.');
 
     return new Promise(function (resolve, reject) {
 
@@ -130,7 +130,7 @@ router.get('/', function(req, res, next) {
           }
 
           if (project && project.profile && (project.profile.type === 'free' && project.trialExpired === true) || (project.profile.type === 'payment' && project.isActiveSubscription === false)) {
-            winston.info('getProject remove poweredBy tag', project);
+            winston.debug('getProject remove poweredBy tag', project);
             project.widget.poweredBy = undefined;
             project.widget.baloonImage = undefined;            
           }

package/test/labelRoute.js

@@ -219,7 +219,7 @@ describe('LabelRoute', () => {
                                 chai.request(server)
                                         .post('/'+ savedProject._id + '/labels/default/clone')
                                         .auth(email, pwd)
-                                        .send({lang: "AR"})
+                                        .send({lang: "ARR"}) //not exists
                                         .end((err, res) => {
                                             //console.log("res",  res);
                                             console.log("res.body",  res.body);
@@ -227,18 +227,18 @@ describe('LabelRoute', () => {
                                             res.body.should.be.a('object');
                                             // expect(res.body.jwtSecret).to.not.equal(null);                                                                              
                                             expect(res.body.id_project).to.equal(savedProject.id);     
-                                            expect(res.body.data[0].lang).to.equal("AR");          
+                                            expect(res.body.data[0].lang).to.equal("ARR");          
             
             
                                             chai.request(server)
-                                            .get('/'+ savedProject._id + '/labels/AR')
+                                            .get('/'+ savedProject._id + '/labels/ARR')
                                             .auth(email, pwd)
                                             .send()
                                             .end((err, res) => {
                                                 //console.log("res",  res);
                                                 console.log("res.body ar",  res.body);
                                                 expect(res.body.data.LABEL_PLACEHOLDER).to.equal("type your message..");  
-                                                expect(res.body.lang).to.equal("AR");   
+                                                expect(res.body.lang).to.equal("ARR");   
                                                 expect(res.body.default).to.equal(true);     
                                                 done();
                                             });