@chat21/chat21-ionic 3.0.97-rc.4 → 3.0.97

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

@@ -22,8 +22,9 @@ import { AppConfigProvider } from 'src/app/services/app-config';
 // utils
 import { avatarPlaceholder, getColorBck } from '../../utils/utils-user';
 import { compareValues, conversationsPathForUserId, searchIndexInArrayForUid, isGroup } from '../../utils/utils';
-import { TOUCHING_OPERATOR } from '../../utils/constants';
+import { MESSAGE_TYPE_INFO, TOUCHING_OPERATOR } from '../../utils/constants';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
+import { messageType } from 'src/chat21-core/utils/utils-message';
 
 
 // @Injectable({ providedIn: 'root' })
@@ -517,6 +518,10 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
 
     private changed(childSnapshot: any) {
         const oldConversation = this.conversations[searchIndexInArrayForUid(this.conversations, childSnapshot.key)]
+        //skip info message updates
+        if(messageType(MESSAGE_TYPE_INFO, oldConversation) ){
+            return;
+        }
         if (this.conversationGenerate(childSnapshot)) {
             const index = searchIndexInArrayForUid(this.conversations, childSnapshot.key);
             if (index > -1) {

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

@@ -23,6 +23,7 @@ import {
   searchIndexInArrayForUid,
   conversationMessagesRef
 } from '../../utils/utils';
+import { v4 as uuidv4 } from 'uuid';
 import { isSender, messageType } from '../../utils/utils-message';
 
 
@@ -111,7 +112,13 @@ export class MQTTConversationHandler extends ConversationHandlerService {
             this.conversationWith, (message, topic) => {
                 this.logger.log('[MQTTConversationHandler] message added:', message, 'on topic:', topic);
                 const msg: MessageModel = message;        
-                msg.uid = message.message_id;
+                
+                //allow to replace message in unknown status (pending status: '0')
+                if(message.attributes && message.attributes.tempUID){
+                    msg.uid = message.attributes.tempUID;
+                }else{
+                    msg.uid = message.message_id
+                }
 
                 this.addedMessage(msg);
         });
@@ -170,6 +177,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         const recipientFullname = conversationWithFullname;
         const recipientId = conversationWith;
         attributes.lang = language;
+        attributes.tempUID = uuidv4(); //allow to show message in a pending status
         this.chat21Service.chatClient.sendMessage(
             msg,
             typeMsg,
@@ -189,6 +197,25 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                 }
             }
         );
+
+        const message = new MessageModel(
+            attributes.tempUID, //allow to show message in a pending status 
+            language,
+            conversationWith,
+            recipientFullname,
+            sender,
+            senderFullname,
+            0,
+            metadataMsg,
+            msg,
+            Date.now(),
+            typeMsg,
+            attributes,
+            channelType,
+            false
+        );
+        this.addedMessage(message) //allow to show message in a pending status: add pending message in array of messages
+
         return new MessageModel(
             '',
             language,
@@ -402,7 +429,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
      */
     private updateMessageStatusReceived(msg) {
         this.logger.log('[MQTTConversationHandler] updateMessageStatusReceived', msg);
-        if (msg['status'] < MSG_STATUS_RECEIVED) {
+        if (msg['status'] < MSG_STATUS_RECEIVED && msg['status'] > 0) {
             this.logger.log('[MQTTConversationHandler] status ', msg['status'], ' < (RECEIVED:200)', MSG_STATUS_RECEIVED);
             if (msg.sender !== this.loggedUser.uid && msg.status < MSG_STATUS_RECEIVED) {
                 this.logger.log('[MQTTConversationHandler] updating message with status received');

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

@@ -17,6 +17,8 @@ import { compareValues, conversationsPathForUserId, searchIndexInArrayForUid } f
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
+import { messageType } from 'src/chat21-core/utils/utils-message';
+import { MESSAGE_TYPE_INFO } from 'src/chat21-core/utils/constants';
 // import { ImageRepoService } from '../abstract/image-repo.service';
 // import { ConsoleReporter } from 'jasmine';
 
@@ -251,6 +253,13 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         if (!conversation.conversation_with) {
             conversation.conversation_with = conversation.conversWith // conversWith comes from remote
         }
+
+        //skip info message updates
+        if(messageType(MESSAGE_TYPE_INFO, conversation) ){
+            return;
+        }
+        
+
         const index = searchIndexInArrayForUid(this.conversations, conversation.conversation_with);
         const oldConversation = this.conversations[index]
         if (index > -1) {

package/src/chat-config-mqtt-localhost.json

@@ -1,35 +0,0 @@
-{
-    "t2y12PruGU9wUtEGzBJfolMIgK": "CAR:T-PAY:T-ANA:T-ACT:T-APP:T",
-    "chatEngine": "mqtt",
-    "uploadEngine": "native",
-    "pushEngine": "none",
-    "fileUploadAccept": "*/*",
-    "firebaseConfig": {
-        "apiKey": "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4",
-        "authDomain": "chat21-pre-01.firebaseapp.com",
-        "databaseURL": "https://chat21-pre-01.firebaseio.com",
-        "projectId": "chat21-pre-01",
-        "storageBucket": "chat21-pre-01.appspot.com",
-        "messagingSenderId": "269505353043",
-        "appId": "1:269505353043:web:b82af070572669e3707da6",
-        "chat21ApiUrl": "https://us-central1-chat21-pre-01.cloudfunctions.net",
-        "tenant":"tilechat"
-    },
-    "chat21Config": {
-        "appId": "tilechat",
-        "MQTTendpoint": "ws://localhost:15675/ws",
-        "APIendpoint": "http://localhost:8004/api",
-        "_log": true
-    },
-    "apiUrl": "http://localhost:3000/",
-    "baseImageUrl": "http://localhost:3000/",
-    "dashboardUrl": "http://localhost:8081/",
-    "testsiteBaseUrl": "http://localhost:8081/widget/assets/twp/index.html",
-    "logLevel": "DEBUG",
-    "authPersistence": "LOCAL",
-    "supportMode": true,
-    "archivedButton": true,
-    "writeToButton": true,
-    "wsUrl": "ws://localhost:8081/ws/",
-    "showInfoMessage":"MEMBER_JOINED_GROUP,TOUCHING_OPERATOR"
-}

package/src/chat-config-mqtt.json

@@ -1,26 +0,0 @@
-{
-    "chatEngine": "mqtt",
-    "uploadEngine": "native",
-    "pushEngine": "mqtt",
-    "firebaseConfig": {
-        "apiKey": "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4",
-        "authDomain": "chat21-pre-01.firebaseapp.com",
-        "databaseURL": "https://chat21-pre-01.firebaseio.com",
-        "projectId": "chat21-pre-01",
-        "storageBucket": "chat21-pre-01.appspot.com",
-        "messagingSenderId": "269505353043",
-        "appId": "1:269505353043:web:b82af070572669e3707da6",
-        "chat21ApiUrl": "https://us-central1-chat21-pre-01.cloudfunctions.net",
-        "tenant": "tilechat"
-    },
-    "chat21Config": {
-        "appId": "tilechat",
-        "MQTTendpoint": "ws://99.80.197.164:15675/ws",
-        "APIendpoint": "http://99.80.197.164:8004/api"
-    },
-    "apiUrl": "http://99.80.197.164:3000/",
-    "baseImageUrl": "http://99.80.197.164:3000/",
-    "dashboardUrl": "http://tiledesk-dashboard-pre.s3-eu-west-1.amazonaws.com/native-mqtt/dashboard/index.html",
-    "logLevel": "DEBUG",
-    "authPersistence": "NONE"
-}

package/src/chat-config-native-mqtt.json

@@ -1,36 +0,0 @@
-{
-    "t2y12PruGU9wUtEGzBJfolMIgK": "CAR:T-PAY:T-ANA:T-ACT:T-APP:T",
-    "chatEngine": "mqtt",
-    "uploadEngine": "native",
-    "pushEngine":"none",
-    "fileUploadAccept":"*/*",
-    "logLevel": "DEBUG",
-    "remoteTranslationsUrl": "https://console.native.tiledesk.com/api/",
-    "firebaseConfig": {
-        "apiKey": "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4",
-        "authDomain": "chat21-pre-01.firebaseapp.com",
-        "databaseURL": "https://chat21-pre-01.firebaseio.com",
-        "projectId": "chat21-pre-01",
-        "storageBucket": "chat21-pre-01.appspot.com",
-        "messagingSenderId": "269505353043",
-        "appId": "1:269505353043:web:b82af070572669e3707da6",
-        "chat21ApiUrl": "https://us-central1-chat21-pre-01.cloudfunctions.net",
-        "tenant":"tilechat"
-    },
-    "chat21Config": {
-        "appId": "tilechat",
-        "MQTTendpoint": "wss://console.native.tiledesk.com/mqws/ws",
-        "APIendpoint": "https://console.native.tiledesk.com/chatapi/api",
-        "_log": true
-    },
-    "apiUrl": "https://console.native.tiledesk.com/api/",
-    "baseImageUrl": "https://console.native.tiledesk.com/api/",
-    "dashboardUrl": "https://console.native.tiledesk.com/dashboard/",
-    "testsiteBaseUrl":"https://console.native.tiledesk.com/widget/assets/twp/index.html",
-    "authPersistence": "LOCAL",
-    "wsUrl":"wss://console.native.tiledesk.com/mqws/ws",
-    "supportMode": true,
-    "archivedButton": true,
-    "writeToButton": true,
-    "emailSection":true
-}

package/src/chat-config-native-prod.json

@@ -1,36 +0,0 @@
-{
-    "t2y12PruGU9wUtEGzBJfolMIgK": "CAR:T-PAY:T-ANA:T-ACT:T-APP:T-MTT:T",
-    "chatEngine": "mqtt",
-    "uploadEngine": "native",
-    "pushEngine": "mqtt",
-    "fileUploadAccept": "*/*",
-    "firebaseConfig": {
-        "tenant": "tilechat",
-        "apiKey": "AIzaSyBv6ILBL_U6VfUs_y8kqPYn-b2mYRauq1k",
-        "authDomain": "tiledesk-v3-prod-cf4ff.firebaseapp.com",
-        "databaseURL": "https://tiledesk-v3-prod-cf4ff-default-rtdb.europe-west1.firebasedatabase.app",
-        "projectId": "tiledesk-v3-prod-cf4ff",
-        "storageBucket": "tiledesk-v3-prod-cf4ff.appspot.com",
-        "messagingSenderId": "522823349790",
-        "appId": "1:522823349790:web:0d4ba710f38b586e1fa00f",
-        "chat21ApiUrl": "https://us-central1-tiledesk-prod-v2.cloudfunctions.net",
-        "vapidKey": "BH7R85jN8ovJ36J8BKYmfVZsIRWbUj_WXQMs8U3bDN02upqyqy2TpElVQIGMTUyOE2V7UwE11T_sy5yQHg02bjs"
-    },
-    "chat21Config": {
-        "appId": "tilechat",
-        "MQTTendpoint": "wss://eu.rtmv3.tiledesk.com/mqws/ws",
-        "APIendpoint": "https://eu.rtmv3.tiledesk.com/chatapi/api/"
-    },
-    "apiUrl": "https://api.tiledesk.com/v3/",
-    "baseImageUrl": "https://eu.rtmv3.tiledesk.com/api/",
-    "dashboardUrl": "https://panel.tiledesk.com/v3/dashboard/",
-    "testsiteBaseUrl": "https://widget.tiledesk.com/v6/assets/twp/index.html",
-    "wsUrl": "wss://eu.rtmv3.tiledesk.com/api/",
-    "logLevel": "debug",
-    "authPersistence": "LOCAL",
-    "storage_prefix": "chat_sv6",
-    "supportMode": true,
-    "archivedButton": true,
-    "writeToButton": true,
-    "emailSection":true
-}

package/src/chat-config-pre.json

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