@chat21/chat21-ionic 3.0.94 → 3.0.96-rc.1

package/src/chat21-core/providers/abstract/archivedconversations-handler.service.ts

@@ -7,14 +7,14 @@ import { ImageRepoService } from './image-repo.service';
 export abstract class ArchivedConversationsHandlerService {
 
   // BehaviorSubject
-  abstract BSConversationDetail: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  abstract archivedConversationAdded: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  abstract archivedConversationChanged: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  abstract archivedConversationRemoved: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+  abstract BSConversationDetail: BehaviorSubject<ConversationModel>;
+  abstract archivedConversationAdded: BehaviorSubject<ConversationModel>;
+  abstract archivedConversationChanged: BehaviorSubject<ConversationModel>;
+  abstract archivedConversationRemoved: BehaviorSubject<ConversationModel>;
   // abstract readAllMessages: BehaviorSubject<string> = new BehaviorSubject<string>(null);
 
   // params
-  abstract archivedConversations: Array<ConversationModel> = [];
+  abstract archivedConversations: Array<ConversationModel>;
   abstract uidConvSelected: string;
   //abstract imageRepo: ImageRepoService;
 

package/src/chat21-core/providers/abstract/conversation-handler.service.ts

@@ -12,15 +12,15 @@ import { UserModel } from '../../models/user';
 export abstract class ConversationHandlerService {
 
   // BehaviorSubject
-  abstract messageAdded: BehaviorSubject<MessageModel> = new BehaviorSubject<MessageModel>(null);
-  abstract messageChanged: BehaviorSubject<MessageModel> = new BehaviorSubject<MessageModel>(null);
-  abstract messageRemoved: BehaviorSubject<string> = new BehaviorSubject<string>(null);
-  abstract messageWait: BehaviorSubject<any> = new BehaviorSubject<any>(null);
-  abstract messageInfo: BehaviorSubject<MessageModel> = new BehaviorSubject<MessageModel>(null);
+  abstract messageAdded: BehaviorSubject<MessageModel>;
+  abstract messageChanged: BehaviorSubject<MessageModel>;
+  abstract messageRemoved: BehaviorSubject<string>;
+  abstract messageWait: BehaviorSubject<any>;
+  abstract messageInfo: BehaviorSubject<MessageModel>;
   
   // params
   abstract attributes: any;
-  abstract messages: Array<MessageModel> = [];
+  abstract messages: Array<MessageModel>;
   abstract conversationWith: string;
 
   constructor() {}

package/src/chat21-core/providers/abstract/conversations-handler.service.ts

@@ -14,20 +14,19 @@ import { ConversationModel } from './../../models/conversation';
 export abstract class ConversationsHandlerService {
 
   // BehaviorSubject
-  abstract BSConversationDetail: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  abstract conversationAdded: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  abstract conversationChanged: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  abstract conversationChangedDetailed: BehaviorSubject<{value: ConversationModel, previousValue: ConversationModel}> = new BehaviorSubject<{value: ConversationModel, previousValue: ConversationModel}>(null);
-  abstract conversationRemoved: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+  abstract BSConversationDetail: BehaviorSubject<ConversationModel>;
+  abstract conversationAdded: BehaviorSubject<ConversationModel>;
+  abstract conversationChanged: BehaviorSubject<ConversationModel>;
+  abstract conversationChangedDetailed: BehaviorSubject<{value: ConversationModel, previousValue: ConversationModel}>;
+  abstract conversationRemoved: BehaviorSubject<ConversationModel>;
   // abstract readAllMessages: BehaviorSubject<string> = new BehaviorSubject<string>(null);
  
   // params
-  abstract conversations: Array<ConversationModel> = [];
+  abstract conversations: Array<ConversationModel>;
   abstract uidConvSelected: string;
 
   // functions
   abstract initialize(tenant: string, userId: string, translationMap: Map<string, string>): void;
-  // abstract connect(): void;
   abstract subscribeToConversations(lastConversatioTimestamp: number, callback: any): void;
   abstract countIsNew(): number;
   abstract setConversationRead(conversationId: string): void;

package/src/chat21-core/providers/abstract/groups-handler.service.ts

@@ -11,11 +11,11 @@ import { UserModel } from 'src/chat21-core/models/user';
 export abstract class GroupsHandlerService {
 
   // BehaviorSubject
-  abstract BSgroupDetail: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
-  abstract SgroupDetail: Subject<GroupModel> = new Subject<GroupModel>();
-  abstract groupAdded: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
-  abstract groupChanged: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
-  abstract groupRemoved: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
+  abstract BSgroupDetail: BehaviorSubject<GroupModel>;
+  abstract SgroupDetail: Subject<GroupModel>;
+  abstract groupAdded: BehaviorSubject<GroupModel>;
+  abstract groupChanged: BehaviorSubject<GroupModel>;
+  abstract groupRemoved: BehaviorSubject<GroupModel>;
 
   abstract initialize(tenant: string, loggedUserId: string): void;
   abstract connect(): void;

package/src/chat21-core/providers/abstract/messagingAuth.service.ts

@@ -12,8 +12,8 @@ import { UserModel } from '../../models/user';
 export abstract class MessagingAuthService {
 
   // BehaviorSubject
-  abstract BSAuthStateChanged: BehaviorSubject<any> = new BehaviorSubject<any>(null);
-  abstract BSSignOut: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  abstract BSAuthStateChanged: BehaviorSubject<any>;
+  abstract BSSignOut: BehaviorSubject<any>;
 
   // params
   public DEFAULT_PERSISTENCE: string = 'NONE';

package/src/chat21-core/providers/abstract/presence.service.ts

@@ -9,8 +9,8 @@ import { environment } from 'src/environments/environment';
 export abstract class PresenceService {
 
   // BehaviorSubject
-  abstract BSIsOnline: BehaviorSubject<any> = new BehaviorSubject<any>(null);
-  abstract BSLastOnline: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  abstract BSIsOnline: BehaviorSubject<any>;
+  abstract BSLastOnline: BehaviorSubject<any>;
 
   // params
   // abstract tenant = environment.tenant;
@@ -30,5 +30,6 @@ export abstract class PresenceService {
   abstract userIsOnline(userid: string): Observable<any>
   abstract lastOnlineForUser(userid: string): void;
   abstract setPresence(userid: string): void;
+  abstract imHere():void;
   abstract removePresence(): void;
 }

package/src/chat21-core/providers/abstract/typing.service.ts

@@ -9,8 +9,8 @@ import { environment } from 'src/environments/environment';
 export abstract class TypingService {
 
   // BehaviorSubject
-  BSIsTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
-  BSSetTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  abstract BSIsTyping: BehaviorSubject<any>;
+  abstract BSSetTyping: BehaviorSubject<any>;
 
   // params
   // private _tenant: string;

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

@@ -28,7 +28,7 @@ export abstract class UploadService {
   }
 
   //BehaviorSubject
-  abstract BSStateUpload: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  abstract BSStateUpload: BehaviorSubject<any>;
 
   // params
   // abstract tenant = environment.tenant;

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

@@ -14,7 +14,7 @@ import { ConversationModel } from '../../models/conversation';
 
 // utils
 import { avatarPlaceholder, getColorBck } from '../../utils/utils-user';
-import { compareValues, getFromNow, searchIndexInArrayForUid, archivedConversationsPathForUserId, isGroup } from '../../utils/utils';
+import { compareValues, searchIndexInArrayForUid, archivedConversationsPathForUserId, isGroup, getTimeLastMessage } from '../../utils/utils';
 import { ArchivedConversationsHandlerService } from '../abstract/archivedconversations-handler.service';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
@@ -396,7 +396,7 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
         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.time_last_message = getTimeLastMessage(conv.timestamp); // evaluate if is used
         conv.avatar = avatarPlaceholder(conversation_with_fullname);
         conv.color = getColorBck(conversation_with_fullname);
         conv.archived = true;
@@ -415,17 +415,6 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
         return status;
     }
 
-    /**
-     * calcolo il tempo trascorso da ora al timestamp passato
-     * @param timestamp
-     */
-    private getTimeLastMessage(timestamp: string) {
-        const timestampNumber = parseInt(timestamp, 10) / 1000;
-        const time = getFromNow(timestampNumber);
-        return time;
-    }
-
-
     /**
      *  check if the conversations is valid or not
      */

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

@@ -74,7 +74,7 @@ export class FirebaseAuthService extends MessagingAuthService {
     this.URL_TILEDESK_CREATE_CUSTOM_TOKEN = this.SERVER_BASE_URL + 'chat21/firebase/auth/createCustomToken';
     this.logger.log('[FIREBASEAuthSERVICE] - initialize URL_TILEDESK_CREATE_CUSTOM_TOKEN ', this.URL_TILEDESK_CREATE_CUSTOM_TOKEN)
 
-
+    
     let firebasePersistence;
     // console.log('FB-AUTH firebasePersistence', this.getPersistence()) 
     switch (this.getPersistence()) {

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

@@ -21,7 +21,7 @@ import { AppConfigProvider } from 'src/app/services/app-config';
 
 // utils
 import { avatarPlaceholder, getColorBck } from '../../utils/utils-user';
-import { compareValues, getFromNow, conversationsPathForUserId, searchIndexInArrayForUid, isGroup } from '../../utils/utils';
+import { compareValues, conversationsPathForUserId, searchIndexInArrayForUid, isGroup } from '../../utils/utils';
 import { TOUCHING_OPERATOR } from '../../utils/constants';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 
@@ -650,16 +650,6 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         return status;
     }
 
-    /**
-     * calcolo il tempo trascorso da ora al timestamp passato
-     * @param timestamp
-     */
-    private getTimeLastMessage(timestamp: string) {
-        const timestampNumber = parseInt(timestamp, 10) / 1000;
-        const time = getFromNow(timestampNumber);
-        return time;
-    }
-
     /**
      *  check if the conversations is valid or not
      */

package/src/chat21-core/providers/firebase/firebase-presence.service.ts

@@ -14,9 +14,6 @@ import { PresenceService } from '../abstract/presence.service';
 import { CustomLogger } from '../logger/customLogger';
 import { LoggerInstance } from '../logger/loggerInstance';
 
-// utils
-// import { setLastDate } from '../../utils/utils';
-// import { environment } from '../../../environments/environment';
 
 // @Injectable({providedIn: 'root'})
 @Injectable()
@@ -149,6 +146,10 @@ export class FirebasePresenceService extends PresenceService {
     });
   }
 
+  public imHere(){
+    //NOT IMPLEMENTED FOR FIREBASE ENGINE
+  }
+
   /**
    * removePresence
    * richiamato prima del logout

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

@@ -13,7 +13,7 @@ import { ConversationsHandlerService } from '../abstract/conversations-handler.s
 // utils
 import { TYPE_GROUP } from '../../utils/constants';
 import { getImageUrlThumbFromFirebasestorage, avatarPlaceholder, getColorBck } from '../../utils/utils-user';
-import { compareValues, getFromNow, conversationsPathForUserId, searchIndexInArrayForUid } from '../../utils/utils';
+import { compareValues, conversationsPathForUserId, searchIndexInArrayForUid } from '../../utils/utils';
 import { ArchivedConversationsHandlerService } from '../abstract/archivedconversations-handler.service';
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
@@ -370,39 +370,6 @@ export class MQTTArchivedConversationsHandler extends ArchivedConversationsHandl
         return status;
     }
 
-    /**
-     * calcolo il tempo trascorso da ora al timestamp passato
-     * @param timestamp 
-     */
-    private getTimeLastMessage(timestamp: string) {
-        const timestampNumber = parseInt(timestamp) / 1000;
-        const time = getFromNow(timestampNumber);
-        return time;
-    }
-
-    // removeByUid(uid) {
-    //     const index = searchIndexInArrayForUid(this.conversations, uid);
-    //     if (index > -1) {
-    //         this.conversations.splice(index, 1);
-    //         // this.events.publish('conversationsChanged', this.conversations);
-    //         this.conversationsChanged.next(this.conversations);
-    //     }
-    // }
-
-    // addConversationListener(uidUser, conversationId) {
-    //     var that = this;
-    //     this.tenant = environment.tenant;
-    //     // const tenant = this.chatManager.getTenant();
-    //     const url = '/apps/' + this.tenant + '/users/' + uidUser + '/conversations/' + conversationId;
-    //     const reference = firebase.database().ref(url);
-    //     console.log("ChatConversationsHandler::addConversationListener::reference:",url, reference.toString());
-    //     reference.on('value', function (snapshot) {
-    //         setTimeout(function () {
-    //             // that.events.publish(conversationId + '-listener', snapshot);
-    //         }, 100);
-    //     });
-    // }
-
     /**
      * restituisce il numero di conversazioni nuove
      */

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

@@ -6,12 +6,6 @@ import { environment } from '../../../environments/environment';
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 
-// // firebase
-// import * as firebase from 'firebase/app';
-// import 'firebase/messaging';
-// import 'firebase/database';
-// import 'firebase/auth';
-
 // services
 // import { EventsService } from '../events-service';
 import { MessagingAuthService } from '../abstract/messagingAuth.service';

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

@@ -21,7 +21,6 @@ import {
   htmlEntities,
   compareValues,
   searchIndexInArrayForUid,
-  setHeaderDate,
   conversationMessagesRef
 } from '../../utils/utils';
 import { isSender, messageType } from '../../utils/utils-message';

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

@@ -13,7 +13,7 @@ import { ConversationsHandlerService } from '../abstract/conversations-handler.s
 
 // utils
 import { getImageUrlThumbFromFirebasestorage, avatarPlaceholder, getColorBck } from '../../utils/utils-user';
-import { compareValues, getFromNow, conversationsPathForUserId, searchIndexInArrayForUid } from '../../utils/utils';
+import { compareValues, conversationsPathForUserId, searchIndexInArrayForUid } from '../../utils/utils';
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
@@ -383,7 +383,7 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         conv.conversation_with_fullname = conversation_with_fullname;
         conv.conversation_with = conversation_with;
         conv.status = this.setStatusConversation(conv.sender, conv.uid);
-        conv.time_last_message = this.getTimeLastMessage(conv.timestamp);
+        // conv.time_last_message = this.getTimeLastMessage(conv.timestamp);
         conv.avatar = avatarPlaceholder(conversation_with_fullname);
         conv.color = getColorBck(conversation_with_fullname);
         if (!conv.last_message_text) {
@@ -417,16 +417,6 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         return status;
     }
 
-    /**
-     * calcolo il tempo trascorso da ora al timestamp passato
-     * @param timestamp 
-     */
-    private getTimeLastMessage(timestamp: string) {
-        const timestampNumber = parseInt(timestamp) / 1000;
-        const time = getFromNow(timestampNumber);
-        return time;
-    }
-
     /**
      * restituisce il numero di conversazioni nuove
      */

package/src/chat21-core/providers/mqtt/mqtt-presence.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Inject, Injectable, Optional } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 
 // firebase
@@ -11,10 +11,8 @@ import 'firebase/database';
 import { PresenceService } from '../abstract/presence.service';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
+import { Chat21Service } from './chat-service';
 
-// utils
-import { setLastDate } from '../../utils/utils';
-import { environment } from '../../../environments/environment';
 
 @Injectable({
   providedIn: 'root'
@@ -30,7 +28,8 @@ export class MQTTPresenceService extends PresenceService {
   private urlNodePresence: string;
   private logger: LoggerService = LoggerInstance.getInstance();
   constructor(
-    // private events: EventsService
+    public chat21Service: Chat21Service,
+    @Optional() @Inject('webSocketService') public webSocketService?: any,
   ) {
     super();
   }
@@ -43,20 +42,20 @@ export class MQTTPresenceService extends PresenceService {
   }
 
   userIsOnline(userid: string): Observable<any> {
-    // console.log('userIsOnline', userid);
-    // const that = this;
-    // const urlNodeConnections = this.urlNodePresence + userid + '/connections';
-    // console.log('userIsOnline: ', urlNodeConnections);
-    // const connectionsRef = firebase.database().ref().child(urlNodeConnections);
-    // connectionsRef.on('value', (child) => {
-    //   console.log('is-online-' + userid);
-    //   if (child.val()) {
-    //     that.events.publish('is-online-' + userid, userid, true);
-    //   } else {
-    //     that.events.publish('is-online-' + userid, userid, false);
-    //   }
-    // });
-    return this.BSIsOnline
+    const that = this;
+    let local_BSIsOnline = new BehaviorSubject<any>(null);
+    this.webSocketService.wsRequesterStatus$.subscribe((data: any) => {
+    this.logger.log('[NATIVEPresenceSERVICE] $subs to wsService - data ', data, userid);
+    if (data && data.presence && data.presence.status === 'online' ) {
+        that.BSIsOnline.next({ uid: data.uuid_user, isOnline: true });
+        local_BSIsOnline.next({ uid: data.uuid_user, isOnline: true });
+    } else {
+        that.BSIsOnline.next({ uid: data.uuid_user, isOnline: false });
+        local_BSIsOnline.next({ uid: data.uuid_user, isOnline: false });
+    }
+    });
+
+    return local_BSIsOnline
   }
 
   lastOnlineForUser(userid: string) {
@@ -96,6 +95,13 @@ export class MQTTPresenceService extends PresenceService {
     // });
   }
 
+  public imHere(): void {
+    this.logger.debug('[MQTT-PRESENCE] imHere', this.tenant);
+    setTimeout(() => {
+      this.chat21Service.chatClient.ImHere()
+    }, 2000);
+  }
+
   /**
    * removePresence
    * richiamato prima del logout

package/src/chat21-core/providers/mqtt/mqtt-typing.service.ts

@@ -11,8 +11,6 @@ import { PresenceService } from '../abstract/presence.service';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 // utils
-import { setLastDate } from '../../utils/utils';
-import { environment } from '../../../environments/environment';
 import { TypingService } from '../abstract/typing.service';
 import { BehaviorSubject } from 'rxjs';
 

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

@@ -67,6 +67,7 @@ export class NativeUploadService extends UploadService {
                     if(upload.file.type.includes('pdf')){
                         downloadURL = this.URL_TILEDESK_FILE + '?path=' + encodeURI(data['filename']);
                     }
+                    resolve(downloadURL)
                     // that.BSStateUpload.next({upload: upload});
                 }, (error) => {
                     this.logger.error('[NATIVE UPLOAD] - ERROR upload new file ', error)

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

@@ -1,3 +1,6 @@
+import { MessageModel } from '../models/message';
+import { ConversationModel } from '../models/conversation';
+import { v4 as uuidv4 } from 'uuid';
 import {
   MESSAGE_TYPE_INFO,
   MESSAGE_TYPE_MINE,
@@ -7,22 +10,6 @@ import {
   TYPE_SUPPORT_GROUP
 } from '../../chat21-core/utils/constants';
 
-/**  */
-export function isFirstMessage(i: number) {
-  if (i > 0) {
-    try {
-      const message = this.messages[i];
-      const prevMessage = this.messages[i - 1];
-      if (prevMessage.sender !== message.sender || message.headerDate || (prevMessage && this.isInfo(prevMessage))) {
-        return true;
-      }
-      return false;
-    } catch (err) {
-      console.error('error: ', err);
-    }
-  }
-}
-
 /** */
 export function isImage(message: any) {
   if (message && message.type && message.metadata && message.metadata.src && message.type === 'image') {
@@ -74,6 +61,27 @@ export function isSender(sender: string, currentUserId: string) {
   }
 }
 
+export function isSameSender(messages, senderId, index):boolean{
+  if(senderId && messages[index - 1] && (senderId === messages[index - 1].sender)){
+    return true;
+  }
+  return false;
+}
+
+export function isLastMessage(messages, idMessage):boolean {
+  if (idMessage === messages[messages.length - 1].uid) {
+    return true;
+  }
+  return false;
+}
+
+export function isFirstMessage(messages, senderId, index):boolean{
+  if(senderId && index == 0 && messages[index] && (messages[index] !== senderId)){
+    return true;
+  }
+  return false;
+}
+
 /** */
 export function messageType(msgType: string, message: any) {
   
@@ -153,6 +161,13 @@ export function isEmojii(message: any){
   }
 }
 
+export function isJustRecived(startedAt, time) {
+  if (time > startedAt) {
+    return true;
+  }
+  return false;
+}
+
 export function checkIfIsMemberJoinedGroup(msg, loggedUser): boolean{
   if(msg && msg.attributes && msg.attributes.messagelabel
       && msg.attributes.messagelabel['key']=== "MEMBER_JOINED_GROUP" 
@@ -186,4 +201,42 @@ export function getProjectIdSelectedConversation(conversationWith: string): stri
   return projectId
 }
 
+export function conversationToMessage(conversation: ConversationModel, currentUserId: string): MessageModel{
+  let message: any = {}
+  message.uid = conversation['message_id']? conversation['message_id'] : uuidv4()
+  message.text = conversation.text? conversation.text.trim(): conversation.last_message_text.trim()
+  message.sender = conversation.sender
+  message.sender_fullname = conversation.sender_fullname
+  message.recipient = conversation.recipient
+  message.recipient_fullname = conversation.recipient_fullname
+  message.status = +conversation.status
+  message.timestamp = conversation.timestamp
+  message.metadata = conversation['metadata']
+  message.channel_type = conversation.channel_type
+  message.type = conversation.type
+  message.isSender = isSender(message.sender, currentUserId)
+  message.attributes = conversation.attributes
+
+  return message as MessageModel
+}
+
+export function commandToMessage(msg: MessageModel, conversation: ConversationModel, currentUserId: string): MessageModel{
+  let message: any = {}
+  message.uid = conversation['message_id']? conversation['message_id'] : uuidv4()
+  message.text = msg.text? msg.text.trim(): '';
+  message.sender = conversation.sender
+  message.sender_fullname = conversation.sender_fullname
+  message.recipient = conversation.recipient
+  message.recipient_fullname = conversation.recipient_fullname
+  message.status = +conversation.status
+  message.timestamp = conversation.timestamp
+  message.metadata = msg['metadata']
+  message.channel_type = conversation.channel_type
+  message.type = msg.type
+  message.isSender = isSender(message.sender, currentUserId)
+  message.attributes = conversation.attributes
+
+  return message as MessageModel
+}
+