@chat21/chat21-ionic 3.0.65-rc1 → 3.0.66

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

@@ -53,6 +53,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
     private BASE_URL: string;
     // private audio: any;
     // private setTimeoutSound: any;
+    private subscribe: any
 
     constructor(
         //public databaseProvider: DatabaseProvider
@@ -121,62 +122,47 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         this.ref = firebase.database().ref(urlNodeFirebase).orderByChild('timestamp').limitToLast(200);
         
         // this.ref.once('value').then(snapshot => {
-        //     snapshot.forEach(childSnapshot => {
-        //         const childData: ConversationModel = childSnapshot.val();
-        //         childData.uid = childSnapshot.key
-        //         that.added(childData)
-        //         lastConversationTimestamp = childData.timestamp
-        //     });
+        //     if(snapshot && snapshot.val()){
+                
+                
+        //         snapshot.forEach(childSnapshot => {
+        //             // const childData: ConversationModel = childSnapshot.val();
+        //             // childData.uid = childSnapshot.key
+        //             // that.added(childData)
+        //             // lastConversationTimestamp = childData.timestamp
+        //             that.added(childSnapshot)
+        //         });
+        //         this.logger.debug('[FIREBASEConversationsHandlerSERVICE] # of remote conversations on Firebase:', Object.keys(snapshot.val()).length)
+        //         this.logger.debug('[FIREBASEConversationsHandlerSERVICE] # of conversation added:', that.conversations)
+        //         callback(that.conversations)
+        //         return lastConversationTimestamp
+        //     }
             
-        //     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);
+        // }).then(()=> {
+        //     this.ref.on('child_changed', (childSnapshot) => {
+        //         that.changed(childSnapshot);
         //     });
-        //     this.ref.startAt(timestamp).on('child_removed', (childSnapshot) => {
-        //         const conv: ConversationModel = childSnapshot.val();
-        //         conv.uid = childSnapshot.key
-        //         that.removed(conv);
+        //     this.ref.on('child_removed', (childSnapshot) => {
+        //         that.removed(childSnapshot);
         //     });
-        //     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('child_added', (childSnapshot) => {
+        //         that.added(childSnapshot);
         //     });
-        // });
-        // 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) => {
+        
+        this.ref.on('child_changed', (childSnapshot) => {
             that.changed(childSnapshot);
         });
-        this.ref.startAt(lastConversationTimestamp).on('child_removed', (childSnapshot) => {
+        this.ref.on('child_removed', (childSnapshot) => {
             that.removed(childSnapshot);
         });
-        this.ref.startAt(lastConversationTimestamp).on('child_added', (childSnapshot) => {
+        this.ref.on('child_added', (childSnapshot) => {
             that.added(childSnapshot);
         });
 
-        
-
         setTimeout(() => {
             callback()
         }, 2000);
-        // SET AUDIO
-        // this.audio = new Audio();
-        // this.audio.src = URL_SOUND;
-        // this.audio.load();
     }
 
     /**
@@ -316,24 +302,44 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         } else {
             this.logger.log('[FIREBASEConversationsHandlerSERVICE]  getConversationDetail ***** ELSE')
             // const urlNodeFirebase = '/apps/' + this.tenant + '/users/' + this.loggedUserId + '/conversations/' + conversationId;
-            const urlNodeFirebase = conversationsPathForUserId(this.tenant, this.loggedUserId) + '/' + conversationId;
+            const urlNodeFirebase = conversationsPathForUserId(this.tenant, this.loggedUserId) // + '/' + conversationId;
             this.logger.log('[FIREBASEConversationsHandlerSERVICE] conversationDetail urlNodeFirebase *****', urlNodeFirebase)
             const firebaseMessages = firebase.database().ref(urlNodeFirebase);
-            firebaseMessages.on('value', (childSnapshot) => {
-                const childData: ConversationModel = childSnapshot.val();
-                this.logger.log('[FIREBASEConversationsHandlerSERVICE] conversationDetail childSnapshot.val() *****', childSnapshot.val());
-                this.logger.log('[FIREBASEConversationsHandlerSERVICE] conversationDetail childSnapshot *****', childSnapshot)
-                // && childData.uid
-                if (childSnapshot && childSnapshot.key && childData) {
-                    childData.uid = childSnapshot.key;
-                    const conversation = this.completeConversation(childData);
-                    if (conversation) {
-                        callback(conversation)
-                    } else {
-                        callback(null)
-                    }
+            if(this.subscribe){
+                this.logger.log('[FIREBASEConversationsHandlerSERVICE] getConversationDetail ALREADY SUBSCRIBED')
+                return;
+            }
 
+            this.subscribe = firebaseMessages.on('value', (snap) => {
+                const childSnapshot = snap.child('/'+conversationId)
+                if(!childSnapshot.exists()){
+                    this.logger.log('[FIREBASEConversationsHandlerSERVICE] getConversationDetail conversation NOT exist', conversationId)
+                    callback(null)
+                } else {
+                    const childData: ConversationModel = childSnapshot.val();
+                    this.logger.debug('[FIREBASEConversationsHandlerSERVICE] getConversationDetail conversation exist', childSnapshot.val(), childSnapshot.key)
+                    if (childSnapshot && childSnapshot.key && childData) {
+                        childData.uid = childSnapshot.key;
+                        const conversation = this.completeConversation(childData);
+                        if (conversation) {
+                            callback(conversation)
+                        } else {
+                            callback(null)
+                        }
+                    }
+                    // this.BSConversationDetail.next(conversation);
                 }
+                // const childData: ConversationModel = childSnapshot.val();
+                // this.logger.debug('[FIREBASEConversationsHandlerSERVICE] conversationDetail childSnapshot *****', childSnapshot.val())
+                // if (childSnapshot && childSnapshot.key && childData) {
+                //     childData.uid = childSnapshot.key;
+                //     const conversation = this.completeConversation(childData);
+                //     if (conversation) {
+                //         callback(conversation)
+                //     } else {
+                //         callback(null)
+                //     }
+                // }
                 // this.BSConversationDetail.next(conversation);
             });
         }
@@ -505,7 +511,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
      * @param conv
      */
     private completeConversation(conv): ConversationModel {
-        conv.selected = false;
+        // conv.selected = false;
         if (!conv.sender_fullname || conv.sender_fullname === 'undefined' || conv.sender_fullname.trim() === '') {
             conv.sender_fullname = conv.sender;
         }
@@ -532,6 +538,15 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
                 this.translateInfoSupportMessages(conv);
             }
         }
+        /** START: UPDATE CONVERSATIONS is_new IF conv is selected or sender is me */
+        if(conv.uid === this.uidConvSelected){
+            conv.is_new = false
+        }
+        if(conv.sender === this.loggedUserId){
+            conv.is_new = false
+        }
+        /** END: UPDATE CONVERSATIONS is_new IF conv is selected or sender is me */
+
         // 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;
@@ -647,3 +662,4 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
     // END PRIVATE FUNCTIONS
     // ---------------------------------------------------------- //
 }
+

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

@@ -59,18 +59,15 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         // 1 search local array
         // 2 search remote
         // callback
-        console.log("SEARCHING CONV:", conversationWith);
+        
         const conversation = this.conversations.find(conv => conv.conversation_with === conversationWith);
-        console.log('[MQTTConversationsHandler] getConversationDetail *****:  found locally?', conversation);
+        
         if (conversation) {
-            console.log('[MQTTConversationsHandler] getConversationDetail found LOCALLY!', conversationWith);
+            
             callback(conversation);
         } else {
-            console.log('[MQTTConversationsHandler] getConversationDetail *****: Not found locally, SEARCHING REMOTE ', conversation);
+            
             this.chat21Service.chatClient.conversationDetail(conversationWith, (err, conversation) => {
-                console.log("--REMOTE CONV IS:" + conversation);
-                console.log("--REMOTE CONV IS OBJ:", conversation);
-                console.log("--REMOTE ERR IS:" + err);
                 
                 if (conversation) {
                     if (callback) {
@@ -147,7 +144,8 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
     // ---------------------------------------------------------------------------------
      // New connect - renamed subscribeToConversation
      //----------------------------------------------------------------------------------
-     subscribeToConversations(loaded) {
+     subscribeToConversations(lastTimestamp, loaded) {
+         // lastTimestamp temporarily ignored
         this.logger.debug('[MQTTConversationsHandler] connecting MQTT conversations handler');
         const handlerConversationAdded = this.chat21Service.chatClient.onConversationAdded( (conv) => {
             this.logger.log("onConversationAdded:", conv);
@@ -385,8 +383,7 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
     }
 
     private completeConversation(conv): ConversationModel {
-        console.log("COMPLETING CONVERSATION:", conv);
-        conv.selected = false;
+        // conv.selected = false;
         if (!conv.sender_fullname || conv.sender_fullname === 'undefined' || conv.sender_fullname.trim() === '') {
             conv.sender_fullname = conv.sender;
         }
@@ -414,13 +411,19 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
             conv.last_message_text = conv.text; // building conv with a message
         }
         conv.uid = conv.conversation_with;
+        console.log("uidConvSelected is", this.uidConvSelected);
+        if (conv.uid === this.uidConvSelected) {
+            this.logger.debug("For selected conversation is_new = false");
+            conv.is_new = false;
+        }
+        if (conv.sender === this.loggedUserId) {
+            this.logger.debug("is_new always false if sender it's me")
+            conv.is_new = false;
+        }
         return conv;
     }
 
     private isGroup(conv: ConversationModel) {
-        console.log("CONVIS: " + JSON.stringify(conv));
-        console.log("CONVIS OBJ:", conv);
-        
         if (conv.recipient.startsWith('group-') || conv.recipient.startsWith('support-group')) {
             return true;
         };

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

@@ -110,7 +110,7 @@ export const LogLevel = {
     'DEBUG': 3
 }
 
-export const tranlatedLanguage = ['it', 'en', 'de', 'es', 'pt', 'fr', 'ru', 'tr', 'sr']
+export const tranlatedLanguage = ['it', 'en', 'de', 'es', 'pt', 'fr', 'ru', 'tr', 'sr', 'ar', 'uk']
 
 
 

package/src/global.scss

@@ -25,7 +25,7 @@
 @import "~@ionic/angular/css/text-transformation.css";
 @import "~@ionic/angular/css/flex-utils.css";
 
-@import "~material-design-icons/iconfont/material-icons.css";
+@import 'material-icons/iconfont/material-icons.css';
 @import "variables.scss";
 
 // http://ionicframework.com/docs/v2/theming/
@@ -974,7 +974,7 @@ ul.dropdown-menu > li > a {
 
 .sidebar .nav i {
     // font-size: 20px;
-    float: left;
+    // float: left;
     // margin-right: 15px;
     // line-height: 30px;
     width: 60px;

package/deploy_prod.sh

@@ -1,14 +0,0 @@
-# npm version patch
-version=`node -e 'console.log(require("./package.json").version)'`
-echo "version $version"
-
-URL_VER=${version//[.]//}
-echo 'URL_VER: ---->'$URL_VER
-
-if [ "$version" != "" ]; then
-    git tag -a "$version" -m "`git log -1 --format=%s`"
-    echo "Created a new tag, $version"
-    git push --tags
-    npm publish
-fi
-