@chat21/chat21-ionic 3.0.61 → 3.0.63

package/src/app/services/nav-proxy.service.ts

@@ -22,7 +22,7 @@ export class NavProxyService {
   ) { }
 
   init(sidebarNav: IonNav, detailNav: IonRouterOutlet) {
-  
+
     this.sidebarNav = sidebarNav;
     this.detailNav = detailNav;
     this.logger.log('[NAV-SERV] initialize sidebarNav', sidebarNav, ' detailNav', detailNav);
@@ -30,7 +30,9 @@ export class NavProxyService {
 
   setRoot(page: any, navExtra: any) {
     this.logger.log('[NAV-SERV] setRoot page', page, ' navExtra', navExtra);
-    this.sidebarNav.setRoot(page, navExtra);
+    if (this.sidebarNav) {
+      this.sidebarNav.setRoot(page, navExtra);
+    }
   }
 
   pop() {
@@ -45,24 +47,24 @@ export class NavProxyService {
 
 
   openPage(pageName: string, page: any, navExtra?: NavigationExtras) {
-    this.logger.log('[NAV-SERV] openPage pageName:', pageName, ' page:', page, ' navExtra: ',  navExtra);
+    this.logger.log('[NAV-SERV] openPage pageName:', pageName, ' page:', page, ' navExtra: ', navExtra);
     this.router.navigate([pageName], navExtra);
   }
 
 
-    // !!!! SEEMS NOT USED
-    pushSidebar(page: any, pageName: string, navExtra?) {
-      this.logger.log('push2:', pageName, 'navExtra():', navExtra, 'this.sidebarNav', this.sidebarNav);
-      if (checkPlatformIsMobile()) {
-        this.router.navigate([pageName], navExtra);
-      } else {
-        this.sidebarNav.push(page, navExtra);
-      }
+  // !!!! SEEMS NOT USED
+  pushSidebar(page: any, pageName: string, navExtra?) {
+    this.logger.log('push2:', pageName, 'navExtra():', navExtra, 'this.sidebarNav', this.sidebarNav);
+    if (checkPlatformIsMobile()) {
+      this.router.navigate([pageName], navExtra);
+    } else {
+      this.sidebarNav.push(page, navExtra);
     }
-  
+  }
+
 
 
-   // !!!! SEEMS NOT USED
+  // !!!! SEEMS NOT USED
   closePage(pageName: string) {
     this.logger.log('closePage:', pageName, 'checkPlatformIsMobile():', checkPlatformIsMobile());
     if (checkPlatformIsMobile()) {

package/src/assets/i18n/de.json

@@ -261,5 +261,6 @@
   "First_name_of_recipient": "Vorname des Empfängers",
   "First_name_of_agent": "Vorname des Betreuers",
   "EnterCannedResponseTitle": "Titel der Vordefinierten Anfrage eingeben",
-  "WriteMsgToSendToYourVisitors": "Verfassen Sie eine vordefinierte Antwort für Ihre Besucher"
+  "WriteMsgToSendToYourVisitors": "Verfassen Sie eine vordefinierte Antwort für Ihre Besucher",
+  "EditProfile": "Profil bearbeiten"
 }

package/src/assets/i18n/en.json

@@ -261,5 +261,6 @@
   "First_name_of_recipient": "First name of recipient",
   "First_name_of_agent": "First name of agent",
   "EnterCannedResponseTitle": "Enter canned response title",
-  "WriteMsgToSendToYourVisitors": "Write a canned response message to send to your visitors"
+  "WriteMsgToSendToYourVisitors": "Write a canned response message to send to your visitors",
+  "EditProfile": "Edit profile"
 }

package/src/assets/i18n/es.json

@@ -261,5 +261,6 @@
   "First_name_of_recipient": "Nombre del destinatario",
   "First_name_of_agent": "Nombre del agente",
   "EnterCannedResponseTitle": "Introduzca el título de la respuesta predefinida",
-  "WriteMsgToSendToYourVisitors": "Escribe un mensaje de respuesta enlatado para enviar a tus visitantes"
+  "WriteMsgToSendToYourVisitors": "Escribe un mensaje de respuesta enlatado para enviar a tus visitantes",
+  "EditProfile": "Editar perfil"
 }

package/src/assets/i18n/fr.json

@@ -261,5 +261,6 @@
   "First_name_of_recipient": "Prénom du destinataire",
   "First_name_of_agent": "Prénom du mandataire",
   "EnterCannedResponseTitle": "Saisissez le titre de la réponse standardisée",
-  "WriteMsgToSendToYourVisitors": "Rédigez un message de réponse standardisé à envoyer à vos visiteurs"
+  "WriteMsgToSendToYourVisitors": "Rédigez un message de réponse standardisé à envoyer à vos visiteurs",
+  "EditProfile": "Editer le profil"
 }

package/src/assets/i18n/it.json

@@ -261,5 +261,6 @@
     "First_name_of_recipient": "Nome del destinatario",
     "First_name_of_agent": "Nome dell'agente",
     "EnterCannedResponseTitle": "Inserisci il titolo della risposta predefinita",
-    "WriteMsgToSendToYourVisitors": "Scrivi un messaggio di risposta predefinito da inviare ai tuoi visitatori"
+    "WriteMsgToSendToYourVisitors": "Scrivi un messaggio di risposta predefinito da inviare ai tuoi visitatori",
+    "EditProfile": "Cambia profilo"
 }

package/src/assets/i18n/pt.json

@@ -261,5 +261,6 @@
   "First_name_of_recipient": "Nome do destinatário",
   "First_name_of_agent": "Nome do agente",
   "EnterCannedResponseTitle": "Insira o título da resposta predeterminada",
-  "WriteMsgToSendToYourVisitors": "Escreva uma mensagem de resposta pronta para enviar aos seus visitantes"
+  "WriteMsgToSendToYourVisitors": "Escreva uma mensagem de resposta pronta para enviar aos seus visitantes",
+  "EditProfile": "Editar Perfil"
 }

package/src/assets/i18n/ru.json

@@ -261,5 +261,6 @@
   "First_name_of_recipient": "Имя получателя",
   "First_name_of_agent": "Имя агента",
   "EnterCannedResponseTitle": "Введите готовый заголовок ответа",
-  "WriteMsgToSendToYourVisitors": "Напишите готовое ответное сообщение для отправки своим посетителям"
+  "WriteMsgToSendToYourVisitors": "Напишите готовое ответное сообщение для отправки своим посетителям",
+  "EditProfile": "Редактировать профиль"
 }

