improve chat

src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts

@@ -93,14 +93,12 @@ export class GroupContactsPage implements OnInit {
     if(this.room.t == "p"){
       this.chatService.getGroupMembers(this.room._id).subscribe(res=>{
         this.members = res['members'];
-        this.ChatSystemService.getAllRooms()
         this.loadUsers();
       });
     }
     else if(this.room.t == "c"){
       this.chatService.getChannelMembers(this.room._id).subscribe(res=>{
         this.members = res['members'];
-        this.ChatSystemService.getAllRooms()
         this.loadUsers();
       });
     }

src/app/pages/chat/group-messages/group-messages.page.ts

@@ -145,9 +145,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.getChatMembers();
 
     this.getRoomMessageDB(this.roomId);
-    this.ChatSystemService.getUserOfRoom(this.roomId).then((value) => {
-      
-    })
     
   }
 

src/app/pages/chat/messages/messages.page.ts

@@ -162,7 +162,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
   ngOnInit() {
     this.createDirectoryImage()
-    this.ChatSystemService.getAllRooms();
     this.chatService.refreshtoken();
     this.ChatSystemService.getUserOfRoom(this.roomId).then((value) => {
 

src/app/pages/login/login.page.ts

@@ -136,6 +136,7 @@ export class LoginPage implements OnInit {
               await this.authService.loginToChatWs();
               this.ChatService.setheader()
               this.ChatService.refreshtoken();
+              this.ChatSystemService.ReLoadChat();
           
             }
 
@@ -164,7 +165,7 @@ export class LoginPage implements OnInit {
               await this.authService.loginToChatWs();
               this.ChatService.setheader();
               this.ChatService.refreshtoken();
-              this.ChatSystemService.ReLoadChat();
+              this.ChatSystemService.loadChat();
             }
 
             this.getToken();

src/app/services/chat.service.ts

@@ -387,9 +387,7 @@ export class ChatService {
       } catch (error) {
 
         this.resetTimer();
-        setTimeout(async () => {
+        await this.refreshtoken();
-          await this.refreshtoken();
-        }, 3000)
 
       }
 

src/app/services/chat/chat-system.service.ts

@@ -39,6 +39,7 @@ export class ChatSystemService {
   users: chatUser[] = []
   sessionStore = SessionStore
   delete = []
+  loadingUsers = false
   
   constructor(
     private RochetChatConnectorService: RochetChatConnectorService,
@@ -57,18 +58,20 @@ export class ChatSystemService {
     private NetworkServiceService: NetworkServiceService,
   ) {
 
-
-
-    this.loadChat()
-
     this.RochetChatConnectorService.registerCallback({
       type: 'reConnect',
-      funx: () => {
+      funx:  async () => {
         /**
          * @description when the phone is in the background for a long time it could disconnects from the socket then the socket reconnects automatically,
          *  when the connection is lost the subscribe is also lost, so we have to subscribe again when reconnection is establish.
          */
-        this.subscribeToRoom()
+
+         await this.chatService.refreshtoken();
+         await this.getUser();
+         await this.getAllRooms();
+         this.subscribeToRoom();
+         //
+         this.getUserStatus();
 
         if(this.currentRoom) {
           this.currentRoom.loadHistory({forceUpdate: true})
@@ -85,22 +88,25 @@ export class ChatSystemService {
       }
     })
 
+    if(this.sessionStore.user.Inactivity) {
+      this.loadChat();
+    }
 
   }
 
-  private loadChat() {
+  loadChat() {
     this.ReLoadChat()
   }
 
   async ReLoadChat() {
+
     await this.chatService.refreshtoken();
+    await this.getUser();
     await this.restoreRooms();
     await this.getAllRooms();
     this.subscribeToRoom();
 
-
     //
-    await this.getUser();
     this.getUserStatus();
   }
 
@@ -590,11 +596,37 @@ export class ChatSystemService {
 
   async getUser() {
 
-    let _res = await this.ChatService.getAllUsers().toPromise()
+    this.loadingUsers = true
+    let _res
 
-    let users = _res['users'].filter(data => data.username != SessionStore.user.UserName);
+    console.log('getuser')
 
-    users = users.sort((a,b) => {
+    try {
+      _res = await this.ChatService.getAllUsers().toPromise();
+    } catch (error) {
+      await this.chatService.refreshtoken();
+      _res = await this.ChatService.getAllUsers().toPromise();
+    }
+
+    let users: chatUser[] = _res['users'].filter(data => data.username != SessionStore.user.UserName);
+
+    const userIds = this.users.map((user) => user._id)
+
+    for(let UserUpdate of users) {
+      if(userIds.includes(UserUpdate._id)) {
+        console.log("found")
+        for (var index = 0; index < this.users.length; index++) {
+          if(UserUpdate._id == this.users[index]._id) {
+            this.users[index] = UserUpdate
+          }
+        }
+      } else {
+        this.users.push(UserUpdate)
+        console.log("push ")
+      }
+    }
+
+    this.users = this.users.sort((a,b) => {
       if(a.name < b.name) {
         return -1;
       }
@@ -604,11 +636,8 @@ export class ChatSystemService {
       return 0;
     });
 
-    users.forEach((user, index) => {
+    this.loadingUsers = false
-      // user[index].status = this.statusNumberToText(user[index].status)
-    })
 
-    this.users = users
   }
 
   getUserOfRoom(roomId){

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

@@ -202,6 +202,19 @@ export class RoomService {
 
   }
 
+  get online() {
+    
+    if(!this.isGroup) {
+      for(let user of this.ChatSystemService.users) {
+        if(this.membersExcludeMe[0]._id == user._id) {
+          return user.status
+        }
+      }
+    }
+
+    return 'offline'
+  }
+
   countDownDate(date) {
     let difference = new Date(date).getTime() - new Date().getTime();
     let c_day = Math.floor(difference/(1000*60*60*24));

src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html

@@ -48,7 +48,7 @@
       </ion-list>
     </div>
 
-    <ion-virtual-scroll [items]="users | filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
+    <ion-virtual-scroll [items]="ChatSystemService.users | filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
 
       <div class="item-divider" *virtualHeader="let header">
         <ion-label>{{header}}</ion-label>

src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts

@@ -8,6 +8,7 @@ import { NewGroupPage } from '../../new-group/new-group.page';
 import { GroupMessagesPage } from '../group-messages.page';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SessionStore } from 'src/app/store/session.service';
+import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
 
 @Component({
   selector: 'app-group-contacts',
@@ -42,18 +43,14 @@ export class GroupContactsPage implements OnInit {
     private http: HttpClient,
     private chatService: ChatService,
     private authService: AuthService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
-    //private navParams: NavParams,
+    public ChatSystemService: ChatSystemService
   )
   {
     this.loggedUser = authService.ValidatedUserChat['data'];
     this.textSearch="";
     this.dm=null;
     this.room=null;
-    /* this.isGroupCreated = this.navParams.get('isCreated');
-    this.groupName = this.navParams.get('name');
-    this.room = this.navParams.get('room');
-    this.members = this.navParams.get('members'); */
   }
 
   ngOnInit() {

src/app/shared/chat/group-messages/group-messages.page.ts

@@ -163,7 +163,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
 
   ngOnInit() {
-    this.chatService.refreshtoken();
     // console.log(this.roomId)
     this.loggedUser = this.loggedUserChat;
     //setTimeout(() => {

src/app/shared/chat/messages/contacts/contacts.page.html

@@ -22,7 +22,7 @@
 <ion-content>
 
   <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+    <!-- <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar> -->
     <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>

src/app/shared/chat/messages/contacts/contacts.page.ts

@@ -14,13 +14,10 @@ import { SessionStore } from 'src/app/store/session.service';
   styleUrls: ['./contacts.page.scss'],
 })
 export class ContactsPage implements OnInit {
-  showLoader: boolean;
   loggedUser: any;
-  users = [];
 
   headers: HttpHeaders;
   options:any;
-  contacts:any;
   textSearch:string;
   room:any;
   dm:any;
@@ -45,9 +42,6 @@ export class ContactsPage implements OnInit {
   async ngOnInit() {
     
     this.loadUsers();
-    await this.chatService.refreshtoken();
-    this.loadUsers();
-
   }
 
   onChange(event){
@@ -71,24 +65,7 @@ export class ContactsPage implements OnInit {
   }
 
   loadUsers() {
-    this.options = {
+    this.ChatSystemService.getUser()
-      headers: this.headers,
-    };
-    this.chatService.getAllUsers().subscribe((res:any)=> {
-      
-      //this.contacts = res.users.filter(data => data.username != this.sessionStore.user.UserName);
-      this.contacts = res.users.filter(data => data.username != this.sessionStore.user.UserName);
-      this.users = this.contacts.sort((a,b) => {
-        if(a.name < b.name){
-          return -1;
-        }
-        if(a.name > b.name){
-          return 1;
-        }
-        return 0;
-      });
-      this.showLoader = false;
-    });
   }
 
   separateLetter(record, recordIndex, records){

src/app/shared/chat/messages/messages.page.html

@@ -3,9 +3,9 @@
     <div class="main-header">
       <div class="header-top">
         <div class="middle">
-          <ion-label class="title">{{ this.ChatSystemService.getDmRoom(this.roomId).name }}</ion-label>
+          <ion-label class="title">{{ ChatSystemService.getDmRoom(this.roomId).name }}</ion-label>
           <button (click)="ChatMessageDebuggingPage()">Dev</button>
-          <!-- <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span> -->
+          <span><ion-icon class="{{ ChatSystemService.getDmRoom(this.roomId).online }}" name="ellipse"></ion-icon></span>
         </div>
         <div hidden class="right">
           <button title="Menu" class="btn-no-color" (click)="_openMessagesOptions()">

src/app/shared/chat/new-group/contacts/contacts.page.ts

@@ -1,8 +1,8 @@
-import { HttpHeaders } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { ModalController } from '@ionic/angular';
 import { GroupMessagesPage } from '../../group-messages/group-messages.page';
 import { ThemeService } from 'src/app/services/theme.service'
+import { ChatSystemService } from 'src/app/services/chat/chat-system.service'
 
 @Component({
   selector: 'app-contacts',
@@ -10,57 +10,14 @@ import { ThemeService } from 'src/app/services/theme.service'
   styleUrls: ['./contacts.page.scss'],
 })
 export class ContactsPage implements OnInit {
-  showLoader: boolean;
-  users = [];
-
-  contact: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
-
-  headers: HttpHeaders;
   options:any;
 
-  contacts = [
-    {
-      first: 'Ana',
-      last: 'Manuel',
-      url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
-    },
-    {
-      first: 'Abdullah',
-      last: 'Hill',
-      url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
-    },
-    {
-      first: 'Batur',
-      last: 'Oymen',
-      url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
-    },
-    {
-      first: 'Bianca',
-      last: 'Costa',
-      url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
-    },
-    {
-      first: 'Zaya',
-      last: 'Mary',
-      url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
-    },
-    {
-      first: 'Tiago',
-      last: 'Kayaya',
-      url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
-    }
-];
-
   constructor(
     private modalController: ModalController,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    public ChatSystemService: ChatSystemService
   ) 
   { 
-    this.headers = new HttpHeaders();
-    this.headers = this.headers.set('Access-Control-Allow-Origin' , '*');
-    this.headers = this.headers.set('Access-Control-Allow-Methods', 'POST, GET, OPTIONS, PUT');
-    this.headers = this.headers.set('Accept','application/json');
-    this.headers = this.headers.set('content-type','application/json');
 
   }
 
@@ -70,46 +27,11 @@ export class ContactsPage implements OnInit {
   }
 
   loadUsers(){
-    this.options = { 
+    this.ChatSystemService.getUser()
-      headers: this.headers,
-    };
-    /* this.http.get('https://randomuser.me/api/?results=100', this.options)
-    .subscribe(res => {
-      this.users = res['results'].sort((a,b) => {
-        if(a.name.first < b.name.first){
-          return -1;
-        }
-        if(a.name.first > b.name.first){
-          return 1;
-        }
-        return 0;
-      });
-      
-      
-    }); */
-    this.users = this.contacts.sort((a,b) => {
-      if(a.first < b.first){
-        return -1;
-      }
-      if(a.first > b.first){
-        return 1;
-      }
-      return 0;
-    });
   }
 
   separateLetter(record, recordIndex, records){
-    /* if(recordIndex == 0){
-      return record.name.first[0];
-    }
 
-    let first_prev = records[recordIndex - 1].name.first[0];
-    let first_current = record.name.first[0];
-
-    if(first_prev != first_current){
-      return first_current;
-    }
-    return null; */
     if(recordIndex == 0){
       return record.first[0];
     }