merge

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

@@ -101,9 +101,9 @@ export class RoomService {
         const message = this.prepareMessage(ChatMessage)
         this.lastMessage = message
         this.calDateDuration(ChatMessage._updatedAt)
-        
-        if (message.t == 'r') { 
-          this.name = message.msg 
+
+        if (message.t == 'r') {
+          this.name = message.msg
         }
 
         if(this.isSenderIsNotMe(ChatMessage)) {
@@ -136,29 +136,29 @@ export class RoomService {
 
 
   async addMessageDB(ChatMessage) {
-    if (environment.chatOffline) { 
+    if (environment.chatOffline) {
       this.storage.get('chatmsg' + this.id).then((messages: any = []) => {
         if(!Array.isArray(messages)) {
           messages = []
         }
-  
+
         if(!ChatMessage._id && environment.chatOffline) {
-          
+
           delete ChatMessage.temporaryData
           messages.push(ChatMessage)
           this.storage.set('chatmsg' + this.id, messages)
-  
+
         } else {
           const find = messages.find((message)=> {
             return message._id == ChatMessage._id
           })
-  
+
           if(!find) {
             delete ChatMessage.temporaryData
             messages.push(ChatMessage)
             this.storage.set('chatmsg' + this.id, messages)
           }
-  
+
         }
       })
     }
@@ -268,13 +268,15 @@ export class RoomService {
       temporaryData,
       localReference
     }
-    
+
     const message: MessageService = this.prepareMessage(offlineChatMessage, environment.chatOffline)
+
     message.send().then((ChatMessage) => {
       this.updateMessageDB(ChatMessage, localReference)
     })
     
-    if (environment.chatOffline) { 
+    if (environment.chatOffline) {
+
       this.addMessageDB(offlineChatMessage)
       setTimeout(() => {
         this.scrollDown()
@@ -375,22 +377,22 @@ export class RoomService {
         if(!Array.isArray(messages)) {
           messages = []
         }
-  
+
         await messages.forEach( async (ChatMessage, index) => {
           const wewMessage = this.prepareMessage(ChatMessage, false)
-  
+
           if(wewMessage.offline == false) {
             this.prepareMessage(ChatMessage)
           } else {
 
           }
-  
+
         });
-  
+
         setTimeout(()=> {
           this.scrollDown()
         }, 50)
-        
+
       })
 
     }
@@ -400,8 +402,8 @@ export class RoomService {
   async loadHistory({limit = 50, forceUpdate = false }) {
 
     if(forceUpdate == false) {
-      if (this.hasLoadHistory) { 
-        return false 
+      if (this.hasLoadHistory) {
+        return false
       }
     }
     await this.restoreMessageFromDB()
@@ -434,7 +436,7 @@ export class RoomService {
     const wewMessage = new MessageService(this.storage, this.NfService, this.WsChatService)
     wewMessage.setData(message)
     wewMessage.loadHistory = this.hasLoadHistory
-    
+
     if(!message._id && environment.chatOffline) {
       this.messages.push(wewMessage)
       return wewMessage