@chat21/chat21-ionic 3.0.90-rc.3 → 3.0.90-rc.4

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # chat21-ionic ver 3.0
 
+### 3.0.90-rc.4
+- added: splitMessage in MQTTConversationHandler service
+- changed: aligned FirebaseConversationHandler service to widget
+- removed: MESSAGE_TYPE_DATE
+
 ### 3.0.90-rc.3
 - added: options menu and popover on click to show copy, canned and Json response options 
 - changed: icon-button moved outside bubble-message only for the first message of each sender

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.0.90-rc.3",
+    "version": "3.0.90-rc.4",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

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

@@ -10,7 +10,6 @@ export class MessageModel {
         public metadata: any,
         public text: string,
         public timestamp: any,
-        //public headerDate: string,
         public type: string,
         public attributes: any,
         public channel_type: string,

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

@@ -99,7 +99,10 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         this.ref = firebaseMessages.orderByChild('timestamp').limitToLast(100);
         this.ref.on('child_added', (childSnapshot) => {
             that.logger.debug('[FIREBASEConversationHandlerSERVICE] >>>>>>>>>>>>>> child_added: ', childSnapshot.val())
-            that.added(childSnapshot);
+            const msg: MessageModel = childSnapshot.val();        
+            msg.uid = childSnapshot.key;
+
+            that.addedNew(msg);
         });
         this.ref.on('child_changed', (childSnapshot) => {
             that.logger.debug('[FIREBASEConversationHandlerSERVICE] >>>>>>>>>>>>>> child_changed: ', childSnapshot.val())
@@ -253,6 +256,23 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         this.messageAdded.next(msg);
     }
 
+    private addedNew(message:MessageModel){
+        const msg = this.messageCommandGenerate(message);
+        if(this.isValidMessage(msg)){
+            if (this.skipMessage && messageType(MESSAGE_TYPE_INFO, msg)) {
+                return;
+            }
+            if(!this.skipMessage && messageType(MESSAGE_TYPE_INFO, msg)) {
+                this.messageInfo.next(msg)
+            }
+            this.addRepalceMessageInArray(msg.uid, msg);
+            this.messageAdded.next(msg);
+        } else {
+            this.logger.error('[FIREBASEConversationHandlerSERVICE] ADDED::message with uid: ', msg.uid, 'is not valid')
+        }
+        
+    }
+
     /** */
     private changed(childSnapshot: any) {
         const msg = this.messageGenerate(childSnapshot);
@@ -298,16 +318,34 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         // msg.emoticon = isEmojii(msg.text)
 
         // traduco messaggi se sono del server
-        if (msg.attributes && msg.attributes.subtype) {
-            if (msg.attributes.subtype === 'info' || msg.attributes.subtype === 'info/support') {
-                this.translateInfoSupportMessages(msg);
-            }
+        if (messageType(MESSAGE_TYPE_INFO, msg)) {
+            this.translateInfoSupportMessages(msg);
         }
-        /// commented because NOW ATTRIBUTES COMES FROM OUTSIDE 
-        // if (msg.attributes && msg.attributes.projectId) {
-        //     this.attributes.projectId = msg.attributes.projectId;
-        //     // sessionStorage.setItem('attributes', JSON.stringify(attributes));
+        return msg;
+    }
+
+    private messageCommandGenerate(message:MessageModel){
+        const msg: MessageModel = message;
+        if(msg.text) msg.text = msg.text.trim(); //remove black msg with only spaces
+        // controllo fatto per i gruppi da rifattorizzare
+        if (!msg.sender_fullname || msg.sender_fullname === 'undefined') {
+            msg.sender_fullname = msg.sender;
+        }
+        // bonifico messaggio da url
+        // if (msg.type === 'text') {
+        //     msg.text = htmlEntities(msg.text)
+        //     msg.text = replaceEndOfLine(msg.text)
         // }
+        
+        // verifico che il sender è il logged user
+        msg.isSender = this.isSender(msg.sender, this.loggedUser.uid);
+        //check if message contains only an emojii
+        // msg.emoticon = isEmojii(msg.text)
+
+        // traduco messaggi se sono del server
+        if (messageType(MESSAGE_TYPE_INFO, msg)) {
+            this.translateInfoSupportMessages(msg);
+        }
         return msg;
     }
 
@@ -377,13 +415,13 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === LEAD_UPDATED)) {
             message.text = INFO_SUPPORT_LEAD_UPDATED;
         } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === MEMBER_LEFT_GROUP)) {
-           let subject: string;
-           if (message.attributes.messagelabel.parameters.fullname) {
-               subject = message.attributes.messagelabel.parameters.fullname;
-           }else{
-               subject = message.attributes.messagelabel.parameters.member_id;
-           }
-           message.text = subject + ' ' +  INFO_SUPPORT_MEMBER_LEFT_GROUP ;
+            let subject: string;
+            if (message.attributes.messagelabel.parameters.fullname) {
+                subject = message.attributes.messagelabel.parameters.fullname;
+            }else{
+                subject = message.attributes.messagelabel.parameters.member_id;
+            }
+            message.text = subject + ' ' +  INFO_SUPPORT_MEMBER_LEFT_GROUP ;
         }
     }
 
@@ -443,4 +481,35 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
             }
         });
     }
