improve

src/app/services/chat/room.service.ts

@@ -39,10 +39,11 @@ export class RoomService {
   message = ''
   lastMessageTxt = ''
   userThatIsTyping = ''
-
   private ToastService = ToastsService
   mgsArray = [];
 
+  messagesLocalReference = []
+
   scrollDown = () => { }
 
   /**
@@ -92,12 +93,11 @@ export class RoomService {
       this.id,
       "stream-room-messages",
       (_ChatMessage) => {
+        console.log('recivemessage', _ChatMessage)
 
         let ChatMessage = _ChatMessage.fields.args[0]
-
         ChatMessage = this.fix_updatedAt(ChatMessage)
-        console.log('recivemessage', ChatMessage)
-
+        alert('receive')
         const message = this.prepareMessage(ChatMessage)
         this.lastMessage = message
         this.calDateDuration(ChatMessage._updatedAt)
@@ -117,7 +117,7 @@ export class RoomService {
 
         setTimeout(()=>{
           this.scrollDown()
-        }, 50)        
+        }, 50)   
 
       }
     )
@@ -266,7 +266,7 @@ export class RoomService {
    */
   async send({file = null, attachments = null, temporaryData = {}}) {
 
-    const localReference = uuidv4()
+    const localReference = uuidv4() + 'peter'
 
     let offlineChatMessage = {
       rid: this.id,
@@ -278,14 +278,15 @@ export class RoomService {
     }
 
     const message: MessageService = this.prepareMessage(offlineChatMessage, environment.chatOffline)
+    
+    message.send().then((ChatMessage) => {
+      this.updateMessageDB(ChatMessage, localReference)
+    })
 
     if (environment.chatOffline) {
-
-      message.send().then((ChatMessage) => {
-        this.updateMessageDB(ChatMessage, localReference)
-      })
-
+      this.messagesLocalReference.push(localReference)
       this.addMessageDB(offlineChatMessage)
+      
       setTimeout(() => {
         this.scrollDown()
       }, 150)
@@ -392,6 +393,7 @@ export class RoomService {
           if(wewMessage.offline == false) {
             this.prepareMessage(ChatMessage)
           } else {
+            alert('create offline')
             const offlineMessage = this.prepareMessage(ChatMessage)
             offlineMessage.send().then(()=>{
               this.updateMessageDB(ChatMessage, ChatMessage.localReference)
@@ -449,15 +451,23 @@ export class RoomService {
     wewMessage.loadHistory = this.hasLoadHistory
 
     if(!message._id && environment.chatOffline) {
+      if(this.hasLoadHistory) alert('create offline')
+      
       this.messages.push(wewMessage)
       return wewMessage
     }
 
     const found = this.messages.find((MessageService) => {
-      return MessageService._id == message._id
+      if (MessageService._id == message._id) {
+        if(this.hasLoadHistory) console.log(`${MessageService._id} == ${message._id}`)
+        return true
+      } else {
+        return false
+      }
     })
 
     if (save && !found) {
+      if(this.hasLoadHistory) alert('not found')
       this.messages.push(wewMessage)
     }