From 6df9e1f30afad6d4b08255cb3c3e580f759fff8b Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 30 Sep 2022 13:24:19 +0100
Subject: [PATCH] save

---
 .../group-messages/group-messages.page.ts     | 32 +++++++++--------
 src/app/services/chat/room.service.ts         |  5 +--
 .../group-messages/group-messages.page.ts     | 34 +++++++++----------
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 83a057d3b..4e79fcb85 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -424,23 +424,25 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   getGroupContacts(room: any) {
-    this.showLoader = true;
-    //If group is private call getGroupMembers
-    if (this.room.t === 'p') {
-      this.chatService.getGroupMembers(this.roomId).subscribe(res => {
+    // this.showLoader = true;
+    // //If group is private call getGroupMembers
+    // if (this.room.t === 'p') {
+    //   this.chatService.getGroupMembers(this.roomId).subscribe(res => {
         
-        this.members = res['members'];
-        this.showLoader = false;
-      });
-    }
-    //Otherwise call getChannelMembers for públic groups
-    else {
-      this.chatService.getChannelMembers(this.roomId).subscribe(res => {
+    //     this.members = res['members'];
+    //     this.showLoader = false;
+    //   });
+    // }
+    // //Otherwise call getChannelMembers for públic groups
+    // else {
+    //   this.chatService.getChannelMembers(this.roomId).subscribe(res => {
         
-        this.members = res['members'];
-        this.showLoader = false;
-      });
-    }
+    //     this.members = res['members'];
+    //     this.showLoader = false;
+    //   });
+    // }
+
+    this.members = this.wsChatMethodsService.getGroupRoom(this.roomId).members
   }
 
 
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 4dc2b3467..fbbf7c7b9 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -180,7 +180,7 @@ export class RoomService {
     }
   }
 
-  setData({members, u, customFields = {}, id, name, t, lastMessage = new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService), _updatedAt }) {
+  setData({membersExcludeMe, members, u, customFields = {}, id, name, t, lastMessage = new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService), _updatedAt }) {
     this.customFields = customFields
     this.id = id
     this.name = name
@@ -188,7 +188,8 @@ export class RoomService {
     this.lastMessage = lastMessage
     this._updatedAt = _updatedAt
     this.u = u
-    this.membersExcludeMe = members
+    this.members = members
+    this.membersExcludeMe  = membersExcludeMe
 
     this.calDateDuration()
     this.restoreMessageFromDB()
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 0e548f73b..8f09ce6a5 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -430,25 +430,25 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
 
   getGroupContacts(room: any) {
-    this.showLoader = true;
-    //If group is private call getGroupMembers
-    if (room.t === 'p') {
-      this.chatService.getGroupMembers(this.roomId).subscribe(res => {
-        //
-        this.members = res['members'];
-        this.showLoader = false;
-      });
-    }
-    //Otherwise call getChannelMembers for públic groups
-    else {
-      this.chatService.getChannelMembers(this.roomId).subscribe(res => {
+    // this.showLoader = true;
+    // //If group is private call getGroupMembers
+    // if (room.t === 'p') {
+    //   this.chatService.getGroupMembers(this.roomId).subscribe(res => {
+    //     //
+    //     this.members = res['members'];
+    //     this.showLoader = false;
+    //   });
+    // }
+    // //Otherwise call getChannelMembers for públic groups
+    // else {
+    //   this.chatService.getChannelMembers(this.roomId).subscribe(res => {
         
-        this.members = res['members'];
-        this.showLoader = false;
-      });
-    }
+    //     this.members = res['members'];
+    //     this.showLoader = false;
+    //   });
+    // }
 
-    
+    this.members = this.wsChatMethodsService.getGroupRoom(this.roomId).members
   }
 
   sendMessage() {