+
+    private isValidMessage(msgToCkeck:MessageModel): boolean{
+        // console.log('message to check-->', msgToCkeck)
+        // if(!this.isValidField(msgToCkeck.uid)){
+        //     return false;
+        // }
+        // if(!this.isValidField(msgToCkeck.sender)){
+        //     return false;
+        // }
+        // if(!this.isValidField(msgToCkeck.recipient)){
+        //     return false;
+        // }
+        // if(!this.isValidField(msgToCkeck.type)){
+        //     return false;
+        // }else if (msgToCkeck.type === "text" && !this.isValidField(msgToCkeck.text)){
+        //     return false;
+        // } else if ((msgToCkeck.type === "image" || msgToCkeck.type === "file") && !this.isValidField(msgToCkeck.metadata) && !this.isValidField(msgToCkeck.metadata.src)){
+        //     return false
+        // }
+
+
+        return true
+    }
+
+    /**
+     *
+     * @param field
+     */
+    private isValidField(field: any): boolean {
+        return (field === null || field === undefined) ? false : true;
+    }
 }

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

@@ -99,7 +99,10 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         }
         this.chat21Service.chatClient.lastMessages(this.conversationWith, (err, messages) => {
             if (!err) {
-                messages.forEach(msg => {
+                messages.forEach(message => {
+                    const msg: MessageModel = message;        
+                    msg.uid = message.message_id;
+
                     this.addedMessage(msg);
                 });
             }
@@ -107,7 +110,10 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         const handler_message_added = this.chat21Service.chatClient.onMessageAddedInConversation(
             this.conversationWith, (message, topic) => {
                 this.logger.log('[MQTTConversationHandler] message added:', message, 'on topic:', topic);
-                this.addedMessage(message);
+                const msg: MessageModel = message;        
+                msg.uid = message.message_id;
+
+                this.addedMessage(msg);
         });
         const handler_message_updated = this.chat21Service.chatClient.onMessageUpdatedInConversation(
             this.conversationWith,  (message, topic) => {
@@ -231,20 +237,14 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     /** */
     private addedMessage(messageSnapshot: any) {
         const msg = this.messageGenerate(messageSnapshot);
-        msg.uid = msg.message_id;
+        
         if(this.skipInfoMessage && messageType(MESSAGE_TYPE_INFO, msg)){
             return;
         }
         if(!this.skipInfoMessage && messageType(MESSAGE_TYPE_INFO, msg)){
             this.messageInfo.next(msg)
         }
-        // imposto il giorno del messaggio per visualizzare o nascondere l'header data
-        msg.headerDate = null;
-        const headerDate = setHeaderDate(this.translationMap, msg.timestamp);
-        if (headerDate !== this.lastDate) {
-            this.lastDate = headerDate;
-            msg.headerDate = headerDate;
-        }
+
         this.logger.log('[MQTTConversationHandler] adding message:' + JSON.stringify(msg));
         // this.logger.log('childSnapshot.message_id:' + msg.message_id);
         // this.logger.log('childSnapshot.key:' + msg.key);
@@ -287,7 +287,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         // const msg: MessageModel = childSnapshot.val();
         this.logger.log("[MQTTConversationHandler] childSnapshot >" + JSON.stringify(childSnapshot));
         const msg = childSnapshot;
-        msg.uid = childSnapshot.key;
+        // msg.uid = childSnapshot.key;
         msg.text = msg.text.trim() //remove black msg with only spaces
         // controllo fatto per i gruppi da rifattorizzare
         if (!msg.sender_fullname || msg.sender_fullname === 'undefined') {
@@ -301,10 +301,8 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         this.logger.log("[MQTTConversationHandler] ****>msg.sender:" + msg.sender);
         msg.isSender = this.isSender(msg.sender, this.loggedUser.uid);
         // traduco messaggi se sono del server
-        if (msg.attributes && msg.attributes.subtype) {
-            if (msg.attributes.subtype === 'info' || msg.attributes.subtype === 'info/support') {
-                this.translateInfoSupportMessages(msg);
-            }
+        if (messageType(MESSAGE_TYPE_INFO, msg)) {
+            this.translateInfoSupportMessages(msg);
         }
         return msg;
     }

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

@@ -61,7 +61,6 @@ export const TYPE_POPUP_DETAIL_MESSAGE = 'DETAIL_MESSAGE';
 export const MESSAGE_TYPE_INFO = 'INFO';
 export const MESSAGE_TYPE_MINE = 'MINE';
 export const MESSAGE_TYPE_OTHERS = 'OTHERS';
-export const MESSAGE_TYPE_DATE = 'DATE';
 
 export const CHAT_REOPENED = 'CHAT_REOPENED';
 export const CHAT_CLOSED = 'CHAT_CLOSED';

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

@@ -2,7 +2,6 @@ import {
   MESSAGE_TYPE_INFO,
   MESSAGE_TYPE_MINE,
   MESSAGE_TYPE_OTHERS,
-  MESSAGE_TYPE_DATE,
   MAX_WIDTH_IMAGES,
   CHANNEL_TYPE_GROUP,
   TYPE_SUPPORT_GROUP
@@ -65,12 +64,7 @@ export function isMine(message: any) {
 
 /** */
 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 isInfo(message);
   }

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

@@ -187,6 +187,9 @@ export function setHeaderDate_old(translate, timestamp, lastDate?): string {
   }
 }
 
+/**
+ * @deprecated
+ */
 export function setHeaderDate(translate, timestamp): string {
   // const LABEL_TODAY = translate.get('LABEL_TODAY');
   // const LABEL_TOMORROW = translate.get('LABEL_TOMORROW');