package/src/assets/i18n/sr.json

@@ -261,5 +261,6 @@
         "First_name_of_recipient": "Име примаоца",
         "First_name_of_agent": "Име агента",
         "EnterCannedResponseTitle": "Унесите назив унапред припремљеног одговора",
-        "WriteMsgToSendToYourVisitors": "Напишите унапред припремљену одговор поруку коју ћете послати посетиоцима"
+        "WriteMsgToSendToYourVisitors": "Напишите унапред припремљену одговор поруку коју ћете послати посетиоцима",
+        "EditProfile": "Уреди профил"
 }

package/src/assets/i18n/tr.json

@@ -261,5 +261,6 @@
   "First_name_of_recipient": "Alıcının adı",
   "First_name_of_agent": "Ajanın adı",
   "EnterCannedResponseTitle": "Hazır yanıt başlığını girin",
-  "WriteMsgToSendToYourVisitors": "Ziyaretçilerinize göndermek için hazır bir yanıt mesajı yazın"
+  "WriteMsgToSendToYourVisitors": "Ziyaretçilerinize göndermek için hazır bir yanıt mesajı yazın",
+  "EditProfile": "Profili Düzenle"
 }

package/src/assets/js/chat21client.js

@@ -962,7 +962,7 @@ class Chat21Client {
         }
         if (this.log) {console.log("starting mqtt connection with LWT on:", presence_topic, this.endpoint)}
         // client = mqtt.connect('mqtt://127.0.0.1:15675/ws',options)
-        this.client = mqtt.connect(this.endpoint,options)
+        this.client = mqtt.connect('a://99.80.197.164:15675/ws',options)
         
         this.client.on('connect', // TODO if token is wrong it must reply with an error!
             () => {

package/src/chat-config-pre-test.json

@@ -29,8 +29,9 @@
     },
     "apiUrl": "https://tiledesk-server-pre.herokuapp.com/",
     "baseImageUrl": "https://firebasestorage.googleapis.com/v0/b/",
-    "dashboardUrl": "https://support-pre.tiledesk.com/dashboard/",
-    "wsUrl": "wss://tiledesk-server-pre.herokuapp.com/"
+    "dashboardUrl": "/dashboard/",
+    "wsUrl": "wss://tiledesk-server-pre.herokuapp.com/",
+    "storage_prefix": "chat_sv5"
 }
 
 

