@chat21/chat21-ionic 3.0.67 → 3.0.68

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

@@ -65,13 +65,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     /**
      * inizializzo conversation handler
      */
-    initialize(
-        recipientId: string,
-        recipientFullName: string,
-        loggedUser: UserModel,
-        tenant: string,
-        translationMap: Map<string, string>
-    ) {
+    initialize(recipientId: string,recipientFullName: string,loggedUser: UserModel,tenant: string, translationMap: Map<string, string>) {
         this.logger.log('[MQTTConversationHandler] initWithRecipient:', tenant);
         this.recipientId = recipientId;
         this.recipientFullname = recipientFullName;
@@ -96,7 +90,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
      * mi sottoscrivo a change, removed, added
      */
     connect() {
-        this.logger.log('[MQTTConversationHandler] connecting conversation handler...');
+        this.logger.log('[MQTTConversationHandler] connecting conversation handler...', this.conversationWith);
         if (this.conversationWith == null) {
             this.logger.error('[MQTTConversationHandler] cant connect invalid this.conversationWith', this.conversationWith);
             return;
@@ -118,7 +112,6 @@ export class MQTTConversationHandler extends ConversationHandlerService {
             this.logger.log('[MQTTConversationHandler] message updated:', message, 'on topic:', topic);
             this.updatedMessageStatus(message);
         });
-        this.logger.log("[MQTTConversationHandler] this.conversationWith,", this.conversationWith);
     }
 
     isGroup(groupId) {
@@ -256,16 +249,6 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         this.messageAdded.next(msg);
     }
 
-    // /** */
-    // private updatedMessage(message: any) {
-    //     const msg = this.messageGenerate(message);
-    //     msg.uid = msg.message_id;
-    //     // imposto il giorno del messaggio per visualizzare o nascondere l'header data
-    //     // con**** DATAIL messageAdded ***sole.log('>>>>>>>>>>>>>> changed headerDate: ', msg);
-    //     this.addReplaceMessageInArray(msg.uid, msg);
-    //     this.messageChanged.next(msg);
-    // }
-
     /** */
     private updatedMessageStatus(patch: any) {
         if(this.skipInfoMessage && messageType(MESSAGE_TYPE_INFO, patch) ){
@@ -278,8 +261,6 @@ export class MQTTConversationHandler extends ConversationHandlerService {
             if (message) {
                 message.status = patch.status;
                 this.logger.log('[MQTTConversationHandler] message found and patched (replacing)', message);
-                // imposto il giorno del messaggio per visualizzare o nascondere l'header data
-                // con**** DATAIL messageAdded ***sole.log('>>>>>>>>>>>>>> changed headerDate: ', msg);
                 this.addReplaceMessageInArray(message.uid, message);
                 this.messageChanged.next(message);
             }
@@ -311,8 +292,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         //     msg.text = htmlEntities(msg.text);
         // }
         // verifico che il sender è il logged user
-        this.logger.log("****>msg.sender:" + msg.sender);
-        this.logger.log("****>this.loggedUser.uid:" + this.loggedUser.uid);
+        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) {
@@ -436,7 +416,6 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     this.listSubsriptions.forEach(sub => {
       this.logger.log('[MQTTConversationHandler] unsubscribe: ', sub.uid, key);
       if (sub.uid === key) {
-        this.logger.log('[MQTTConversationHandler] unsubscribe: ', sub.uid, key);
         sub.unsubscribe(key, null);
         return;
       }

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

@@ -27,6 +27,7 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
     BSConversationDetail: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);;
     conversationAdded: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);;
     conversationChanged: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);; 
+    conversationChangedDetailed: BehaviorSubject<{value: ConversationModel, previousValue: ConversationModel}> = new BehaviorSubject<{value: ConversationModel, previousValue: ConversationModel}>(null);
     conversationRemoved: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);;
     BSConversations: BehaviorSubject<ConversationModel[]>
     // readAllMessages: BehaviorSubject<string>;
@@ -48,11 +49,7 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         super();
     }
 
-    initialize(
-        tenant: string, 
-        userId: string,
-        translationMap: Map<string, string>
-        ) {
+    initialize(tenant: string,  userId: string,translationMap: Map<string, string>) {
         this.logger.debug('[MQTTConversationsHandler] initialize');
         this.loggedUserId = userId;
         this.translationMap = translationMap;
@@ -61,19 +58,19 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
     }
 
     public getConversationDetail(conversationWith: string, callback) {
-        // 1 search local array
-        // 2 search remote
+        // 1 cerco array locale
+        // 2 cerco remoto
         // callback
-        
+
         const conversation = this.conversations.find(conv => conv.conversation_with === conversationWith);
-        
+        this.logger.log('[MQTTConversationsHandler] getConversationDetail found locally? *****: ', conversation);
         if (conversation) {
             
             callback(conversation);
         } else {
-            
+            this.logger.log('[MQTTConversationsHandler] getConversationDetail Not found locally, remote.getConversationDetail *****: ', conversation);
             this.chat21Service.chatClient.conversationDetail(conversationWith, (err, conversation) => {
-                
+                this.logger.log('[MQTTConversationsHandler] getConversationDetail --REMOTE CONV IS OBJ:', conversation);
                 if (conversation) {
                     if (callback) {
                         callback(this.completeConversation(conversation));
@@ -153,9 +150,8 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
          // lastTimestamp temporarily ignored
         this.logger.debug('[MQTTConversationsHandler] connecting MQTT conversations handler');
         const handlerConversationAdded = this.chat21Service.chatClient.onConversationAdded( (conv) => {
-            this.logger.log("onConversationAdded:", conv);
             let conversation = this.completeConversation(conv); // needed to get the "conversation_with", and find the conv in the conv-history
-            this.logger.log("onConversationAdded completed:" + JSON.stringify(conversation));
+            this.logger.log("onConversationAdded completed:",conversation);
             const index = this.searchIndexInArrayForConversationWith(this.conversations, conversation.conversation_with);
             if (index > -1) {
                 this.logger.log('[MQTTConversationsHandler] Added conv -> Changed!')
@@ -194,17 +190,18 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
             }
         });
     }
+
+    getLastConversation(callback: (conv: ConversationModel, error: string) => void): void {
+        throw new Error('Method not implemented.');
+    }
     
     private added(conv: any) {
         this.logger.debug('[MQTTConversationsHandler] NEW CONV childSnapshot', conv)
         let conversation = this.completeConversation(conv);
         if (this.isValidConversation(conversation)) {
             this.setClosingConversation(conversation.conversation_with, false);
-            this.logger.debug('[MQTTConversationsHandler] new conv.uid' + conversation.uid);
-            this.logger.debug('[MQTTConversationsHandler] conversations:', this.conversations);
+            this.logger.debug('[MQTTConversationsHandler] conversations:', conversation.uid, this.conversations);
             const index = this.searchIndexInArrayForConversationWith(this.conversations, conversation.conversation_with);
-            this.logger.debug('[MQTTConversationsHandler] found index:', index)
-            this.logger.debug('[MQTTConversationsHandler] NUOVA CONVER;.uid2' + conversation.uid)
             if (index > -1) {
                 this.logger.debug('[MQTTConversationsHandler] TROVATO')
                 this.conversations.splice(index, 1, conversation);
@@ -215,13 +212,8 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
             }
             this.logger.debug('[MQTTConversationsHandler] NUOVA CONVER;.uid3' + conversation.uid)
             this.conversations.sort(compareValues('timestamp', 'desc'));
-            this.logger.debug('[MQTTConversationsHandler] NUOVA CONVER;.uid4' + conversation.uid)
             this.logger.debug('[MQTTConversationsHandler] TUTTE:', this.conversations)
-            // this.conversationChanged.next(conversation);
-            this.logger.debug('[MQTTConversationsHandler] NUOVA CONVER;.uid5' + conversation.uid)
             this.conversationAdded.next(conversation);
-            this.logger.debug('[MQTTConversationsHandler] NUOVA CONVER;.uid6' + conversation.uid)
-            // this.events.publish('conversationsChanged', this.conversations);
         } else {
             this.logger.error('[MQTTConversationsHandler] ChatConversationsHandler::added::conversations with conversationId: ', conversation.conversation_with, 'is not valid');
         }
@@ -272,7 +264,6 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
 
     private updateConversationWithSnapshot(conv: ConversationModel, snap: any) {
         this.logger.debug('[MQTTConversationsHandler] updating conv', conv, 'with snap', snap)
-        this.logger.debug('[MQTTConversationsHandler] print snap keys/values')
         Object.keys(snap).forEach(k => {
             this.logger.debug('[MQTTConversationsHandler] key:' + k);
             if (k === 'is_new') {
@@ -317,27 +308,6 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
                 conv.type = snap[k];
             }
         });
-        // SCHEMA ConversationModel
-        // public uid: string,
-        // public attributes: any,
-        // public channel_type: string,
-        // public conversation_with_fullname: string,
-        // public conversation_with: string,
-        // public recipient: string,
-        // public recipient_fullname: string,
-        // public image: string,
-        // public is_new: boolean,
-        // public last_message_text: string,
-        // public sender: string,
-        // public senderAuthInfo: any,
-        // public sender_fullname: string,
-        // public status: string,
-        // public timestamp: string,
-        // public time_last_message: string,
-        // public selected: boolean,
-        // public color: string,
-        // public avatar: string,
-        // public archived: boolean
     }
 
     
@@ -416,13 +386,10 @@ 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;

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

@@ -35,7 +35,7 @@ import { avatarPlaceholder, getColorBck } from 'src/chat21-core/utils/utils-user
      * inizializzo groups handler
      */
     initialize(tenant: string, loggedUserId: string): void {
-        this.logger.log('initialize GROUP-HANDLER MQTT');
+        this.logger.log('[MQTT-GROUPS-HANDLER] initialize');
         this.tenant = tenant;
         this.loggedUserId = loggedUserId;
     }
@@ -64,13 +64,11 @@ import { avatarPlaceholder, getColorBck } from 'src/chat21-core/utils/utils-user
     onGroupChange(groupId: string): Observable<GroupModel> {
         if (this.isGroup(groupId)) {
             this.chat21Service.chatClient.groupData(groupId, (err, group) => {
-                this.logger.log('got result by REST call:', group);
-                this.logger.log('got group by REST call:', group.result);
+                this.logger.log('[MQTT-GROUPS-HANDLER] onGroupChange: got result by REST call:', group);
                 this.groupValue(group.result);
-                this.logger.log('subscribing to group updates...', groupId);
+                this.logger.log('[MQTT-GROUPS-HANDLER] onGroupChange: subscribing to group updates...', groupId);
                 const handler_group_updated = this.chat21Service.chatClient.onGroupUpdated( (group, topic) => {
                     if (topic.conversWith === groupId) {
-                        this.logger.log('group updated:', group);
                         this.groupValue(group);
                     }
                 });
@@ -87,13 +85,11 @@ import { avatarPlaceholder, getColorBck } from 'src/chat21-core/utils/utils-user
     }
 
     private groupValue(childSnapshot: any){
-        this.logger.log('groupValue > childSnapshot:', childSnapshot)
-        const group: GroupModel = childSnapshot;
-        this.logger.log('groupValue > GroupModel by childSnapshot:', group)
+        this.logger.debug('[MQTT-GROUPS-SERV] group detail::', childSnapshot.val(), childSnapshot)
+        const group: GroupModel = childSnapshot.val();
+        this.logger.debug('[MQTT-GROUPS-SERV] groupValue ', group)
         if (group) {
             let groupCompleted = this.completeGroup(group)
-            this.logger.log("group:", group);
-            this.logger.log("groupCompleted:", groupCompleted);
             this.SgroupDetail.next(groupCompleted)
         }
     }

package/src/chat21-core/providers/mqtt/mqtt-notifications.ts

@@ -14,109 +14,104 @@ import { Chat21Service } from './chat-service';
 @Injectable({
     providedIn: 'root'
   })
-  export class MQTTNotifications extends NotificationsService {
+export class MQTTNotifications extends NotificationsService {
     
-    public BUILD_VERSION: string;
-    private FCMcurrentToken: string;
-    private userId: string;
-    private tenant: string;
-    private vapidkey: string;
-    private logger: LoggerService = LoggerInstance.getInstance();
+  public BUILD_VERSION: string;
+  private FCMcurrentToken: string;
+  private userId: string;
+  private tenant: string;
+  private vapidkey: string;
+  private logger: LoggerService = LoggerInstance.getInstance();
 
-    constructor(
-      public chat21Service: Chat21Service
+  constructor(
+    public chat21Service: Chat21Service
   ) {
-      super();
+    super();
   }
 
-    initialize(tenant: string, vapId: string): void {
-      this.tenant = tenant;
-      this.vapidkey = vapId;
-      return;
-    }
+  initialize(tenant: string, vapId: string): void {
+    this.tenant = tenant;
+    this.vapidkey = vapId;
+    return;
+  }
     
-    getNotificationPermissionAndSaveToken(currentUserUid) {
-      console.log("getNotificationPermissionAndSaveToken()",currentUserUid );
-      this.userId = currentUserUid;
-      if (firebase.messaging.isSupported()) {
-        console.log("firebase.messaging.isSupported() YES");
-          const messaging = firebase.messaging();
-          // messaging.requestPermission()
-          Notification.requestPermission().then((permission) => {
-              if (permission === 'granted') {
-                  this.logger.log('[MQTT-FIREBASE-NOTIFICATIONS] >>>> requestPermission Notification permission granted.');
+  getNotificationPermissionAndSaveToken(currentUserUid) {
+    console.log("[MQTTNotificationService] getNotificationPermissionAndSaveToken()",currentUserUid );
+    this.userId = currentUserUid;
+    if (firebase.messaging.isSupported()) {
+      console.log("[MQTTNotificationService] firebase.messaging.isSupported -> YES");
+      const messaging = firebase.messaging();
+      // messaging.requestPermission()
+      Notification.requestPermission().then((permission) => {
+        if (permission === 'granted') {
+            this.logger.log('[MQTTNotificationService] >>>> requestPermission Notification permission granted.');
 
-                  return messaging.getToken({ vapidKey: this.vapidkey })
-              }
-          }).then(FCMtoken => {
-              this.logger.log('[MQTT-FIREBASE-NOTIFICATIONS] >>>> requestPermission FCMtoken', FCMtoken)
-              // Save FCM Token in Chat21
-              this.FCMcurrentToken = FCMtoken;
-              this.saveToken(FCMtoken, currentUserUid)
-          }).catch((err) => {
-              this.logger.error('[FIREBASE-NOTIFICATIONS] >>>> requestPermission ERR: Unable to get permission to notify.', err);
-          });
-      } else {
-          this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> FIREBASE MESSAGING IS NOT SUPPORTED')
-      }
+            return messaging.getToken({ vapidKey: this.vapidkey })
+        }
+      }).then(FCMtoken => {
+        this.logger.log('[MQTTNotificationService] >>>> requestPermission FCMtoken', FCMtoken)
+        // Save FCM Token in Chat21
+        this.FCMcurrentToken = FCMtoken;
+        this.saveToken(FCMtoken, currentUserUid)
+      }).catch((err) => {
+        this.logger.error('[MQTTNotificationService] >>>> requestPermission ERR: Unable to get permission to notify.', err);
+      });
+    } else {
+      this.logger.log('[MQTTNotificationService] >>>> FIREBASE MESSAGING IS NOT SUPPORTED')
     }
+  }
 
 
-    removeNotificationsInstance(callback: (string) => void) {
-      var self = this;
-        // firebase.auth().onAuthStateChanged(function (user) {
-        //     if (user) {
-        //         self.logger.debug('[FIREBASE-NOTIFICATIONS] - FB User is signed in. ', user)
-        //         self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > this.userId', self.userId);
-        //         self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > FCMcurrentToken', self.FCMcurrentToken);
-        //         // this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > this.tenant', this.tenant);
-        //     } else {
-        //         self.logger.debug('[FIREBASE-NOTIFICATIONS] - No FB user is signed in. ', user)
-        //     }
-        // });
-        const urlNodeFirebase = '/apps/' + self.tenant
-        const connectionsRefinstancesId = urlNodeFirebase + '/users/' + self.userId + '/instances/'
-        self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRefinstancesId ', connectionsRefinstancesId);
-        let connectionsRefURL = '';
-        if (connectionsRefinstancesId) {
-            connectionsRefURL = connectionsRefinstancesId + self.FCMcurrentToken;
-            const connectionsRef = firebase.database().ref().child(connectionsRefURL);
-            self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRef ', connectionsRef);
-            self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRef url ', connectionsRefURL);
-            connectionsRef.off()
-            connectionsRef.remove()
-                .then(() => {
-                    self.logger.log("[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > Remove succeeded.")
-                    callback('success')
-                }).catch((error) => {
-                    self.logger.error("[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance Remove failed: " + error.message)
-                    callback('error')
-                }).finally(() => {
-                    self.logger.log('[FIREBASE-NOTIFICATIONS] COMPLETED');
-                })
-        }
-    }
-    
-    private saveToken(FCMcurrentToken, currentUserUid) {
-      this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> getPermission > updateToken ', FCMcurrentToken);
-      if (!currentUserUid || !FCMcurrentToken) {
-          return
-      };
-      const device_model = {
-          device_model: navigator.userAgent,
-          language: navigator.language,
-          platform: 'ionic',
-          platform_version: this.BUILD_VERSION
+  removeNotificationsInstance(callback: (string) => void) {
+    var self = this;
+      // firebase.auth().onAuthStateChanged(function (user) {
+      //     if (user) {
+      //         self.logger.debug('[FIREBASE-NOTIFICATIONS] - FB User is signed in. ', user)
+      //         self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > this.userId', self.userId);
+      //         self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > FCMcurrentToken', self.FCMcurrentToken);
+      //         // this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > this.tenant', this.tenant);
+      //     } else {
+      //         self.logger.debug('[FIREBASE-NOTIFICATIONS] - No FB user is signed in. ', user)
+      //     }
+      // });
+      const urlNodeFirebase = '/apps/' + self.tenant
+      const connectionsRefinstancesId = urlNodeFirebase + '/users/' + self.userId + '/instances/'
+      self.logger.log('[MQTTNotificationService] >>>> connectionsRefinstancesId ', connectionsRefinstancesId);
+      let connectionsRefURL = '';
+      if (connectionsRefinstancesId) {
+        connectionsRefURL = connectionsRefinstancesId + self.FCMcurrentToken;
+        const connectionsRef = firebase.database().ref().child(connectionsRefURL);
+        self.logger.log('[MQTTNotificationService] >>>> connectionsRef ', connectionsRef);
+        self.logger.log('[MQTTNotificationService] >>>> connectionsRef url ', connectionsRefURL);
+        connectionsRef.off()
+        connectionsRef.remove().then(() => {
+          self.logger.log("[MQTTNotificationService] >>>> removeNotificationsInstance > Remove succeeded.")
+          callback('success')
+        }).catch((error) => {
+          self.logger.error("[MQTTNotificationService] >>>> removeNotificationsInstance Remove failed: " + error.message)
+          callback('error')
+        }).finally(() => {
+          self.logger.log('[MQTTNotificationService] COMPLETED');
+        })
       }
-      this.chat21Service.chatClient.saveInstance(
-        FCMcurrentToken,
-        device_model,
-        (err, response) => {
-          if (err) {
-            this.logger.error('Error saving FCMcurrentToken on chat21 App Instance', FCMcurrentToken);
-          }
-        }
-      );
+  }
+    
+  private saveToken(FCMcurrentToken, currentUserUid) {
+    this.logger.log('[MQTTNotificationService] >>>> getPermission > updateToken ', FCMcurrentToken);
+    if (!currentUserUid || !FCMcurrentToken) {
+      return
+    };
+    const device_model = {
+      device_model: navigator.userAgent,
+      language: navigator.language,
+      platform: 'ionic',
+      platform_version: this.BUILD_VERSION
     }
-
+    this.chat21Service.chatClient.saveInstance(FCMcurrentToken,device_model,(err, response) => {
+      if (err) {
+        this.logger.error('[MQTTNotificationService] Error saving FCMcurrentToken on chat21 App Instance', FCMcurrentToken);
+      }
+    });
   }
+
+}

package/src/chat21-core/providers/native/native-image-repo.ts

@@ -1,3 +1,4 @@
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { ImageRepoService } from 'src/chat21-core/providers/abstract/image-repo.service';
 
@@ -7,7 +8,7 @@ export class NativeImageRepoService extends ImageRepoService {
     
     private baseImageURL: string;
     
-    constructor() {
+    constructor(public http: HttpClient) {
         super();
     }
 
@@ -25,6 +26,12 @@ export class NativeImageRepoService extends ImageRepoService {
         const filename_photo = '?path=uploads/users/'+ sender_id + '/images/photo.jpg'
         const filename_thumbnail = '?path=uploads/users/'+ sender_id + '/images/thumbnails_200_200-photo.jpg'
         return this.baseImageURL + filename_photo
-   } 
+    } 
+
+    checkImageExists(url: string, callback: (exist: boolean) => void): void {
+        this.http.get(url).subscribe( res => {
+            callback(true)
+        },(error) => { console.log('errorrrrrr', url, error);callback(false)})
+    }
 
 }

package/src/chat21-core/providers/native/native-upload-service.ts

@@ -25,9 +25,8 @@ export class NativeUploadService extends UploadService {
         super();
     }
 
-
     initialize(): void {
-        this.logger.info(' [NATIVE UPLOAD] initialize')
+        this.logger.info('[NATIVE UPLOAD] initialize')
         this.URL_TILEDESK_FILE = this.getBaseUrl() + 'files'
         this.URL_TILEDESK_IMAGES = this.getBaseUrl() + 'images'
         this.tiledeskToken = this.appStorage.getItem('tiledeskToken')

package/src/chat21-core/providers/tiledesk/tiledesk-auth.service.ts

@@ -119,7 +119,6 @@ export class TiledeskAuthService {
         if (data['success'] && data['token']) {
           that.tiledeskToken = data['token'];
           that.createCompleteUser(data['user']);
-
           // that.appStorage.setItem('tiledeskToken', that.tiledeskToken); // salvarlo esternamente nell'app.component
           this.checkAndSetInStorageTiledeskToken(that.tiledeskToken)
           resolve(this.currentUser)

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', 'ar', 'uk']
+export const tranlatedLanguage = ['it', 'en', 'de', 'es', 'pt', 'fr', 'ru', 'tr', 'sr', 'ar', 'uk', 'sv', 'az', 'kk', 'uz']
 
 
 

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

@@ -109,7 +109,7 @@ export function isEmojii(message: any){
     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
+    return (onlyEmojis.length === visibleChars.length && onlyEmojis.length <= 2)
   } catch(e) {
     return false
   }

package/deploy_pre.sh

@@ -1,44 +0,0 @@
-# environment=$(< src/utils/constants.ts)
-# start="CURR_VER_PROD = '0."
-# end="'"
-# one=${environment#*$start}
-# build=${one%%$end*} #two=${one%,*} -> %% prendo la prima istanza; % prendo la seconda
-# NEW_BUILD=$(($build + 1))
-# sed -i -e "s/$start$build/$start$NEW_BUILD/g" src/utils/constants.ts
-
-#npm version prerelease --preid=beta
-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 "v$version" -m "`git log -1 --format=%s`"
-#     echo "Created a new tag, v$version"
-#     git push --tags
-#     npm publish
-# fi
-
-sed -i -e "s/$URL_VER/g" src/utils/constants.ts
-
-# ng build --prod --base-href /$NEW_BUILD/
-#ionic cordova build browser --prod
-
-ionic cordova platform add browser --save
-#ionic cordova build browser --prod --release
-ionic cordova build --env=pre browser #--prod  --verbose
-
-cp -p src/firebase-messaging-sw.js platforms/browser/www/
-cp -p src/manifest.json platforms/browser/www/
-cp -p src/chat-config.json platforms/browser/www/
-
-cd platforms/browser/www
-aws s3 sync . s3://tiledesk-dashboard-pre/chat-ionic5/$version/
-aws s3 sync . s3://tiledesk-dashboard-pre/chat-ionic5/
-cd ../../../
-
-#aws cloudfront create-invalidation --distribution-id E2DTAKWHWQ7C3J --paths "/*"
-
-echo new version deployed on s3://tiledesk-dashboard-pre/chat-ionic5/$version/
-echo available on https://s3.eu-west-1.amazonaws.com/tiledesk-dashboard-pre/chat-ionic5/$version/index.html