@chat21/chat21-ionic 3.0.62-rc2 → 3.0.64-rc1

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/chat-config-pre-test.json

@@ -30,7 +30,8 @@
     "apiUrl": "https://tiledesk-server-pre.herokuapp.com/",
     "baseImageUrl": "https://firebasestorage.googleapis.com/v0/b/",
     "dashboardUrl": "/dashboard/",
-    "wsUrl": "wss://tiledesk-server-pre.herokuapp.com/"
+    "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/models/conversation.ts

@@ -15,7 +15,7 @@ export class ConversationModel {
     public senderAuthInfo: any,
     public sender_fullname: string,
     public status: string,
-    public timestamp: string,
+    public timestamp: number,
     public time_last_message: string,
     public selected: boolean,
     public color: string,

package/src/chat21-core/providers/abstract/conversations-handler.service.ts

@@ -29,7 +29,7 @@ export abstract class ConversationsHandlerService {
   // functions
   abstract initialize(tenant: string, userId: string, translationMap: Map<string, string>): void;
   // abstract connect(): void;
-  abstract subscribeToConversations(callback: any): void;
+  abstract subscribeToConversations(lastConversatioTimestamp: number, callback: any): void;
   abstract countIsNew(): number;
   abstract setConversationRead(conversationId: string): void;
   abstract dispose(): void;

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/firebase/firebase-conversations-handler.ts

@@ -114,21 +114,62 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
     // ---------------------------------------------------------------------------------
     // New connect - renamed subscribeToConversation
     //----------------------------------------------------------------------------------
-    subscribeToConversations(callback) {
+    subscribeToConversations(lastConversationTimestamp: number, callback) {
         const that = this;
         const urlNodeFirebase = conversationsPathForUserId(this.tenant, this.loggedUserId);
         this.logger.debug('[FIREBASEConversationsHandlerSERVICE] SubscribeToConversations conversations::ACTIVE urlNodeFirebase', urlNodeFirebase)
         this.ref = firebase.database().ref(urlNodeFirebase).orderByChild('timestamp').limitToLast(200);
-        this.ref.on('child_changed', (childSnapshot) => {
+        
+        // this.ref.once('value').then(snapshot => {
+        //     snapshot.forEach(childSnapshot => {
+        //         const childData: ConversationModel = childSnapshot.val();
+        //         childData.uid = childSnapshot.key
+        //         that.added(childData)
+        //         lastConversationTimestamp = childData.timestamp
+        //     });
+            
+        //     callback(that.conversations)
+        //     return lastConversationTimestamp
+        // }).then((timestamp)=> {
+        //     console.log('timestampppppp',timestamp)
+        //     this.ref.startAt(timestamp).on('child_changed', (childSnapshot) => {
+        //         const conv: ConversationModel = childSnapshot.val();
+        //         conv.uid = childSnapshot.key
+        //         that.changed(conv);
+        //     });
+        //     this.ref.startAt(timestamp).on('child_removed', (childSnapshot) => {
+        //         const conv: ConversationModel = childSnapshot.val();
+        //         conv.uid = childSnapshot.key
+        //         that.removed(conv);
+        //     });
+        //     this.ref.startAt(timestamp).on('child_added', (childSnapshot) => {
+        //         const conv: ConversationModel = childSnapshot.val();
+        //         console.log('addedddd', conv)
+        //         conv.uid = childSnapshot.key
+        //         that.added(conv);
+        //     });
+        // });
+        // this.ref.on('value', (snaps) => {
+        //     if(snaps){
+        //         console.log('convvvvvv', snaps.val(), snaps.val().length)
+        //         for(let item=0; item<snaps.val().length; item++){
+        //             that.added(snaps.val()[item])
+        //         }
+        //         callback(this.conversations)
+        //     }
+        // })
+        this.ref.startAt(lastConversationTimestamp).on('child_changed', (childSnapshot) => {
             that.changed(childSnapshot);
         });
-        this.ref.on('child_removed', (childSnapshot) => {
+        this.ref.startAt(lastConversationTimestamp).on('child_removed', (childSnapshot) => {
             that.removed(childSnapshot);
         });
-        this.ref.on('child_added', (childSnapshot) => {
+        this.ref.startAt(lastConversationTimestamp).on('child_added', (childSnapshot) => {
             that.added(childSnapshot);
         });
 
+        
+
         setTimeout(() => {
             callback()
         }, 2000);
@@ -339,7 +380,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         childData.uid = childSnapshot.key;
         const conversation = this.completeConversation(childData);
         if (this.isValidConversation(conversation)) {
-            this.setClosingConversation(childSnapshot.key, false);
+            this.setClosingConversation(conversation.uid, false);
             const index = searchIndexInArrayForUid(this.conversations, conversation.uid);
             if (index > -1) {
                 this.conversations.splice(index, 1, conversation);
@@ -477,25 +518,25 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
             conversation_with = conv.recipient;
             conversation_with_fullname = conv.recipient_fullname;
             conv.sender_fullname = this.translationMap.get('YOU')
-
             // conv.last_message_text = YOU + conv.last_message_text;
             // } else if (conv.channel_type === TYPE_GROUP) {
         } else if (isGroup(conv)) {
             // conversation_with_fullname = conv.sender_fullname;
             // conv.last_message_text = conv.last_message_text;
             conversation_with = conv.recipient;
-            conversation_with_fullname = conv.recipient_fullname;
+            // conversation_with_fullname = conv.recipient_fullname;
+            conversation_with_fullname = this.changeSenderFullName(conv)
         }
         if (conv.attributes && conv.attributes.subtype) {
             if (conv.attributes.subtype === 'info' || conv.attributes.subtype === 'info/support') {
                 this.translateInfoSupportMessages(conv);
             }
         }
-
+        // Fixes the bug: if a snippet of code is pasted and sent it is not displayed correctly in the convesations list
+        // conv.time_last_message = this.getTimeLastMessage(conv.timestamp);
         conv.conversation_with = conversation_with;
         conv.conversation_with_fullname = conversation_with_fullname;
         conv.status = this.setStatusConversation(conv.sender, conv.uid);
-        // conv.time_last_message = this.getTimeLastMessage(conv.timestamp); // evaluate if is used
         conv.avatar = avatarPlaceholder(conversation_with_fullname);
         conv.color = getColorBck(conversation_with_fullname);
         //conv.image = this.imageRepo.getImagePhotoUrl(conversation_with);
@@ -504,6 +545,21 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
     }
 
 
+    /**BUG-FIX: on Conversation-list, when conversation start, it continuosly change the sender_fullname info from Guest to others name */
+    private changeSenderFullName(conversation: ConversationModel): string {
+        let old_conv = this.conversations.find(conv => conv.uid === conversation.uid)
+        let conversation_with_fullname = conversation.recipient_fullname
+        if(old_conv){
+            if(conversation.recipient_fullname !== old_conv.recipient_fullname && conversation.recipient_fullname !== 'Guest '){
+                conversation_with_fullname = conversation.recipient_fullname
+            } else {
+                // conversation_with_fullname=  old_conv.recipient_fullname
+                conversation_with_fullname=  old_conv.conversation_with_fullname
+              } 
+        }
+        return conversation_with_fullname
+    }
+
     translateInfoSupportMessages(conv) {
         const INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU = this.translationMap.get('INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU');
         // console.log('[FIREBASEConversationsHandlerSERVICE] INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU', INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU) 

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,112 @@ 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){
+  
+  // 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;