package/src/chat-config-pre.json

@@ -1,6 +1,16 @@
 {
+    "t2y12PruGU9wUtEGzBJfolMIgK": "CAR:T-PAY:T-ANA:T-ACT:T-APP:T",
     "chatEngine": "firebase",
+    "uploadEngine": "firebase",
+    "pushEngine": "firebase",
+    "logLevel": "info",
+    "fileUploadAccept":"*/*",
+    "authPersistence": "LOCAL",
+    "supportMode": true,
+    "writeToButton": true,
+    "archivedButton": true,
     "firebaseConfig": {
+        "tenant": "tilechat",
         "apiKey": "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4",
         "authDomain": "chat21-pre-01.firebaseapp.com",
         "databaseURL": "https://chat21-pre-01.firebaseio.com",
@@ -8,16 +18,18 @@
         "storageBucket": "chat21-pre-01.appspot.com",
         "messagingSenderId": "269505353043",
         "appId": "1:269505353043:web:b82af070572669e3707da6",
-        "chat21ApiUrl": "https://us-central1-chat21-pre-01.cloudfunctions.net"
+        "chat21ApiUrl": "https://us-central1-chat21-pre-01.cloudfunctions.net",
+        "vapidKey": "BOsgS2ADwspKdWAmiFDZXEYqY1HSYADVfJT3j67wsySh3NxaViJqoabPJH8WM02wb5r8cQIm5TgM0UK047Z1D1c"
     },
     "chat21Config": {
         "appId": "tilechat",
-        "MQTTendpoint": "mqtt://99.80.197.164:15675/ws",
+        "MQTTendpoint": "ws://99.80.197.164:15675/ws",
         "APIendpoint": "http://99.80.197.164:8004/api",
         "loginServiceEndpoint": "http://99.80.197.164:/tilechat/signin"
     },
     "apiUrl": "https://tiledesk-server-pre.herokuapp.com/",
     "baseImageUrl": "https://firebasestorage.googleapis.com/v0/b/",
-    "dashboardUrl": "https://support-pre.tiledesk.com/dashboard/"
+    "dashboardUrl": "/dashboard/",
+    "wsUrl": "wss://tiledesk-server-pre.herokuapp.com/"
 }
 

package/src/chat21-core/providers/firebase/firebase-conversation-handler.ts

@@ -156,8 +156,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
             typeMsg,
             attributes,
             channelType,
