From 506eb3db94ad756115232679cb7dd21645641aff Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 9 Feb 2022 14:46:51 +0100
Subject: [PATCH 1/3] save

---
 src/app/guards/auth.guard.ts          | 2 +-
 src/app/services/chat/room.service.ts | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts
index 17b45ac9f..10a5ff3e3 100644
--- a/src/app/guards/auth.guard.ts
+++ b/src/app/guards/auth.guard.ts
@@ -18,7 +18,7 @@ export class AuthGuard implements CanActivate {
   canActivate(
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
-
+    
     // if user not active
     if(!SessionStore.user.Inactivity) {
       this.router.navigate(['/']);
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 10b322cdf..5962dcc36 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -103,7 +103,6 @@ export class RoomService {
           })
   
           if(!messageIsFound) {
-            console.log('messageIsFound', messageIsFound)
             const message = this.prepareMessage(ChatMessage)
   
             this.lastMessage = message
@@ -120,8 +119,6 @@ export class RoomService {
             });
   
             this.addMessageDB(ChatMessage)
-          } else {
-            console.log('have')
           }
         }, 150)
 

From 92b12fd7e5d5f7545356914532b1c1ae90b265a2 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 9 Feb 2022 15:06:21 +0100
Subject: [PATCH 2/3] improve

---
 src/app/services/chat/room.service.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 5962dcc36..2e9f0433c 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -92,7 +92,7 @@ export class RoomService {
       "stream-room-messages",
       (ChatMessage) => {
 
-        setTimeout(()=>{
+        setTimeout(() => {
           ChatMessage = ChatMessage.fields.args[0]
 
           ChatMessage = this.fix_updatedAt(ChatMessage)
@@ -357,8 +357,16 @@ export class RoomService {
 
       await chatHistory.result.messages.reverse().forEach( async (message) => {
         this.prepareMessage(message)
+
+        const wewMessage = this.prepareMessage(message, false)
+
+        if(wewMessage.offline == false) {
+          this.prepareMessage(message)
+        }
+
       });
 
+      this.storage.set('chatmsg' + this.id, chatHistory)
     })
 
     setTimeout(() => {

From 3215660c6ebac624b98c2c780882d41ffed01b7a Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 9 Feb 2022 15:14:44 +0100
Subject: [PATCH 3/3] save

---
 src/app/services/chat/room.service.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 2e9f0433c..97ffd7398 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -117,8 +117,12 @@ export class RoomService {
               message: message.msg,
               title: this.name
             });
-  
-            this.addMessageDB(ChatMessage)
+            
+
+            if(this.isSenderIsNotMe(ChatMessage)) {
+              this.addMessageDB(ChatMessage)
+            }
+            
           }
         }, 150)