@chat21/chat21-ionic 3.0.63 → 3.0.64-rc1

package/src/app/pages/loader-preview/loader-preview.module.ts

@@ -7,7 +7,6 @@ import { LoaderPreviewPage } from './loader-preview.page';
 import { TranslateLoader, TranslateModule} from '@ngx-translate/core';
 import { createTranslateLoader } from '../../../chat21-core/utils/utils';
 import { HttpClient } from '@angular/common/http';
-import { SafeHtmlPipe } from 'src/app/directives/safe-html.pipe';
 
 
 @NgModule({
@@ -24,6 +23,6 @@ import { SafeHtmlPipe } from 'src/app/directives/safe-html.pipe';
       }
     })
   ],
-  declarations: [LoaderPreviewPage, SafeHtmlPipe]
+  declarations: [LoaderPreviewPage]
 })
 export class LoaderPreviewPageModule {}

package/src/app/shared/shared.module.ts

@@ -1,3 +1,4 @@
+import { HtmlComponent } from './../chatlib/conversation-detail/message/html/html.component';
 import { BubbleOthersMessageComponent } from './../components/conversation-detail/bubble-others-message/bubble-others-message.component';
 
 import { TextComponent } from '../chatlib/conversation-detail/message/text/text.component';
@@ -46,6 +47,7 @@ import { DefaultTooltipOptions } from 'src/chat21-core/utils/utils';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { SafeHtmlPipe } from '../directives/safe-html.pipe';
 
 // import { MessageTextAreaComponent } from '../components/conversation-detail/message-text-area/message-text-area.component'; // MessageTextAreaComponent is part of the declarations ConversationDetailPageModule
 
@@ -75,6 +77,7 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
     InfoMessageComponent,
     ReturnReceiptComponent,
     TextComponent,
+    HtmlComponent,
     BubbleDayMessageComponent,
     BubbleSystemMessageComponent,
     BubbleMyMessageComponent,
@@ -87,6 +90,7 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
     MarkedPipe,
     AutofocusDirective,
     HtmlEntitiesEncodePipe,
+    SafeHtmlPipe,
     OptionHeaderComponent
   ],
   exports: [

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('a://99.80.197.164:15675/ws',options)
+        this.client = mqtt.connect(this.endpoint,options)
         
         this.client.on('connect', // TODO if token is wrong it must reply with an error!
             () => {

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-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/utils/utils-message.ts

@@ -85,9 +85,8 @@ export function messageType(msgType: string, message: any) {
   }
 }
 
-export function isEmojii(message: any) {
-  // https://localcoder.org/javascript-detect-if-a-string-contains-only-unicode-emojis
-
+export function isEmojii(message: any){
+  
   // let emoji = '';
   // try {
   //   emoji = message.trim(); // .charAt(0);
@@ -106,12 +105,12 @@ export function isEmojii(message: any) {
   // }
   // https://localcoder.org/javascript-detect-if-a-string-contains-only-unicode-emojis
   try {
-    if (!message) return false;
+    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
+    if(onlyEmojis === '' || visibleChars == '') return false
     return onlyEmojis.length === visibleChars.length
-  } catch (e) {
+  } catch(e) {
     return false
   }
 }