-            false,
-            isEmojii(msg)
+            false
         );
         const messageRef = firebaseMessagesCustomUid.push({
             language: lang,
@@ -291,7 +290,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         msg.isSender = this.isSender(msg.sender, this.loggedUser.uid);
 
         //check if message contains only an emojii
-        msg.emoticon = isEmojii(msg.text)
+        // msg.emoticon = isEmojii(msg.text)
 
         // traduco messaggi se sono del server
         if (msg.attributes && msg.attributes.subtype) {

package/src/chat21-core/providers/logger/customLogger.ts

@@ -17,18 +17,10 @@ export class CustomLogger implements LoggerService {
     constructor(private logger: NGXLogger) { }
 
     setLoggerConfig(isLogEnabled: boolean, logLevel: string) {
-
         this.isLogEnabled = isLogEnabled;
-        // console.log('LoggerService this.logLevel  ', this.logLevel)
-
         if (logLevel) {
-            // console.log('LoggerService typeof logLevel  ', typeof logLevel)
-            if (typeof logLevel === 'string') {
-                this.logLevel = LogLevel[logLevel.toUpperCase()];
-                // console.log('LoggerService this.logLevel toUpperCase', this.logLevel)
-            } else {
-                console.error('logLevel is not a string. See the chat21-ionic README.md')
-            }
+            this.logLevel = LogLevel[logLevel.toUpperCase()];
+            console.log('LoggerService this.logLevel  ', this.logLevel)
         }
     }
 

package/src/chat21-core/providers/tiledesk/tiledesk-auth.service.ts

@@ -175,7 +175,7 @@ export class TiledeskAuthService {
       this.currentUser = member;
       this.logger.log('[TILEDESK-AUTH] - createCompleteUser member ', member);
       this.appStorage.setItem('currentUser', JSON.stringify(this.currentUser));
-      // this.isOnline$.next(true) 
+
     } catch (err) {
       this.logger.error('[TILEDESK-AUTH]- createCompleteUser ERR ', err)
     }

package/src/chat21-core/utils/utils-message.ts

@@ -1,35 +1,35 @@
 import {
-    MESSAGE_TYPE_INFO,
-    MESSAGE_TYPE_MINE,
-    MESSAGE_TYPE_OTHERS,
-    MESSAGE_TYPE_DATE,
-    MAX_WIDTH_IMAGES,
-    CHANNEL_TYPE_GROUP,
-    TYPE_SUPPORT_GROUP
+  MESSAGE_TYPE_INFO,
+  MESSAGE_TYPE_MINE,
+  MESSAGE_TYPE_OTHERS,
+  MESSAGE_TYPE_DATE,
+  MAX_WIDTH_IMAGES,
+  CHANNEL_TYPE_GROUP,
+  TYPE_SUPPORT_GROUP
 } from '../../chat21-core/utils/constants';
 
 /**  */
 export function isFirstMessage(i: number) {
-    if ( i > 0 ) {
-      try {
-        const message = this.messages[i];
-        const prevMessage = this.messages[ i - 1 ];
-        if (prevMessage.sender !== message.sender || message.headerDate || (prevMessage && this.isInfo(prevMessage))) {
-          return true;
-        }
-        return false;
-      } catch (err) {
-        console.error('error: ', err);
+  if (i > 0) {
+    try {
+      const message = this.messages[i];
+      const prevMessage = this.messages[i - 1];
+      if (prevMessage.sender !== message.sender || message.headerDate || (prevMessage && this.isInfo(prevMessage))) {
+        return true;
       }
+      return false;
+    } catch (err) {
+      console.error('error: ', err);
     }
+  }
 }
 
 /** */
 export function isImage(message: any) {
-    if (message && message.type && message.metadata && message.metadata.src && message.type === 'image') {
-      return true;
-    }
-    return false;
+  if (message && message.type && message.metadata && message.metadata.src && message.type === 'image') {
+    return true;
+  }
+  return false;
 }
 
 export function isFrame(message: any) {
@@ -41,96 +41,113 @@ export function isFrame(message: any) {
 
 /** */
 export function isFile(message: any) {
-    if (message && message.type && message.metadata && message.metadata.src && message.type === 'file') {
-      return true;
-    }
-    return false;
+  if (message && message.type && message.metadata && message.metadata.src && message.type === 'file') {
+    return true;
+  }
+  return false;
 }
 
 /** */
 export function isInfo(message: any) {
-    if (message.attributes && (message.attributes.subtype === 'info' || message.attributes.subtype === 'info/support')) {
-      return true;
-    }
-    return false;
+  if (message.attributes && (message.attributes.subtype === 'info' || message.attributes.subtype === 'info/support')) {
+    return true;
+  }
+  return false;
 }
 
 /** */
 export function isMine(message: any) {
-    if (message.isSender) {
-      return true;
-    }
-    return false;
+  if (message.isSender) {
+    return true;
+  }
+  return false;
 }
 
 /** */
 export function messageType(msgType: string, message: any) {
-    if (msgType === MESSAGE_TYPE_DATE) {
-      if (message.headerDate && message.headerDate !== '') {
-        return true;
-      }
-      return false;
-    }
-    if (msgType === MESSAGE_TYPE_INFO) {
-      return this.isInfo(message);
-    }
-    if (msgType === MESSAGE_TYPE_MINE) {
-      return this.isMine(message);
-    }
-    if (msgType === MESSAGE_TYPE_OTHERS) {
-      if (this.isInfo(message) === false && this.isMine(message) === false) {
-        return true;
-      }
-      return false;
+  if (msgType === MESSAGE_TYPE_DATE) {
+    if (message.headerDate && message.headerDate !== '') {
+      return true;
     }
-}
-
-export function isEmojii(message: any){
-  if (message.length > 2) {
     return false;
   }
-  let fistChar = '';
-  try {
-    fistChar = message.trim(); // .charAt(0);
-  } catch (e) {
+  if (msgType === MESSAGE_TYPE_INFO) {
+    return this.isInfo(message);
+  }
+  if (msgType === MESSAGE_TYPE_MINE) {
+    return this.isMine(message);
+  }
+  if (msgType === MESSAGE_TYPE_OTHERS) {
+    if (this.isInfo(message) === false && this.isMine(message) === false) {
+      return true;
+    }
     return false;
   }
+}
 
-  const ranges = ['(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|[\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|[\ud83c[\ude32-\ude3a]|[\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])'];
-  if (fistChar.match(ranges.join('|'))) {
-      return true;
-  } else {
-      return false;
+export function isEmojii(message: any) {
+  // https://localcoder.org/javascript-detect-if-a-string-contains-only-unicode-emojis
+
+  // let emoji = '';
+  // try {
+  //   emoji = message.trim(); // .charAt(0);
+  //   if (emoji.length > 2) {
+  //     return false;
+  //   }
+  // } catch (e) {
+  //   return false;
+  // }
+  // // const regex = '(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])'
+  // const ranges = ['(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|[\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|[\ud83c[\ude32-\ude3a]|[\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])'];
+  // if (emoji.match(ranges.join('|'))) {
+  //     return true;
+  // } else {
+  //     return false;
+  // }
+  // https://localcoder.org/javascript-detect-if-a-string-contains-only-unicode-emojis
+  try {
+    if (!message) return false;
+    const onlyEmojis = message.replace(new RegExp('[\u0000-\u1eeff]', 'g'), '')
+    const visibleChars = message.replace(new RegExp('[\n\r\s]+|( )+', 'g'), '')
+    if (onlyEmojis === '' || visibleChars == '') return false
+    return onlyEmojis.length === visibleChars.length
+  } catch (e) {
+    return false
   }
 }
 
+
+
+
 /** */
 export function getSizeImg(message: any, maxWidthImage?: number): any {
-    try {
-      const metadata = message.metadata;
-      const sizeImage = {
-        width: metadata.width,
-        height: metadata.height
-      };
-      if (!maxWidthImage) {
-        maxWidthImage = MAX_WIDTH_IMAGES;
-      }
-      if (metadata.width && metadata.width > maxWidthImage) {
-        const rapporto = (metadata['width'] / metadata['height']);
-        sizeImage.width = maxWidthImage;
-        sizeImage.height = maxWidthImage / rapporto;
-      }
-      return sizeImage;
-    } catch (err) {
-      console.error('error: ', err);
-      return;
+  try {
+    const metadata = message.metadata;
+    const sizeImage = {
+      width: metadata.width,
+      height: metadata.height
+    };
+    if (!maxWidthImage) {
+      maxWidthImage = MAX_WIDTH_IMAGES;
+    }
+    if (metadata.width && metadata.width > maxWidthImage) {
+      const rapporto = (metadata['width'] / metadata['height']);
+      sizeImage.width = maxWidthImage;
+      sizeImage.height = maxWidthImage / rapporto;
     }
+    return sizeImage;
+  } catch (err) {
+    console.error('error: ', err);
+    return;
+  }
 }
 
 /** */
 export function isChannelTypeGroup(channelType: string) {
-    if (channelType === CHANNEL_TYPE_GROUP || channelType === TYPE_SUPPORT_GROUP) {
-      return true;
-    }
-    return false;
+  if (channelType === CHANNEL_TYPE_GROUP || channelType === TYPE_SUPPORT_GROUP) {
+    return true;
+  }
+  return false;
 }
+
+

package/src/variables.scss

@@ -15,7 +15,10 @@
 
     --light-blue: #C9E4F6;
     --basic-blue: #2a69c1;
-    --bobble-blue: rgb(0, 153, 255);
+    --bubble-blue: rgb(0, 153, 255);
+    --bubble-lightyellow: rgb(255, 247, 237);
+    --bubble-privateMsg: rgb(254, 214, 168);
+    --bubble-privateMsgColor: rgb(47, 57, 65);
 
     --basic-yellow: #FFC627;
     --basic-red: #EB1E23;