From 6e0b54c0cf9f6f37495fb1dc53baf4fe76766a46 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 7 Jan 2022 09:03:15 +0100
Subject: [PATCH 001/112] connect to socket server

---
 src/app/home/home.page.ts                     | 49 ++++++++++++++++-
 src/app/services/auth.service.ts              |  6 +-
 .../socket-interface.service.spec.ts          | 16 ++++++
 .../interface/socket-interface.service.ts     | 55 +++++++++++++++++++
 .../socket/rocket-chat-client.service.spec.ts | 16 ++++++
 .../socket/rocket-chat-client.service.ts      | 46 ++++++++++++++++
 6 files changed, 185 insertions(+), 3 deletions(-)
 create mode 100644 src/app/services/socket/interface/socket-interface.service.spec.ts
 create mode 100644 src/app/services/socket/interface/socket-interface.service.ts
 create mode 100644 src/app/services/socket/rocket-chat-client.service.spec.ts
 create mode 100644 src/app/services/socket/rocket-chat-client.service.ts

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index a3cdc6423..19e60694f 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -27,7 +27,8 @@ import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { Device } from '@capacitor/device';
 import { RouteService } from 'src/app/services/route.service';
-
+import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-home',
@@ -90,7 +91,8 @@ export class HomePage implements OnInit {
     private processservice: ProcessesService,
     private screenOrientation: ScreenOrientation,
     private sqliteservice: SqliteService,
-    private RouteService: RouteService) {
+    private RouteService: RouteService,
+    private RocketChatClientService: RocketChatClientService) {
 
     /* this.webNotificationPopupService.askNotificationPermission() */
 
@@ -235,3 +237,46 @@ export class HomePage implements OnInit {
   }
 
 }
+
+
+
+const url = 'wss://gabinetedigitalchat.dyndns.info/websocket'
+const socket = new WebSocket(url);
+
+
+socket.onopen = ()=> {
+
+  console.log('============================ welcome to rocket chat =========================================');
+
+
+  const loginRequest = {
+    msg: "method",
+    method: "login",
+    id: "42",
+    params: [
+      {
+        "user": { "username": 'paulo.pinto@gabinetedigital.local' },
+        "password": {
+          "digest": 'tabteste@006',
+          "algorithm":"sha-256"
+        }
+      }
+    ]
+  }
+
+  // temp login
+  socket.send(JSON.stringify(loginRequest))
+};
+
+socket.onmessage = (event: any)=> {
+  console.log('rocket chat message', event)
+  console.log('event.data', JSON.parse(event.data))
+};
+
+socket.onclose = (event: any)=> {
+  console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
+};
+
+socket.onerror =(event: any)=> {
+  console.log(`[error] ${event.message}`);
+};
\ No newline at end of file
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 0a0e79467..64256e3c5 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -10,6 +10,7 @@ import { AlertController } from '@ionic/angular';
 import { SessionStore } from '../store/session.service';
 import { AESEncrypt } from '../services/aesencrypt.service';
 import { CookieService } from 'ngx-cookie-service';
+import { RocketChatClientService } from '../services/socket/rocket-chat-client.service';
 
 @Injectable({
   providedIn: 'root'
@@ -29,6 +30,7 @@ export class AuthService {
     public alertController: AlertController,
     private aesencrypt: AESEncrypt,
     private cookieService: CookieService,
+    private RocketChatClientService: RocketChatClientService
     ) {
 
       this.headers = new HttpHeaders();
@@ -99,8 +101,10 @@ export class AuthService {
 
       console.log(postData);
 
+      this.RocketChatClientService.login(postData)
+
       let responseChat = await this.httpService.post('login', postData).toPromise();
-      if(responseChat){
+      if(responseChat) {
         console.log('Login to Rocket chat OK');
         this.ValidatedUserChat = responseChat;
         localStorage.setItem('userChat', JSON.stringify(responseChat));
diff --git a/src/app/services/socket/interface/socket-interface.service.spec.ts b/src/app/services/socket/interface/socket-interface.service.spec.ts
new file mode 100644
index 000000000..52dedcd21
--- /dev/null
+++ b/src/app/services/socket/interface/socket-interface.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { SocketInterfaceService } from './socket-interface.service';
+
+describe('SocketInterfaceService', () => {
+  let service: SocketInterfaceService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(SocketInterfaceService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/socket/interface/socket-interface.service.ts b/src/app/services/socket/interface/socket-interface.service.ts
new file mode 100644
index 000000000..2aa620dc6
--- /dev/null
+++ b/src/app/services/socket/interface/socket-interface.service.ts
@@ -0,0 +1,55 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class SocketInterfaceService {
+
+  private socket!: WebSocket;
+  private url = ''
+  private connected = false
+  private callBacks: {
+    type: 'Offline' | 'Online' | 'Onmessage' | 'Chat' | 'Notification' | 'Notifications' | '',
+    object?: string
+    funx: Function
+  }[] = []
+  private msgQueue = []
+
+  constructor() { }
+
+  connect(url) {
+
+    this.url = url
+    this.socket = new WebSocket(this.url);
+    // bind function
+    this.socket.onopen = this.onopen;
+    this.socket.onmessage = this.onmessage;
+    this.socket.onclose = this.onclose;
+    this.socket.onerror = this.onerror;
+  }
+
+  send(message: object) {
+    if (!this.connected) { // save data to send when back online
+      this.msgQueue.push(message)
+    } else {
+      let messageStr = JSON.stringify(message)
+      this.socket.send(messageStr)
+    }
+  }
+
+  onopen() {
+
+  }
+  onmessage() {}
+  
+  onclose(event: any) {
+    console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
+    setTimeout(()=>{
+      this.connect(this.url)
+    }, 500)
+  }
+
+  onerror = (event: any) =>  {
+    console.log(`[error] ${event.message}`);
+  }
+}
diff --git a/src/app/services/socket/rocket-chat-client.service.spec.ts b/src/app/services/socket/rocket-chat-client.service.spec.ts
new file mode 100644
index 000000000..474d7913d
--- /dev/null
+++ b/src/app/services/socket/rocket-chat-client.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { RocketChatClientService } from './rocket-chat-client.service';
+
+describe('RocketChatClientService', () => {
+  let service: RocketChatClientService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(RocketChatClientService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
new file mode 100644
index 000000000..2c75e6abb
--- /dev/null
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -0,0 +1,46 @@
+import { Injectable } from '@angular/core';
+import { SocketInterfaceService } from './interface/socket-interface.service'
+import { environment } from 'src/environments/environment';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class RocketChatClientService {
+
+  private SocketInterfaceService = new SocketInterfaceService()
+  
+  constructor() {
+    const url = environment.apiChatUrl.replace('https','wss')
+    // this.SocketInterfaceService.connect(url);
+  }
+
+  login(user) {
+    const loginRequest = {
+      msg: "method",
+      method: "login",
+      id: "42",
+      params: [
+        {
+          "user": { "username": user.username },
+          "password": {
+            "digest": user.password,
+            "algorithm":"sha-256"
+          }
+        }
+      ]
+    }
+
+    // this.SocketInterfaceService.send(loginRequest)
+  }
+
+  logout(){ }
+
+  send(roomId, message, option) {}
+
+  receive() {}
+  joinRoom(){}
+  deleteMessage() {}
+  
+}
+
+window['RocketChatClientService'] = new RocketChatClientService();
\ No newline at end of file

From d951bf6cc1607e0f76295093da200f8ea30f402d Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 7 Jan 2022 11:21:14 +0100
Subject: [PATCH 002/112] improve rocket-chat-cliente interface

---
 package-lock.json                             |  17 +++
 package.json                                  |   1 +
 src/app/home/home.page.ts                     | 124 ++++++++++++------
 src/app/services/aesencrypt.service.ts        |   2 +-
 .../interface/socket-interface.service.ts     |  30 ++++-
 .../socket/rocket-chat-client.service.ts      |  38 +++++-
 src/app/services/toast.service.ts             |   2 +-
 7 files changed, 158 insertions(+), 56 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1c6a2eac5..153db057c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19818,6 +19818,23 @@
         "glob": "^7.1.3"
       }
     },
+    "rocket.chat.realtime.api.rxjs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/rocket.chat.realtime.api.rxjs/-/rocket.chat.realtime.api.rxjs-2.1.1.tgz",
+      "integrity": "sha512-R+aAbUi66CBwsXuji0AsQGOrUx4STXw9I8lf4hpPK/mRocyjcA+r+ri0bDHGoB0FGnooSvkvauqpy+RjbB2dEg==",
+      "requires": {
+        "crypto-js": "^3.1.9-1",
+        "rxjs": "^6.4.0",
+        "uuid": "^3.1.0"
+      },
+      "dependencies": {
+        "crypto-js": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
+          "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
+        }
+      }
+    },
     "rsvp": {
       "version": "4.8.5",
       "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
diff --git a/package.json b/package.json
index e36bb460a..7f646e2e2 100644
--- a/package.json
+++ b/package.json
@@ -136,6 +136,7 @@
     "pdfjs": "^2.4.6",
     "pdfjs-dist": "^2.9.359",
     "puppeteer": "^10.1.0",
+    "rocket.chat.realtime.api.rxjs": "^2.1.1",
     "rxjs": "~6.6.3",
     "rxjs-compat": "^6.6.7",
     "sharp": "^0.29.1",
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 19e60694f..633ae1aa6 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -29,6 +29,8 @@ import { Device } from '@capacitor/device';
 import { RouteService } from 'src/app/services/route.service';
 import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service';
 import { environment } from 'src/environments/environment';
+import { v4 as uuidv4 } from 'uuid'
+import { RealTimeAPI } from "rocket.chat.realtime.api.rxjs";
 
 @Component({
   selector: 'app-home',
@@ -94,6 +96,86 @@ export class HomePage implements OnInit {
     private RouteService: RouteService,
     private RocketChatClientService: RocketChatClientService) {
 
+    // this.RocketChatClientService.connect()
+    // this.RocketChatClientService.login({
+    //   username: 'paulo.pinto@gabinetedigital.local',
+    //   password: 'tabteste@006'
+    // })
+
+
+
+    // const url = 'wss://gabinetedigitalchat.dyndns.info/websocket'
+    // const socket = new WebSocket(url);
+
+
+    // socket.onopen = ()=> {
+
+    //   console.log('============================ welcome to rocket chat =========================================');
+
+    //   const connectMessage = {
+    //     msg: "connect",
+    //     version: "1",
+    //     support: ["1"]
+    //   }
+      
+    //   socket.send(JSON.stringify(connectMessage))
+
+    //   const loginRequest = {
+    //     msg: "method",
+    //     method: "login",
+    //     id: uuidv4(),
+    //     params: [
+    //       {
+    //         "user": {
+    //           "email": 'paulo.pinto@gabinetedigital.local' 
+    //         },
+    //         "password": {
+    //           "digest": 'tabteste@006',
+    //           "algorithm":"sha-256"
+    //         }
+    //       }
+    //     ]
+    //   }
+
+    //   // temp login
+    //   socket.send(JSON.stringify(loginRequest))
+    // };
+
+    // socket.onmessage = (event: any)=> {
+    //   // console.log('rocket chat message', event)
+    //   console.log('event.data', JSON.parse(event.data))
+    // };
+
+    // socket.onclose = (event: any)=> {
+    //   console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
+    // };
+
+    // socket.onerror =(event: any)=> {
+    //   console.log(`[error] ${event.message}`);
+    // };
+
+
+    // const realTimeAPI =  new RealTimeAPI("wss://gabinetedigitalchat.dyndns.info/websocket");
+    // realTimeAPI.keepAlive().subscribe();
+    // const auth = realTimeAPI.login('tiago.kayaya@gabinetedigital.local', 'tabteste@006');
+    
+    // //Subscribe to messages and errors
+    // auth.subscribe(
+    //   (data) => console.log('socket data', data),
+    //   (err) => console.log('socket err', err),
+    //   () => console.log('completed')
+    // );
+    
+    // // Subscribe to a specific channel, identified by roomId
+    // realTimeAPI.sendMessage({
+    //   msg: 'sub',
+    //   id: '<a unique Id for subscription>',
+    //   name: 'stream-room-messages',
+    //   params: ['44', false],
+    // });
+    
+    // this.RocketChatClientService.send()
+
     /* this.webNotificationPopupService.askNotificationPermission() */
 
     this.router.events.subscribe((val) => {
@@ -238,45 +320,3 @@ export class HomePage implements OnInit {
 
 }
 
-
-
-const url = 'wss://gabinetedigitalchat.dyndns.info/websocket'
-const socket = new WebSocket(url);
-
-
-socket.onopen = ()=> {
-
-  console.log('============================ welcome to rocket chat =========================================');
-
-
-  const loginRequest = {
-    msg: "method",
-    method: "login",
-    id: "42",
-    params: [
-      {
-        "user": { "username": 'paulo.pinto@gabinetedigital.local' },
-        "password": {
-          "digest": 'tabteste@006',
-          "algorithm":"sha-256"
-        }
-      }
-    ]
-  }
-
-  // temp login
-  socket.send(JSON.stringify(loginRequest))
-};
-
-socket.onmessage = (event: any)=> {
-  console.log('rocket chat message', event)
-  console.log('event.data', JSON.parse(event.data))
-};
-
-socket.onclose = (event: any)=> {
-  console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
-};
-
-socket.onerror =(event: any)=> {
-  console.log(`[error] ${event.message}`);
-};
\ No newline at end of file
diff --git a/src/app/services/aesencrypt.service.ts b/src/app/services/aesencrypt.service.ts
index 2a9f33289..7323da936 100644
--- a/src/app/services/aesencrypt.service.ts
+++ b/src/app/services/aesencrypt.service.ts
@@ -22,7 +22,7 @@ export class AESEncrypt {
 
         //Decrypting the string contained in cipherParams using the PBKDF2 key
         var decrypted = CryptoJS.AES.encrypt(encryptData, key128Bits1000Iterations, { mode: CryptoJS.mode.CBC, iv: iv, padding: CryptoJS.pad.Pkcs7 });
-        console.log('AES encrypt',decrypted.toString());
+        // console.log('AES encrypt',decrypted.toString());
 
         return decrypted.toString();
     }
diff --git a/src/app/services/socket/interface/socket-interface.service.ts b/src/app/services/socket/interface/socket-interface.service.ts
index 2aa620dc6..c04d190ff 100644
--- a/src/app/services/socket/interface/socket-interface.service.ts
+++ b/src/app/services/socket/interface/socket-interface.service.ts
@@ -9,7 +9,7 @@ export class SocketInterfaceService {
   private url = ''
   private connected = false
   private callBacks: {
-    type: 'Offline' | 'Online' | 'Onmessage' | 'Chat' | 'Notification' | 'Notifications' | '',
+    type: 'Offline' | 'Online' | 'Open' ,
     object?: string
     funx: Function
   }[] = []
@@ -17,6 +17,14 @@ export class SocketInterfaceService {
 
   constructor() { }
 
+  registerCallback(type: 'Offline' | 'Online' | 'Open', funx: Function, object = '') {
+    this.callBacks.push({
+      type,
+      funx,
+      object
+    })
+  }
+
   connect(url) {
 
     this.url = url
@@ -28,8 +36,20 @@ export class SocketInterfaceService {
     this.socket.onerror = this.onerror;
   }
 
+  onopen() {
+    this.connected = true
+
+    // send all saved data due to internet connection
+    this.msgQueue.forEach((item, index, object) => {
+      this.send(item);
+      object.splice(index, 1);
+    })
+  }
+
   send(message: object) {
-    if (!this.connected) { // save data to send when back online
+    console.log(this.connected, message)
+
+    if (this.connected === false) { // save data to send when back online
       this.msgQueue.push(message)
     } else {
       let messageStr = JSON.stringify(message)
@@ -37,12 +57,12 @@ export class SocketInterfaceService {
     }
   }
 
-  onopen() {
-
+  onmessage(event: any) {
+    console.log('event.data', JSON.parse(event.data))
   }
-  onmessage() {}
   
   onclose(event: any) {
+    this.connected = false
     console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
     setTimeout(()=>{
       this.connect(this.url)
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 2c75e6abb..218e608da 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { SocketInterfaceService } from './interface/socket-interface.service'
 import { environment } from 'src/environments/environment';
+import { v4 as uuidv4 } from 'uuid'
 
 @Injectable({
   providedIn: 'root'
@@ -9,16 +10,25 @@ export class RocketChatClientService {
 
   private SocketInterfaceService = new SocketInterfaceService()
   
-  constructor() {
-    const url = environment.apiChatUrl.replace('https','wss')
-    // this.SocketInterfaceService.connect(url);
+  constructor() {}
+
+  connect(url = 'wss://gabinetedigitalchat.dyndns.info/websocket') {
+
+    this.SocketInterfaceService.connect(url);
+
+    const connectMessage = {
+      msg: "connect",
+      version: "1",
+      support: ["1"]
+    }
+    this.SocketInterfaceService.send(connectMessage)
   }
 
   login(user) {
     const loginRequest = {
       msg: "method",
       method: "login",
-      id: "42",
+      id: uuidv4(),
       params: [
         {
           "user": { "username": user.username },
@@ -29,17 +39,31 @@ export class RocketChatClientService {
         }
       ]
     }
-
-    // this.SocketInterfaceService.send(loginRequest)
+    this.SocketInterfaceService.send(loginRequest)
   }
 
   logout(){ }
 
-  send(roomId, message, option) {}
+  send(roomId, message, option) {
+    var request = {
+      "msg": "method",
+      "method": "sendMessage",
+      "id": uuidv4(),
+      "params": [{
+         "_id": "message-id",
+         "rid": "room-id",
+         "msg": "Hello World!"
+      }]
+   }
+
+   this.SocketInterfaceService.send(request);
+  }
 
   receive() {}
   joinRoom(){}
   deleteMessage() {}
+
+  createRoom() {}
   
 }
 
diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts
index 60fbde25a..840678e37 100644
--- a/src/app/services/toast.service.ts
+++ b/src/app/services/toast.service.ts
@@ -219,7 +219,7 @@ export class ToastService {
       </div>
     `;
     
-    console.log(document.querySelector('body').classList)
+    // console.log(document.querySelector('body').classList)
     document.body.append(loader)
 
     loader.addEventListener('click', ()=>{

From 33c668a9c4692d9bfd9292cc8f83cae20c5cc957 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 7 Jan 2022 14:29:41 +0100
Subject: [PATCH 003/112] login to websocket

---
 src/app/home/home.page.ts                     | 119 +++++++++---------
 src/app/pages/events/events.page.ts           |   2 +-
 .../interface/socket-interface.service.ts     |  20 ++-
 .../socket/rocket-chat-client.service.ts      |  59 ++++++---
 4 files changed, 120 insertions(+), 80 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 633ae1aa6..37cea34ee 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -102,80 +102,81 @@ export class HomePage implements OnInit {
     //   password: 'tabteste@006'
     // })
 
+      const url = 'wss://gabinetedigitalchat.dyndns.info/websocket'
+      const socket = new WebSocket(url);
+      socket.onopen = ()=> {
 
+        console.log('============================ welcome to rocket chat =========================================');
 
-    // const url = 'wss://gabinetedigitalchat.dyndns.info/websocket'
-    // const socket = new WebSocket(url);
+        const connectRequest  = {
+          msg: "connect",
+          version: "1",
+          support: ["1", "pre2", "pre1"]
+        }
+        
+        // ======================= connect
+        socket.send(JSON.stringify(connectRequest ))
+      };
 
+      socket.onmessage = (event: any)=> {
 
-    // socket.onopen = ()=> {
+        console.log('event.data', JSON.parse(event.data))
 
-    //   console.log('============================ welcome to rocket chat =========================================');
+        const data = JSON.parse(event.data)
 
-    //   const connectMessage = {
-    //     msg: "connect",
-    //     version: "1",
-    //     support: ["1"]
-    //   }
-      
-    //   socket.send(JSON.stringify(connectMessage))
+        if(event.data=='{"msg":"ping"}') {
+          socket.send('{"msg":"pong"}')
 
-    //   const loginRequest = {
-    //     msg: "method",
-    //     method: "login",
-    //     id: uuidv4(),
-    //     params: [
-    //       {
-    //         "user": {
-    //           "email": 'paulo.pinto@gabinetedigital.local' 
-    //         },
-    //         "password": {
-    //           "digest": 'tabteste@006',
-    //           "algorithm":"sha-256"
-    //         }
-    //       }
-    //     ]
-    //   }
+          const loginRequest = {
+            msg: "method",
+            method: "login",
+            id: uuidv4(),
+            params: [
+              {
+                "user": {
+                  "username": "paulo.pinto" 
+                },
+                "password": "tabteste@006"
+              }
+            ]
+          }
 
-    //   // temp login
-    //   socket.send(JSON.stringify(loginRequest))
-    // };
+          // ======================== login
+          socket.send(JSON.stringify(loginRequest))
+        }
 
-    // socket.onmessage = (event: any)=> {
-    //   // console.log('rocket chat message', event)
-    //   console.log('event.data', JSON.parse(event.data))
-    // };
+        // login successfully
+        if(data.result) {
+          if(data.result.token) {
+            console.log('login successfully')
 
-    // socket.onclose = (event: any)=> {
-    //   console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
-    // };
+            const requestId =  uuidv4()
 
-    // socket.onerror =(event: any)=> {
-    //   console.log(`[error] ${event.message}`);
-    // };
+            var request = {
+              msg: "method",
+              method: "sendMessage",
+              id: requestId,
+              params: [{
+                _id: "message-id" || uuidv4(),
+                rid: "room-id" || 444,
+                msg: "Hello World!"
+              }]
+            }
 
+          }
+        }
+      };
+
+      socket.onclose = (event: any)=> {
+        console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
+      };
+
+      socket.onerror =(event: any)=> {
+        console.log(`[error] ${event.message}`);
+      };
 
-    // const realTimeAPI =  new RealTimeAPI("wss://gabinetedigitalchat.dyndns.info/websocket");
-    // realTimeAPI.keepAlive().subscribe();
-    // const auth = realTimeAPI.login('tiago.kayaya@gabinetedigital.local', 'tabteste@006');
-    
-    // //Subscribe to messages and errors
-    // auth.subscribe(
-    //   (data) => console.log('socket data', data),
-    //   (err) => console.log('socket err', err),
-    //   () => console.log('completed')
-    // );
-    
-    // // Subscribe to a specific channel, identified by roomId
-    // realTimeAPI.sendMessage({
-    //   msg: 'sub',
-    //   id: '<a unique Id for subscription>',
-    //   name: 'stream-room-messages',
-    //   params: ['44', false],
-    // });
     
     // this.RocketChatClientService.send()
-
     /* this.webNotificationPopupService.askNotificationPermission() */
 
     this.router.events.subscribe((val) => {
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index c5e6e044c..056d5c9d8 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -211,7 +211,7 @@ export class EventsPage implements OnInit {
       let mdPessoalEvents = await this.eventService.getAllMdPessoalEvents(start, end).toPromise();
 
       const list = mdOficialEvents.concat(mdPessoalEvents);
-      console.log("getAllMdOficialPessoalEvents", list)
+     
       this.addEventToDb(list);
       this.listToPresent = list
 
diff --git a/src/app/services/socket/interface/socket-interface.service.ts b/src/app/services/socket/interface/socket-interface.service.ts
index c04d190ff..b21aaf44f 100644
--- a/src/app/services/socket/interface/socket-interface.service.ts
+++ b/src/app/services/socket/interface/socket-interface.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { v4 as uuidv4 } from 'uuid';
 
 @Injectable({
   providedIn: 'root'
@@ -13,7 +14,13 @@ export class SocketInterfaceService {
     object?: string
     funx: Function
   }[] = []
-  private msgQueue = []
+  private msgQueue : {
+    message: object,
+    requestId: string
+  }[] = []
+
+  private msgQueueIds = []
+  private disconnect: Function
 
   constructor() { }
 
@@ -41,20 +48,23 @@ export class SocketInterfaceService {
 
     // send all saved data due to internet connection
     this.msgQueue.forEach((item, index, object) => {
-      this.send(item);
+      this.send(item.message, item.requestId);
       object.splice(index, 1);
+      this.msgQueueIds.slice(index, 1)
     })
   }
 
-  send(message: object) {
-    console.log(this.connected, message)
+  send(message: object, requestId = uuidv4()) {
 
     if (this.connected === false) { // save data to send when back online
-      this.msgQueue.push(message)
+      this.msgQueue.push({message, requestId})
+      this.msgQueueIds.push(requestId)
     } else {
       let messageStr = JSON.stringify(message)
       this.socket.send(messageStr)
     }
+
+    return requestId
   }
 
   onmessage(event: any) {
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 218e608da..975bb8b15 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -10,7 +10,11 @@ export class RocketChatClientService {
 
   private SocketInterfaceService = new SocketInterfaceService()
   
-  constructor() {}
+  constructor() {
+
+  }
+
+  private returns() {}
 
   connect(url = 'wss://gabinetedigitalchat.dyndns.info/websocket') {
 
@@ -25,10 +29,12 @@ export class RocketChatClientService {
   }
 
   login(user) {
+    const requestId =  uuidv4()
+
     const loginRequest = {
       msg: "method",
       method: "login",
-      id: uuidv4(),
+      id: requestId,
       params: [
         {
           "user": { "username": user.username },
@@ -39,31 +45,54 @@ export class RocketChatClientService {
         }
       ]
     }
-    this.SocketInterfaceService.send(loginRequest)
+    this.SocketInterfaceService.send(loginRequest, requestId)
+
+    return requestId
   }
 
   logout(){ }
 
   send(roomId, message, option) {
-    var request = {
-      "msg": "method",
-      "method": "sendMessage",
-      "id": uuidv4(),
-      "params": [{
-         "_id": "message-id",
-         "rid": "room-id",
-         "msg": "Hello World!"
-      }]
-   }
+    const requestId =  uuidv4()
 
-   this.SocketInterfaceService.send(request);
+    var request = {
+      msg: "method",
+      method: "sendMessage",
+      id: requestId,
+      params: [{
+        _id: "message-id" || uuidv4(),
+        rid: "room-id" || roomId,
+        msg: "Hello World!" || message
+      }]
+    }
+
+    this.SocketInterfaceService.send(request, requestId);
+
+    return requestId;
   }
 
   receive() {}
   joinRoom(){}
   deleteMessage() {}
-
   createRoom() {}
+
+  subscribe() {
+    var subscribeRequest = {
+      "msg": "sub",
+      "id": "unique-id",
+      "name": "stream-notify-room",
+      "params":[
+      "room-id/event",
+        false
+      ]
+    }
+
+   this.SocketInterfaceService.send(subscribeRequest);
+  }
+
+  private disconnect = () => {
+
+  }
   
 }
 

From 178e3cc5594843ed1eedf9cc875535032659ab6b Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 7 Jan 2022 14:32:58 +0100
Subject: [PATCH 004/112] send message

---
 src/app/home/home.page.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 37cea34ee..f2d7641aa 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -152,7 +152,7 @@ export class HomePage implements OnInit {
 
             const requestId =  uuidv4()
 
-            var request = {
+            var requestMessage = {
               msg: "method",
               method: "sendMessage",
               id: requestId,
@@ -163,6 +163,8 @@ export class HomePage implements OnInit {
               }]
             }
 
+            // socket.send(JSON.stringify(requestMessage ))
+
           }
         }
       };

From ee8550f98305d4ce2d37ae9271daa0d5bbf927e3 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 7 Jan 2022 15:48:35 +0100
Subject: [PATCH 005/112] rocket chat service

---
 src/app/home/home.page.ts                     | 132 +++++++++---------
 src/app/services/auth.service.ts              |   5 -
 .../socket-interface.service.spec.ts          |  16 ---
 .../interface/socket-interface.service.ts     |  85 -----------
 .../socket/rocket-chat-client.service.ts      | 114 ++++++++++++---
 5 files changed, 165 insertions(+), 187 deletions(-)
 delete mode 100644 src/app/services/socket/interface/socket-interface.service.spec.ts
 delete mode 100644 src/app/services/socket/interface/socket-interface.service.ts

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index f2d7641aa..242e597b3 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -73,6 +73,9 @@ export class HomePage implements OnInit {
 
   status: string = "";
   audioName: string = "";
+
+  RocketChatClientService = RocketChatClientService
+
   constructor(
     private router: Router,
     public modalCtrl: AlertController,
@@ -93,89 +96,88 @@ export class HomePage implements OnInit {
     private processservice: ProcessesService,
     private screenOrientation: ScreenOrientation,
     private sqliteservice: SqliteService,
-    private RouteService: RouteService,
-    private RocketChatClientService: RocketChatClientService) {
+    private RouteService: RouteService) {
 
-    // this.RocketChatClientService.connect()
-    // this.RocketChatClientService.login({
-    //   username: 'paulo.pinto@gabinetedigital.local',
-    //   password: 'tabteste@006'
-    // })
+    this.RocketChatClientService.connect()
+    this.RocketChatClientService.login({
+      username: 'paulo.pinto@gabinetedigital.local',
+      password: 'tabteste@006'
+    })
 
-      const url = 'wss://gabinetedigitalchat.dyndns.info/websocket'
-      const socket = new WebSocket(url);
-      socket.onopen = ()=> {
+      // const url = 'wss://gabinetedigitalchat.dyndns.info/websocket'
+      // const socket = new WebSocket(url);
+      // socket.onopen = ()=> {
 
-        console.log('============================ welcome to rocket chat =========================================');
+      //   console.log('============================ welcome to rocket chat =========================================');
 
-        const connectRequest  = {
-          msg: "connect",
-          version: "1",
-          support: ["1", "pre2", "pre1"]
-        }
+      //   const connectRequest  = {
+      //     msg: "connect",
+      //     version: "1",
+      //     support: ["1", "pre2", "pre1"]
+      //   }
         
-        // ======================= connect
-        socket.send(JSON.stringify(connectRequest ))
-      };
+      //   // ======================= connect
+      //   socket.send(JSON.stringify(connectRequest ))
+      // };
 
-      socket.onmessage = (event: any)=> {
+      // socket.onmessage = (event: any)=> {
 
-        console.log('event.data', JSON.parse(event.data))
+      //   console.log('event.data', JSON.parse(event.data))
 
-        const data = JSON.parse(event.data)
+      //   const data = JSON.parse(event.data)
 
-        if(event.data=='{"msg":"ping"}') {
-          socket.send('{"msg":"pong"}')
+      //   if(event.data=='{"msg":"ping"}') {
+      //     socket.send('{"msg":"pong"}')
 
-          const loginRequest = {
-            msg: "method",
-            method: "login",
-            id: uuidv4(),
-            params: [
-              {
-                "user": {
-                  "username": "paulo.pinto" 
-                },
-                "password": "tabteste@006"
-              }
-            ]
-          }
+      //     const loginRequest = {
+      //       msg: "method",
+      //       method: "login",
+      //       id: uuidv4(),
+      //       params: [
+      //         {
+      //           "user": {
+      //             "username": "paulo.pinto" 
+      //           },
+      //           "password": "tabteste@006"
+      //         }
+      //       ]
+      //     }
 
-          // ======================== login
-          socket.send(JSON.stringify(loginRequest))
-        }
+      //     // ======================== login
+      //     socket.send(JSON.stringify(loginRequest))
+      //   }
 
-        // login successfully
-        if(data.result) {
-          if(data.result.token) {
-            console.log('login successfully')
+      //   // login successfully
+      //   if(data.result) {
+      //     if(data.result.token) {
+      //       console.log('login successfully')
 
-            const requestId =  uuidv4()
+      //       const requestId =  uuidv4()
 
-            var requestMessage = {
-              msg: "method",
-              method: "sendMessage",
-              id: requestId,
-              params: [{
-                _id: "message-id" || uuidv4(),
-                rid: "room-id" || 444,
-                msg: "Hello World!"
-              }]
-            }
+      //       var requestMessage = {
+      //         msg: "method",
+      //         method: "sendMessage",
+      //         id: requestId,
+      //         params: [{
+      //           _id: "message-id" || uuidv4(),
+      //           rid: "room-id" || 444,
+      //           msg: "Hello World!"
+      //         }]
+      //       }
 
-            // socket.send(JSON.stringify(requestMessage ))
+      //       // socket.send(JSON.stringify(requestMessage ))
 
-          }
-        }
-      };
+      //     }
+      //   }
+      // };
 
-      socket.onclose = (event: any)=> {
-        console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
-      };
+      // socket.onclose = (event: any)=> {
+      //   console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
+      // };
 
-      socket.onerror =(event: any)=> {
-        console.log(`[error] ${event.message}`);
-      };
+      // socket.onerror =(event: any)=> {
+      //   console.log(`[error] ${event.message}`);
+      // };
 
     
     // this.RocketChatClientService.send()
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 64256e3c5..3024f8bff 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -30,7 +30,6 @@ export class AuthService {
     public alertController: AlertController,
     private aesencrypt: AESEncrypt,
     private cookieService: CookieService,
-    private RocketChatClientService: RocketChatClientService
     ) {
 
       this.headers = new HttpHeaders();
@@ -99,10 +98,6 @@ export class AuthService {
         "password": user.password,
       }
 
-      console.log(postData);
-
-      this.RocketChatClientService.login(postData)
-
       let responseChat = await this.httpService.post('login', postData).toPromise();
       if(responseChat) {
         console.log('Login to Rocket chat OK');
diff --git a/src/app/services/socket/interface/socket-interface.service.spec.ts b/src/app/services/socket/interface/socket-interface.service.spec.ts
deleted file mode 100644
index 52dedcd21..000000000
--- a/src/app/services/socket/interface/socket-interface.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { SocketInterfaceService } from './socket-interface.service';
-
-describe('SocketInterfaceService', () => {
-  let service: SocketInterfaceService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(SocketInterfaceService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/services/socket/interface/socket-interface.service.ts b/src/app/services/socket/interface/socket-interface.service.ts
deleted file mode 100644
index b21aaf44f..000000000
--- a/src/app/services/socket/interface/socket-interface.service.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { Injectable } from '@angular/core';
-import { v4 as uuidv4 } from 'uuid';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class SocketInterfaceService {
-
-  private socket!: WebSocket;
-  private url = ''
-  private connected = false
-  private callBacks: {
-    type: 'Offline' | 'Online' | 'Open' ,
-    object?: string
-    funx: Function
-  }[] = []
-  private msgQueue : {
-    message: object,
-    requestId: string
-  }[] = []
-
-  private msgQueueIds = []
-  private disconnect: Function
-
-  constructor() { }
-
-  registerCallback(type: 'Offline' | 'Online' | 'Open', funx: Function, object = '') {
-    this.callBacks.push({
-      type,
-      funx,
-      object
-    })
-  }
-
-  connect(url) {
-
-    this.url = url
-    this.socket = new WebSocket(this.url);
-    // bind function
-    this.socket.onopen = this.onopen;
-    this.socket.onmessage = this.onmessage;
-    this.socket.onclose = this.onclose;
-    this.socket.onerror = this.onerror;
-  }
-
-  onopen() {
-    this.connected = true
-
-    // send all saved data due to internet connection
-    this.msgQueue.forEach((item, index, object) => {
-      this.send(item.message, item.requestId);
-      object.splice(index, 1);
-      this.msgQueueIds.slice(index, 1)
-    })
-  }
-
-  send(message: object, requestId = uuidv4()) {
-
-    if (this.connected === false) { // save data to send when back online
-      this.msgQueue.push({message, requestId})
-      this.msgQueueIds.push(requestId)
-    } else {
-      let messageStr = JSON.stringify(message)
-      this.socket.send(messageStr)
-    }
-
-    return requestId
-  }
-
-  onmessage(event: any) {
-    console.log('event.data', JSON.parse(event.data))
-  }
-  
-  onclose(event: any) {
-    this.connected = false
-    console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
-    setTimeout(()=>{
-      this.connect(this.url)
-    }, 500)
-  }
-
-  onerror = (event: any) =>  {
-    console.log(`[error] ${event.message}`);
-  }
-}
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 975bb8b15..bbac211a6 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -1,31 +1,32 @@
 import { Injectable } from '@angular/core';
-import { SocketInterfaceService } from './interface/socket-interface.service'
-import { environment } from 'src/environments/environment';
 import { v4 as uuidv4 } from 'uuid'
 
-@Injectable({
-  providedIn: 'root'
-})
-export class RocketChatClientService {
+class _RocketChatClientService {
 
-  private SocketInterfaceService = new SocketInterfaceService()
+  connected = false
   
-  constructor() {
-
-  }
+  constructor() {}
 
   private returns() {}
 
   connect(url = 'wss://gabinetedigitalchat.dyndns.info/websocket') {
 
-    this.SocketInterfaceService.connect(url);
+    this.ws.connect(url);
 
     const connectMessage = {
       msg: "connect",
       version: "1",
       support: ["1"]
     }
-    this.SocketInterfaceService.send(connectMessage)
+
+    this.ws.send(connectMessage)
+
+    this.ws.registerCallback('Onmessage',(message: any) => {
+      if(message.msg == "ping") {
+        this.ws.send({msg:"pong"})
+      }
+    })
+
   }
 
   login(user) {
@@ -45,7 +46,7 @@ export class RocketChatClientService {
         }
       ]
     }
-    this.SocketInterfaceService.send(loginRequest, requestId)
+    this.ws.send(loginRequest, requestId)
 
     return requestId
   }
@@ -66,7 +67,7 @@ export class RocketChatClientService {
       }]
     }
 
-    this.SocketInterfaceService.send(request, requestId);
+    // this.ws.send(request, requestId);
 
     return requestId;
   }
@@ -87,13 +88,94 @@ export class RocketChatClientService {
       ]
     }
 
-   this.SocketInterfaceService.send(subscribeRequest);
+   //this.ws.send(subscribeRequest);
   }
 
   private disconnect = () => {
 
   }
   
+  // socket ==================================================================
+  private socket!: WebSocket;
+  private url = ''
+  private callBacks: {
+    type: 'Offline' | 'Online' | 'Open' | 'Onmessage',
+    object?: string
+    funx: Function
+  }[] = []
+  msgQueue : {
+    message: object,
+    requestId: string
+  }[] = []
+
+  ws = {
+    registerCallback:(type: 'Offline' | 'Online' | 'Open' | 'Onmessage', funx: Function, object = '') =>{
+      this.callBacks.push({
+        type,
+        funx,
+        object
+      })
+    },
+    connect:(url)=> {
+  
+      this.url = url
+      this.socket = new WebSocket(this.url);
+      // bind function
+      this.socket.onopen = this.ws.onopen;
+      this.socket.onmessage = this.ws.onmessage;
+      this.socket.onclose = this.ws.onclose;
+      this.socket.onerror = this.ws.onerror;
+    },
+    onopen:()=> {
+      this.connected = true
+      console.log('================== welcome to socket server =====================')
+  
+  
+      this.msgQueue.forEach((item, index, object) => {
+        this.ws.send(item.message, item.requestId);
+        object.splice(index, 1);
+      })
+  
+    },
+    send: (message: object, requestId = uuidv4()) => {
+  
+      if (this.connected == false) { // save data to send when back online
+        console.log('save msgQueue')
+        this.msgQueue.push({message, requestId})
+      } else {
+        console.log('send rocket chat', message)
+        let messageStr = JSON.stringify(message)
+        this.socket.send(messageStr)
+      }
+      return requestId
+    },
+  
+    onmessage:(event: any)=> {
+      const data = JSON.parse(event.data)
+      console.log('event.data', data)
+  
+      this.callBacks.forEach((e)=>{
+        if(e.type== 'Onmessage') {
+          e.funx(data)
+        }
+      })
+    },
+    
+    onclose:(event: any)=> {
+      this.connected = false
+      console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
+      setTimeout(()=>{
+        // this.connect(this.url)
+      }, 500)
+    },
+  
+    onerror: (event: any) =>  {
+      console.log(`[error] ${event.message}`);
+    }
+
+  }
+
 }
 
-window['RocketChatClientService'] = new RocketChatClientService();
\ No newline at end of file
+
+export const RocketChatClientService = new _RocketChatClientService()
\ No newline at end of file

From e2f69a67882870ac285b310070fb5f73c53fe961 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 7 Jan 2022 16:34:02 +0100
Subject: [PATCH 006/112] Imrpove websocket inicial connect

---
 src/app/home/home.page.ts                     | 85 ++-----------------
 .../socket/rocket-chat-client.service.ts      | 16 ++--
 2 files changed, 16 insertions(+), 85 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 242e597b3..a56568a49 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -98,87 +98,12 @@ export class HomePage implements OnInit {
     private sqliteservice: SqliteService,
     private RouteService: RouteService) {
 
-    this.RocketChatClientService.connect()
-    this.RocketChatClientService.login({
-      username: 'paulo.pinto@gabinetedigital.local',
-      password: 'tabteste@006'
+    this.RocketChatClientService.connect(()=>{
+      this.RocketChatClientService.login({
+        username: 'paulo.pinto@gabinetedigital.local',
+        password: 'tabteste@006'
+      })
     })
-
-      // const url = 'wss://gabinetedigitalchat.dyndns.info/websocket'
-      // const socket = new WebSocket(url);
-      // socket.onopen = ()=> {
-
-      //   console.log('============================ welcome to rocket chat =========================================');
-
-      //   const connectRequest  = {
-      //     msg: "connect",
-      //     version: "1",
-      //     support: ["1", "pre2", "pre1"]
-      //   }
-        
-      //   // ======================= connect
-      //   socket.send(JSON.stringify(connectRequest ))
-      // };
-
-      // socket.onmessage = (event: any)=> {
-
-      //   console.log('event.data', JSON.parse(event.data))
-
-      //   const data = JSON.parse(event.data)
-
-      //   if(event.data=='{"msg":"ping"}') {
-      //     socket.send('{"msg":"pong"}')
-
-      //     const loginRequest = {
-      //       msg: "method",
-      //       method: "login",
-      //       id: uuidv4(),
-      //       params: [
-      //         {
-      //           "user": {
-      //             "username": "paulo.pinto" 
-      //           },
-      //           "password": "tabteste@006"
-      //         }
-      //       ]
-      //     }
-
-      //     // ======================== login
-      //     socket.send(JSON.stringify(loginRequest))
-      //   }
-
-      //   // login successfully
-      //   if(data.result) {
-      //     if(data.result.token) {
-      //       console.log('login successfully')
-
-      //       const requestId =  uuidv4()
-
-      //       var requestMessage = {
-      //         msg: "method",
-      //         method: "sendMessage",
-      //         id: requestId,
-      //         params: [{
-      //           _id: "message-id" || uuidv4(),
-      //           rid: "room-id" || 444,
-      //           msg: "Hello World!"
-      //         }]
-      //       }
-
-      //       // socket.send(JSON.stringify(requestMessage ))
-
-      //     }
-      //   }
-      // };
-
-      // socket.onclose = (event: any)=> {
-      //   console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
-      // };
-
-      // socket.onerror =(event: any)=> {
-      //   console.log(`[error] ${event.message}`);
-      // };
-
     
     // this.RocketChatClientService.send()
     /* this.webNotificationPopupService.askNotificationPermission() */
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index bbac211a6..94f279628 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -4,14 +4,15 @@ import { v4 as uuidv4 } from 'uuid'
 class _RocketChatClientService {
 
   connected = false
+  hasPing = false
   
   constructor() {}
 
   private returns() {}
 
-  connect(url = 'wss://gabinetedigitalchat.dyndns.info/websocket') {
+  connect(firstPing: Function) {
 
-    this.ws.connect(url);
+    this.ws.connect('wss://gabinetedigitalchat.dyndns.info/websocket');
 
     const connectMessage = {
       msg: "connect",
@@ -20,10 +21,15 @@ class _RocketChatClientService {
     }
 
     this.ws.send(connectMessage)
-
+    
     this.ws.registerCallback('Onmessage',(message: any) => {
       if(message.msg == "ping") {
         this.ws.send({msg:"pong"})
+        if(this.hasPing == false) {
+          // first ping
+          firstPing()
+          this.hasPing = true
+        }
       }
     })
 
@@ -51,7 +57,7 @@ class _RocketChatClientService {
     return requestId
   }
 
-  logout(){ }
+  logout(){}
 
   send(roomId, message, option) {
     const requestId =  uuidv4()
@@ -95,7 +101,7 @@ class _RocketChatClientService {
 
   }
   
-  // socket ==================================================================
+  // socket class ==================================================================
   private socket!: WebSocket;
   private url = ''
   private callBacks: {

From f8d03e12835ee4061387fcda739bb8b09ce81e17 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 7 Jan 2022 16:39:46 +0100
Subject: [PATCH 007/112] save

---
 src/app/home/home.page.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index f2d7641aa..1dcc85a71 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -29,8 +29,7 @@ import { Device } from '@capacitor/device';
 import { RouteService } from 'src/app/services/route.service';
 import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service';
 import { environment } from 'src/environments/environment';
-import { v4 as uuidv4 } from 'uuid'
-import { RealTimeAPI } from "rocket.chat.realtime.api.rxjs";
+import { v4 as uuidv4 } from 'uuid';
 
 @Component({
   selector: 'app-home',
@@ -113,7 +112,7 @@ export class HomePage implements OnInit {
           version: "1",
           support: ["1", "pre2", "pre1"]
         }
-        
+
         // ======================= connect
         socket.send(JSON.stringify(connectRequest ))
       };
@@ -134,7 +133,7 @@ export class HomePage implements OnInit {
             params: [
               {
                 "user": {
-                  "username": "paulo.pinto" 
+                  "username": "paulo.pinto"
                 },
                 "password": "tabteste@006"
               }
@@ -177,7 +176,7 @@ export class HomePage implements OnInit {
         console.log(`[error] ${event.message}`);
       };
 
-    
+
     // this.RocketChatClientService.send()
     /* this.webNotificationPopupService.askNotificationPermission() */
 
@@ -244,7 +243,7 @@ export class HomePage implements OnInit {
 
    logDeviceInfo = async () => {
     const info = await Device.getInfo();
-  
+
     console.log('Device info',info);
   };
 
@@ -274,7 +273,7 @@ export class HomePage implements OnInit {
     });
 
   }
-  
+
   async synchWhenOnline() {
     try {
       await this.storage.get('eventEdit').then((req) => {

From abdc9ea2314ab819200aa362deafb2fa07a34999 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 08:34:30 +0100
Subject: [PATCH 008/112] add reconnect for websocket

---
 .../new-publication/new-publication.page.ts   |  4 ----
 .../socket/rocket-chat-client.service.ts      | 20 +++++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index 5d562fdde..f83d7f522 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -113,8 +113,6 @@ export class NewPublicationPage implements OnInit {
     // this.takePicture();
   }
 
-  imageUrl;
-
   async takePicture() {
 
     const capturedImage = await Camera.getPhoto({
@@ -125,10 +123,8 @@ export class NewPublicationPage implements OnInit {
     });
 
     const response = await fetch(capturedImage.webPath!);
-    this.imageUrl = capturedImage.webPath
     const blob = await response.blob();
 
-
     this.convertBlobToBase64Worker.postMessage(blob);
     this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
       this.capturedImage = oEvent.data
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 94f279628..2a588120d 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -4,13 +4,16 @@ import { v4 as uuidv4 } from 'uuid'
 class _RocketChatClientService {
 
   connected = false
-  hasPing = false
+  private hasPing = false
+  private firstPingFunx: Function
   
   constructor() {}
 
   private returns() {}
 
-  connect(firstPing: Function) {
+  connect(firstPingFunx: Function) {
+    this.hasPing = false
+    this.firstPingFunx = firstPingFunx
 
     this.ws.connect('wss://gabinetedigitalchat.dyndns.info/websocket');
 
@@ -27,7 +30,7 @@ class _RocketChatClientService {
         this.ws.send({msg:"pong"})
         if(this.hasPing == false) {
           // first ping
-          firstPing()
+          firstPingFunx()
           this.hasPing = true
         }
       }
@@ -83,6 +86,11 @@ class _RocketChatClientService {
   deleteMessage() {}
   createRoom() {}
 
+  getRooms() {
+
+  }
+
+
   subscribe() {
     var subscribeRequest = {
       "msg": "sub",
@@ -168,11 +176,11 @@ class _RocketChatClientService {
     },
     
     onclose:(event: any)=> {
+
+      this.connect(this.firstPingFunx())
+
       this.connected = false
       console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
-      setTimeout(()=>{
-        // this.connect(this.url)
-      }, 500)
     },
   
     onerror: (event: any) =>  {

From 053e5a2370e9ae0c54be93238d6dce5956947602 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 09:35:17 +0100
Subject: [PATCH 009/112] improve the way to register

---
 src/app/models/rochet-chat-cliente-service.ts | 14 ++++
 .../socket/rocket-chat-client.service.ts      | 71 ++++++++++---------
 2 files changed, 52 insertions(+), 33 deletions(-)
 create mode 100644 src/app/models/rochet-chat-cliente-service.ts

diff --git a/src/app/models/rochet-chat-cliente-service.ts b/src/app/models/rochet-chat-cliente-service.ts
new file mode 100644
index 000000000..c680767b7
--- /dev/null
+++ b/src/app/models/rochet-chat-cliente-service.ts
@@ -0,0 +1,14 @@
+export interface wsCallbacksParams {
+    type: 'Offline' | 'Online' | 'Open' | 'Onmessage',
+    funx: Function
+    options?: {
+        runOnces?: boolean
+    }
+    requestId?: string
+}
+
+
+export interface msgQueue {
+    message: object,
+    requestId: string
+}
\ No newline at end of file
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 2a588120d..37a49879b 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -1,11 +1,13 @@
 import { Injectable } from '@angular/core';
 import { v4 as uuidv4 } from 'uuid'
+import { wsCallbacksParams, msgQueue } from 'src/app/models/rochet-chat-cliente-service'
 
 class _RocketChatClientService {
 
-  connected = false
   private hasPing = false
   private firstPingFunx: Function
+  isLogin = false;
+  request = []
   
   constructor() {}
 
@@ -25,7 +27,8 @@ class _RocketChatClientService {
 
     this.ws.send(connectMessage)
     
-    this.ws.registerCallback('Onmessage',(message: any) => {
+    this.ws.registerCallback({type:'Onmessage',funx:(message: any)=>{
+
       if(message.msg == "ping") {
         this.ws.send({msg:"pong"})
         if(this.hasPing == false) {
@@ -34,7 +37,8 @@ class _RocketChatClientService {
           this.hasPing = true
         }
       }
-    })
+
+    }})
 
   }
 
@@ -111,29 +115,30 @@ class _RocketChatClientService {
   
   // socket class ==================================================================
   private socket!: WebSocket;
-  private url = ''
-  private callBacks: {
-    type: 'Offline' | 'Online' | 'Open' | 'Onmessage',
-    object?: string
-    funx: Function
-  }[] = []
-  msgQueue : {
-    message: object,
-    requestId: string
-  }[] = []
+  private wsUrl = ''
+  wsMsgQueue : msgQueue[] = []
+  private wsCallbacks: {[key: string]:  wsCallbacksParams} = {}
 
   ws = {
-    registerCallback:(type: 'Offline' | 'Online' | 'Open' | 'Onmessage', funx: Function, object = '') =>{
-      this.callBacks.push({
-        type,
-        funx,
-        object
-      })
+    connected: false,
+    registerCallback:(params: wsCallbacksParams) =>{
+      
+      if(!params.requestId) {
+        params.requestId = uuidv4()
+      }
+
+      this.wsCallbacks[params.requestId] = {
+        type: params.type,
+        funx: params.funx,
+        options: params.options || {}
+      }
+
     },
+    deleteCallback(){},
     connect:(url)=> {
-  
-      this.url = url
-      this.socket = new WebSocket(this.url);
+      this.ws.connected = false
+      this.wsUrl = url
+      this.socket = new WebSocket(this.wsUrl);
       // bind function
       this.socket.onopen = this.ws.onopen;
       this.socket.onmessage = this.ws.onmessage;
@@ -141,11 +146,10 @@ class _RocketChatClientService {
       this.socket.onerror = this.ws.onerror;
     },
     onopen:()=> {
-      this.connected = true
+      this.ws.connected = true
       console.log('================== welcome to socket server =====================')
   
-  
-      this.msgQueue.forEach((item, index, object) => {
+      this.wsMsgQueue.forEach((item, index, object) => {
         this.ws.send(item.message, item.requestId);
         object.splice(index, 1);
       })
@@ -153,11 +157,11 @@ class _RocketChatClientService {
     },
     send: (message: object, requestId = uuidv4()) => {
   
-      if (this.connected == false) { // save data to send when back online
+      if (this.ws.connected == false) { // save data to send when back online
         console.log('save msgQueue')
-        this.msgQueue.push({message, requestId})
+        this.wsMsgQueue.push({message, requestId})
       } else {
-        console.log('send rocket chat', message)
+        // console.log('send rocket chat', message)
         let messageStr = JSON.stringify(message)
         this.socket.send(messageStr)
       }
@@ -168,18 +172,19 @@ class _RocketChatClientService {
       const data = JSON.parse(event.data)
       console.log('event.data', data)
   
-      this.callBacks.forEach((e)=>{
-        if(e.type== 'Onmessage') {
-          e.funx(data)
+      for (const [key, value] of Object.entries(this.wsCallbacks)) {
+        if(value.type== 'Onmessage') {
+          value.funx(data)
         }
-      })
+      }
+
     },
     
     onclose:(event: any)=> {
 
       this.connect(this.firstPingFunx())
 
-      this.connected = false
+      this.ws.connected = false
       console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
     },
   

From 402e1f8a95e583215568fcc1a502ba8e2ab2909c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 10:22:17 +0100
Subject: [PATCH 010/112] Fix login

---
 src/app/home/home.page.ts                     |  4 ++-
 .../socket/rocket-chat-client.service.ts      | 25 +++++++++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index a56568a49..ae7b96698 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -100,9 +100,11 @@ export class HomePage implements OnInit {
 
     this.RocketChatClientService.connect(()=>{
       this.RocketChatClientService.login({
-        username: 'paulo.pinto@gabinetedigital.local',
+        username: 'paulo.pinto',
+        email: 'paulo.pinto@gabinetedigital.local',
         password: 'tabteste@006'
       })
+
     })
     
     // this.RocketChatClientService.send()
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 37a49879b..297111bf3 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -34,6 +34,10 @@ class _RocketChatClientService {
         if(this.hasPing == false) {
           // first ping
           firstPingFunx()
+
+          setTimeout(()=>{
+            this.getRooms()
+          }, 5000)
           this.hasPing = true
         }
       }
@@ -51,11 +55,8 @@ class _RocketChatClientService {
       id: requestId,
       params: [
         {
-          "user": { "username": user.username },
-          "password": {
-            "digest": user.password,
-            "algorithm":"sha-256"
-          }
+          user: { username: user.username },
+          password: user.password
         }
       ]
     }
@@ -85,13 +86,21 @@ class _RocketChatClientService {
     return requestId;
   }
 
-  receive() {}
+  subtribe() {}
   joinRoom(){}
   deleteMessage() {}
   createRoom() {}
 
   getRooms() {
+    const requestId =  uuidv4()
 
+    const request = {
+      "msg": "method",
+      "method": "rooms/get",
+      "id": requestId,
+      "params": [ { "$date": 1480377601 } ]
+    }
+    this.ws.send(request, requestId)
   }
 
 
@@ -116,10 +125,10 @@ class _RocketChatClientService {
   // socket class ==================================================================
   private socket!: WebSocket;
   private wsUrl = ''
-  wsMsgQueue : msgQueue[] = []
+  private wsMsgQueue : msgQueue[] = []
   private wsCallbacks: {[key: string]:  wsCallbacksParams} = {}
 
-  ws = {
+  private ws = {
     connected: false,
     registerCallback:(params: wsCallbacksParams) =>{
       

From 9e11d910d490904188002ca9f86801faa12de857 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 10:53:04 +0100
Subject: [PATCH 011/112] Improve login to rocket chat

---
 src/app/home/home.page.ts                     |  8 +++++-
 src/app/models/rochet-chat-cliente-service.ts |  4 +--
 .../socket/rocket-chat-client.service.ts      | 25 +++++++++++++++++--
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index ae7b96698..2c514aa4c 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -99,11 +99,17 @@ export class HomePage implements OnInit {
     private RouteService: RouteService) {
 
     this.RocketChatClientService.connect(()=>{
+
       this.RocketChatClientService.login({
         username: 'paulo.pinto',
         email: 'paulo.pinto@gabinetedigital.local',
         password: 'tabteste@006'
-      })
+      }).then((message)=>{
+        console.log('rocket chat login successfully', message)
+      }).catch((message)=>{
+        console.log('rocket chat login failed', message)
+      }).finally(()=>{
+      })  
 
     })
     
diff --git a/src/app/models/rochet-chat-cliente-service.ts b/src/app/models/rochet-chat-cliente-service.ts
index c680767b7..68956c823 100644
--- a/src/app/models/rochet-chat-cliente-service.ts
+++ b/src/app/models/rochet-chat-cliente-service.ts
@@ -1,9 +1,7 @@
 export interface wsCallbacksParams {
     type: 'Offline' | 'Online' | 'Open' | 'Onmessage',
     funx: Function
-    options?: {
-        runOnces?: boolean
-    }
+    runOnces?: boolean
     requestId?: string
 }
 
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 297111bf3..4f348393f 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -47,6 +47,7 @@ class _RocketChatClientService {
   }
 
   login(user) {
+
     const requestId =  uuidv4()
 
     const loginRequest = {
@@ -62,7 +63,22 @@ class _RocketChatClientService {
     }
     this.ws.send(loginRequest, requestId)
 
-    return requestId
+    return new Promise((resolve, reject) => {
+      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
+        if(message.result.id == requestId) { // same request send
+          if(message.result) {
+            if(message.result.token) {
+              resolve(message)
+            } else {
+              reject(message)
+            }
+          } else {
+            reject(message)
+          }
+        }
+      }})
+    });
+
   }
 
   logout(){}
@@ -139,7 +155,7 @@ class _RocketChatClientService {
       this.wsCallbacks[params.requestId] = {
         type: params.type,
         funx: params.funx,
-        options: params.options || {}
+        runOnces: params.runOnces
       }
 
     },
@@ -184,7 +200,12 @@ class _RocketChatClientService {
       for (const [key, value] of Object.entries(this.wsCallbacks)) {
         if(value.type== 'Onmessage') {
           value.funx(data)
+          if(value.runOnces) {
+            delete this.wsCallbacks[value.requestId || key]
+          } 
         }
+
+
       }
 
     },

From f46f954eddd7d99cd4ad9880e542bbb84702c0c7 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 10:54:51 +0100
Subject: [PATCH 012/112] Improve login to rocket chat

---
 src/app/services/socket/rocket-chat-client.service.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 4f348393f..868c9d413 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -27,17 +27,13 @@ class _RocketChatClientService {
 
     this.ws.send(connectMessage)
     
-    this.ws.registerCallback({type:'Onmessage',funx:(message: any)=>{
+    this.ws.registerCallback({type:'Onmessage',funx:(message: any) => {
 
       if(message.msg == "ping") {
         this.ws.send({msg:"pong"})
         if(this.hasPing == false) {
           // first ping
           firstPingFunx()
-
-          setTimeout(()=>{
-            this.getRooms()
-          }, 5000)
           this.hasPing = true
         }
       }
@@ -68,11 +64,14 @@ class _RocketChatClientService {
         if(message.result.id == requestId) { // same request send
           if(message.result) {
             if(message.result.token) {
+              this.isLogin = true
               resolve(message)
             } else {
+              this.isLogin = false
               reject(message)
             }
           } else {
+            this.isLogin = false
             reject(message)
           }
         }

From 28a570cfbf4a65ffa2ddb66ecc77712b7bb9ab21 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 11:11:27 +0100
Subject: [PATCH 013/112] add get room

---
 src/app/home/home.page.ts                     |  4 +++
 .../socket/rocket-chat-client.service.ts      | 27 ++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 2c514aa4c..30e63ddf4 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -105,7 +105,11 @@ export class HomePage implements OnInit {
         email: 'paulo.pinto@gabinetedigital.local',
         password: 'tabteste@006'
       }).then((message)=>{
+        // alert('login')
         console.log('rocket chat login successfully', message)
+        this.RocketChatClientService.getRooms().then((rooms)=>{
+          console.log('rooms', rooms)
+        })
       }).catch((message)=>{
         console.log('rocket chat login failed', message)
       }).finally(()=>{
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 868c9d413..92dc7f48a 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -61,7 +61,8 @@ class _RocketChatClientService {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
-        if(message.result.id == requestId) { // same request send
+        // console.log(message.result.id, requestId)
+        if(message.id == requestId) { // same request send
           if(message.result) {
             if(message.result.token) {
               this.isLogin = true
@@ -116,13 +117,22 @@ class _RocketChatClientService {
       "params": [ { "$date": 1480377601 } ]
     }
     this.ws.send(request, requestId)
+
+    return new Promise((resolve, reject) => {
+      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
+        if(message.result.id == requestId) { // same request send
+          resolve(message)
+        }
+      }})
+    });
   }
 
 
   subscribe() {
+    const requestId =  uuidv4()
     var subscribeRequest = {
       "msg": "sub",
-      "id": "unique-id",
+      "id": requestId,
       "name": "stream-notify-room",
       "params":[
       "room-id/event",
@@ -130,7 +140,16 @@ class _RocketChatClientService {
       ]
     }
 
-   //this.ws.send(subscribeRequest);
+   this.ws.send(subscribeRequest);
+   
+    return new Promise((resolve, reject) => {
+      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
+        if(message.result.id == requestId) { // same request send
+          resolve(message)
+        }
+      }})
+    });
+
   }
 
   private disconnect = () => {
@@ -185,7 +204,7 @@ class _RocketChatClientService {
         console.log('save msgQueue')
         this.wsMsgQueue.push({message, requestId})
       } else {
-        // console.log('send rocket chat', message)
+        console.log('send rocket chat', message)
         let messageStr = JSON.stringify(message)
         this.socket.send(messageStr)
       }

From b5046123deb03a09d356ae8cb55bbe47b19d3682 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 11:28:50 +0100
Subject: [PATCH 014/112] add subscribe

---
 src/app/services/socket/rocket-chat-client.service.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 92dc7f48a..49d15ba59 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -62,7 +62,7 @@ class _RocketChatClientService {
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
         // console.log(message.result.id, requestId)
-        if(message.id == requestId) { // same request send
+        if(message.id == requestId || message.result.id == requestId) { // same request send
           if(message.result) {
             if(message.result.token) {
               this.isLogin = true
@@ -120,7 +120,7 @@ class _RocketChatClientService {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
-        if(message.result.id == requestId) { // same request send
+        if(message.id == requestId || message.result.id == requestId) { // same request send
           resolve(message)
         }
       }})
@@ -141,7 +141,7 @@ class _RocketChatClientService {
     }
 
    this.ws.send(subscribeRequest);
-   
+
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
         if(message.result.id == requestId) { // same request send

From 7a28f2e3149f3c5113d433523f1635f66e1addc1 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 11:29:02 +0100
Subject: [PATCH 015/112] add subscribe

---
 src/app/home/home.page.ts                             | 10 +++++++++-
 src/app/services/socket/rocket-chat-client.service.ts |  6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 30e63ddf4..9269b59ff 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -107,8 +107,16 @@ export class HomePage implements OnInit {
       }).then((message)=>{
         // alert('login')
         console.log('rocket chat login successfully', message)
-        this.RocketChatClientService.getRooms().then((rooms)=>{
+        this.RocketChatClientService.getRooms().then((rooms: any)=>{
           console.log('rooms', rooms)
+
+          rooms.result.update.forEach((room:any) => {
+            console.log('room', room)
+            this.RocketChatClientService.subscribe(room.lastMessage.rid).then((subscription)=>{
+              console.log('subscription', subscription)
+            })
+          });
+
         })
       }).catch((message)=>{
         console.log('rocket chat login failed', message)
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 49d15ba59..4b0a1f021 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -128,19 +128,19 @@ class _RocketChatClientService {
   }
 
 
-  subscribe() {
+  subscribe(roomId : string) {
     const requestId =  uuidv4()
     var subscribeRequest = {
       "msg": "sub",
       "id": requestId,
       "name": "stream-notify-room",
       "params":[
-      "room-id/event",
+      `${roomId}/event`,
         false
       ]
     }
 
-   this.ws.send(subscribeRequest);
+    this.ws.send(subscribeRequest);
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{

From 1dade29c50ae6eb89985ce484df1c03a68f64b53 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 11:40:34 +0100
Subject: [PATCH 016/112] add send method

---
 .../socket/rocket-chat-client.service.ts      | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 4b0a1f021..efee7c950 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -83,7 +83,7 @@ class _RocketChatClientService {
 
   logout(){}
 
-  send(roomId, message, option) {
+  send(roomId, message) {
     const requestId =  uuidv4()
 
     var request = {
@@ -91,18 +91,23 @@ class _RocketChatClientService {
       method: "sendMessage",
       id: requestId,
       params: [{
-        _id: "message-id" || uuidv4(),
-        rid: "room-id" || roomId,
-        msg: "Hello World!" || message
+        _id: uuidv4(),
+        rid: roomId,
+        msg: message
       }]
     }
 
-    // this.ws.send(request, requestId);
+    this.ws.send(request, requestId);
 
-    return requestId;
+    return new Promise((resolve, reject) => {
+      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
+        if(message.id == requestId || message.result.id == requestId) { // same request send
+          resolve(message)
+        }
+      }})
+    });
   }
 
-  subtribe() {}
   joinRoom(){}
   deleteMessage() {}
   createRoom() {}

From c398e3fa245e3ba7799fd22a39f458a46c554e02 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 12:02:24 +0100
Subject: [PATCH 017/112] adding Request Queue

---
 .../socket/rocket-chat-client.service.ts      | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index efee7c950..060f13333 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -7,11 +7,27 @@ class _RocketChatClientService {
   private hasPing = false
   private firstPingFunx: Function
   isLogin = false;
-  request = []
+  requestQueue = []
   
   constructor() {}
 
   private returns() {}
+  
+  private attemptRequestQueue(arg, option) {
+
+    const conditionToSend = this.ws.connected == true && this.isLogin == true
+
+    if(conditionToSend) {
+      this.requestQueue.push({
+        arg: arg,
+        status: {
+          isLogin: this.isLogin,
+          isConnected: this.ws.connected
+        }
+      })
+    }
+    return conditionToSend
+  }
 
   connect(firstPingFunx: Function) {
     this.hasPing = false
@@ -45,6 +61,7 @@ class _RocketChatClientService {
   login(user) {
 
     const requestId =  uuidv4()
+    this.isLogin = false
 
     const loginRequest = {
       msg: "method",
@@ -66,6 +83,7 @@ class _RocketChatClientService {
           if(message.result) {
             if(message.result.token) {
               this.isLogin = true
+              this.ws.wsMsgQueue()
               resolve(message)
             } else {
               this.isLogin = false
@@ -84,6 +102,10 @@ class _RocketChatClientService {
   logout(){}
 
   send(roomId, message) {
+
+    const conditions = this.attemptRequestQueue({...roomId, message}, {methodName:'send'})
+    if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
+
     const requestId =  uuidv4()
 
     var request = {
@@ -134,6 +156,10 @@ class _RocketChatClientService {
 
 
   subscribe(roomId : string) {
+
+    const conditions = this.attemptRequestQueue({roomId},{methodName: 'subscribe'})
+    if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
+
     const requestId =  uuidv4()
     var subscribeRequest = {
       "msg": "sub",
@@ -196,12 +222,16 @@ class _RocketChatClientService {
     onopen:()=> {
       this.ws.connected = true
       console.log('================== welcome to socket server =====================')
-  
       this.wsMsgQueue.forEach((item, index, object) => {
         this.ws.send(item.message, item.requestId);
         object.splice(index, 1);
       })
-  
+    },
+    wsMsgQueue:()=> {
+      // this.wsMsgQueue.forEach((item, index, object) => {
+      //   this.ws.send(item.message, item.requestId);
+      //   object.splice(index, 1);
+      // })
     },
     send: (message: object, requestId = uuidv4()) => {
   

From 77a8bfffa1fda7d78bc8cb2e91595d7742373d88 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 12:15:27 +0100
Subject: [PATCH 018/112] send message programmatically

---
 src/app/home/home.page.ts                             | 5 +++++
 src/app/services/socket/rocket-chat-client.service.ts | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 9269b59ff..a7a584434 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -118,6 +118,11 @@ export class HomePage implements OnInit {
           });
 
         })
+
+
+        //send message                              // roomId                // Message
+
+        this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
       }).catch((message)=>{
         console.log('rocket chat login failed', message)
       }).finally(()=>{
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 060f13333..e4cfd0c02 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -29,6 +29,8 @@ class _RocketChatClientService {
     return conditionToSend
   }
 
+  private runRequestQueue(){}
+
   connect(firstPingFunx: Function) {
     this.hasPing = false
     this.firstPingFunx = firstPingFunx
@@ -83,6 +85,7 @@ class _RocketChatClientService {
           if(message.result) {
             if(message.result.token) {
               this.isLogin = true
+              this.runRequestQueue()
               this.ws.wsMsgQueue()
               resolve(message)
             } else {

From f85ea7e2bc40c311c9215ae794516c74afaebca5 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 12:23:01 +0100
Subject: [PATCH 019/112] improve console.log

---
 src/app/services/socket/rocket-chat-client.service.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index e4cfd0c02..d25205eb1 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -138,6 +138,9 @@ class _RocketChatClientService {
   createRoom() {}
 
   getRooms() {
+    const conditions = this.attemptRequestQueue({},{methodName: 'getRooms'})
+    if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
+
     const requestId =  uuidv4()
 
     const request = {
@@ -242,7 +245,7 @@ class _RocketChatClientService {
         console.log('save msgQueue')
         this.wsMsgQueue.push({message, requestId})
       } else {
-        console.log('send rocket chat', message)
+        console.log('send to rocket chat', message)
         let messageStr = JSON.stringify(message)
         this.socket.send(messageStr)
       }

From d4470e0b80b1f36e4b686b172644f45e5ca98221 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 12:59:25 +0100
Subject: [PATCH 020/112] add method streamNotifyRoom

---
 .../socket/rocket-chat-client.service.ts      | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index d25205eb1..bc404caa1 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -167,6 +167,7 @@ class _RocketChatClientService {
     if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
 
     const requestId =  uuidv4()
+    
     var subscribeRequest = {
       "msg": "sub",
       "id": requestId,
@@ -189,6 +190,35 @@ class _RocketChatClientService {
 
   }
 
+  streamNotifyRoom(roomId : string) {
+    const conditions = this.attemptRequestQueue({roomId},{methodName: 'subscribe'})
+    if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
+    
+    const requestId =  uuidv4()
+
+    let streamNotifyObj = {
+      "msg": "method",
+      "method": "stream-notify-room", 
+      "id": requestId,
+      "params": [
+        `null/typing`,
+        "paulo.pinto",
+        true
+      ]
+    };
+
+    this.ws.send(streamNotifyObj, requestId)
+
+    return new Promise((resolve, reject) => {
+      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
+        if(message.id == requestId || message.result.id == requestId) { // same request send
+          resolve('')
+        }
+      }})
+    });
+
+  }
+
   private disconnect = () => {
 
   }

From b82239741b9bf79634fadca082fad13f0ed58642 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 13:31:15 +0100
Subject: [PATCH 021/112] fix

---
 src/app/home/home.page.ts                        |  4 ++--
 src/app/services/chat/chat.service.spec.ts       | 16 ++++++++++++++++
 src/app/services/chat/chat.service.ts            |  9 +++++++++
 src/app/services/chat/room.service.spec.ts       | 16 ++++++++++++++++
 src/app/services/chat/room.service.ts            |  9 +++++++++
 .../socket/rocket-chat-client.service.ts         |  7 +++++--
 6 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 src/app/services/chat/chat.service.spec.ts
 create mode 100644 src/app/services/chat/chat.service.ts
 create mode 100644 src/app/services/chat/room.service.spec.ts
 create mode 100644 src/app/services/chat/room.service.ts

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index a7a584434..108afe3d4 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -108,10 +108,10 @@ export class HomePage implements OnInit {
         // alert('login')
         console.log('rocket chat login successfully', message)
         this.RocketChatClientService.getRooms().then((rooms: any)=>{
-          console.log('rooms', rooms)
+          // console.log('rooms', rooms)
 
           rooms.result.update.forEach((room:any) => {
-            console.log('room', room)
+            // console.log('room', room)
             this.RocketChatClientService.subscribe(room.lastMessage.rid).then((subscription)=>{
               console.log('subscription', subscription)
             })
diff --git a/src/app/services/chat/chat.service.spec.ts b/src/app/services/chat/chat.service.spec.ts
new file mode 100644
index 000000000..4d8abdfc0
--- /dev/null
+++ b/src/app/services/chat/chat.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ChatService } from './chat.service';
+
+describe('ChatService', () => {
+  let service: ChatService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ChatService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/chat/chat.service.ts b/src/app/services/chat/chat.service.ts
new file mode 100644
index 000000000..0d00005d1
--- /dev/null
+++ b/src/app/services/chat/chat.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ChatService {
+
+  constructor() { }
+}
diff --git a/src/app/services/chat/room.service.spec.ts b/src/app/services/chat/room.service.spec.ts
new file mode 100644
index 000000000..34729ebbf
--- /dev/null
+++ b/src/app/services/chat/room.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { RoomService } from './room.service';
+
+describe('RoomService', () => {
+  let service: RoomService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(RoomService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
new file mode 100644
index 000000000..7bfb8d36e
--- /dev/null
+++ b/src/app/services/chat/room.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class RoomService {
+
+  constructor() { }
+}
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index bc404caa1..83c641e14 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -2,6 +2,9 @@ import { Injectable } from '@angular/core';
 import { v4 as uuidv4 } from 'uuid'
 import { wsCallbacksParams, msgQueue } from 'src/app/models/rochet-chat-cliente-service'
 
+/**
+ * Use this class to interact with rocketchat realtime API
+ */
 class _RocketChatClientService {
 
   private hasPing = false
@@ -102,7 +105,7 @@ class _RocketChatClientService {
 
   }
 
-  logout(){}
+  logout() {}
 
   send(roomId, message) {
 
@@ -182,7 +185,7 @@ class _RocketChatClientService {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
-        if(message.result.id == requestId) { // same request send
+        if(message.msg == 'ready' || message.subs[0] == requestId) { // same request send
           resolve(message)
         }
       }})

From d6605c519cbbbc147455a8d90fcae5fee4c690b7 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 13:37:22 +0100
Subject: [PATCH 022/112] improve

---
 src/app/home/home.page.ts                             | 8 ++++++--
 src/app/services/socket/rocket-chat-client.service.ts | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 108afe3d4..696add888 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -117,11 +117,15 @@ export class HomePage implements OnInit {
             })
           });
 
+
         })
 
-
+        
+        this.RocketChatClientService.subscribe('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM').then((subscription)=>{
+          console.log(subscription)
+        })
+        
         //send message                              // roomId                // Message
-
         this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
       }).catch((message)=>{
         console.log('rocket chat login failed', message)
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 83c641e14..a79172adb 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from 'uuid'
 import { wsCallbacksParams, msgQueue } from 'src/app/models/rochet-chat-cliente-service'
 
 /**
- * Use this class to interact with rocketchat realtime API
+ * Use this class to interact with rocketChat realtime API
  */
 class _RocketChatClientService {
 

From 316803e9e0dc54159f61512e4efe08f5cf3c8aaa Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 15:56:11 +0100
Subject: [PATCH 023/112] improve

---
 src/app/home/home.page.ts                     | 22 +++++---
 .../socket/rocket-chat-client.service.ts      | 55 +++++++++++++++++--
 2 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 696add888..823028df0 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -104,7 +104,7 @@ export class HomePage implements OnInit {
         username: 'paulo.pinto',
         email: 'paulo.pinto@gabinetedigital.local',
         password: 'tabteste@006'
-      }).then((message)=>{
+      }).then((message) => {
         // alert('login')
         console.log('rocket chat login successfully', message)
         this.RocketChatClientService.getRooms().then((rooms: any)=>{
@@ -116,17 +116,21 @@ export class HomePage implements OnInit {
               console.log('subscription', subscription)
             })
           });
+        });
 
+        this.RocketChatClientService.receiveLiveMessageFromRoom(
+          'fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM',
+          this.constructor.name,
+          (Chatmessage)=>{
+            console.log('chat', Chatmessage)
+          }
+        )
 
-        })
+        window['jj'] =  ()=>{
+          //send message                              // roomId                // Message
+          this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
+        }
 
-        
-        this.RocketChatClientService.subscribe('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM').then((subscription)=>{
-          console.log(subscription)
-        })
-        
-        //send message                              // roomId                // Message
-        this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
       }).catch((message)=>{
         console.log('rocket chat login failed', message)
       }).finally(()=>{
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index a79172adb..a3b0ebfa7 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -193,6 +193,57 @@ class _RocketChatClientService {
 
   }
 
+  /**
+   * @param roomId 
+   * @param key 
+   * @param funx 
+   */
+  receiveLiveMessageFromRoom(roomId, key, funx: Function) {
+    
+    this.ws.registerCallback({
+      type:'Onmessage',
+      requestId: key,
+      funx:(message)=>{
+        if(message.msg =='result') {
+          if(message.result.msg) {
+            if(message.result.rid == roomId) {
+              funx(message) 
+            }
+          }
+        }
+      }
+    })
+
+  }
+
+  streamRoomMessages(roomId : string) {
+
+    const conditions = this.attemptRequestQueue({roomId},{methodName: 'subscribe'})
+    if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
+
+    const requestId =  uuidv4()
+
+    const request = {
+      "msg": "sub",
+      "id": requestId,
+      "name": "stream-room-messages",
+      "params":[
+        `${roomId}/event`,
+          false
+      ]
+    } 
+
+    this.ws.send(request);
+
+    return new Promise((resolve, reject) => {
+      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
+        if(message.msg == 'ready' || message.subs[0] == requestId) { // same request send
+          resolve(message)
+        }
+      }})
+    });
+  }
+
   streamNotifyRoom(roomId : string) {
     const conditions = this.attemptRequestQueue({roomId},{methodName: 'subscribe'})
     if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
@@ -221,10 +272,6 @@ class _RocketChatClientService {
     });
 
   }
-
-  private disconnect = () => {
-
-  }
   
   // socket class ==================================================================
   private socket!: WebSocket;

From cb5cbfab69beadbeb17ac9ae3d7a22a24f3f26d5 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 17:52:49 +0100
Subject: [PATCH 024/112] add loadHistory method

---
 src/app/home/home.page.ts                     |  7 +--
 .../socket/rocket-chat-client.service.ts      | 43 ++++++++++++++++---
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 823028df0..974b5aef7 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -17,7 +17,6 @@ import { File } from '@ionic-native/file/ngx';
 /* import { WebNotificationPopupService } from '../services/notification/web-notification-popup.service'; */
 import { DocumentCounterService } from '../services/worker/document-counter.service';
 import { PermissionService } from '../services/worker/permission.service';
-import { Network } from '@ionic-native/network/ngx';
 import { BackgroundService } from 'src/app/services/background.service';
 import { OfflineManagerService } from 'src/app/services/offline-manager.service';
 import { Storage } from '@ionic/storage';
@@ -30,7 +29,6 @@ import { RouteService } from 'src/app/services/route.service';
 import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service';
 import { environment } from 'src/environments/environment';
 import { v4 as uuidv4 } from 'uuid'
-import { RealTimeAPI } from "rocket.chat.realtime.api.rxjs";
 
 @Component({
   selector: 'app-home',
@@ -74,8 +72,6 @@ export class HomePage implements OnInit {
   status: string = "";
   audioName: string = "";
 
-  RocketChatClientService = RocketChatClientService
-
   constructor(
     private router: Router,
     public modalCtrl: AlertController,
@@ -96,7 +92,8 @@ export class HomePage implements OnInit {
     private processservice: ProcessesService,
     private screenOrientation: ScreenOrientation,
     private sqliteservice: SqliteService,
-    private RouteService: RouteService) {
+    private RouteService: RouteService,
+    private RocketChatClientService: RocketChatClientService) {
 
     this.RocketChatClientService.connect(()=>{
 
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index a3b0ebfa7..85a13a33c 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -5,7 +5,10 @@ import { wsCallbacksParams, msgQueue } from 'src/app/models/rochet-chat-cliente-
 /**
  * Use this class to interact with rocketChat realtime API
  */
-class _RocketChatClientService {
+@Injectable({
+  providedIn: 'root'
+})
+export class RocketChatClientService {
 
   private hasPing = false
   private firstPingFunx: Function
@@ -163,6 +166,37 @@ class _RocketChatClientService {
     });
   }
 
+  loadHistory(roomId, limit: number = 50) {
+    const conditions = this.attemptRequestQueue({...roomId, limit}, {methodName:'loadHistory'})
+    if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
+
+    const requestId =  uuidv4()
+
+    const request = {
+      msg: "method",
+      method: "loadHistory",
+      id: requestId,
+      params: [ 
+        roomId, 
+        null, 
+        limit, 
+        { 
+          "$date": 1480377601 
+        } 
+      ]
+    }
+
+    this.ws.send(request, requestId)
+
+
+    // return new Promise((resolve, reject) => {
+    //   this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
+    //     if(message.id == requestId || message.result.id == requestId) { // same request send
+    //       resolve(message)
+    //     }
+    //   }})
+    // });
+  }
 
   subscribe(roomId : string) {
 
@@ -281,7 +315,7 @@ class _RocketChatClientService {
 
   private ws = {
     connected: false,
-    registerCallback:(params: wsCallbacksParams) =>{
+    registerCallback:(params: wsCallbacksParams) => {
       
       if(!params.requestId) {
         params.requestId = uuidv4()
@@ -363,7 +397,4 @@ class _RocketChatClientService {
 
   }
 
-}
-
-
-export const RocketChatClientService = new _RocketChatClientService()
\ No newline at end of file
+}
\ No newline at end of file

From 053c6034a75c54a3c9e55b21a9254df0e86c65c7 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 18:52:21 +0100
Subject: [PATCH 025/112] improve login to rocket chat via websocket

---
 src/app/home/home.page.ts                     | 52 +++++++------------
 src/app/models/user.model.ts                  |  1 +
 src/app/services/auth.service.ts              | 31 +++++++++++
 .../socket/rocket-chat-client.service.ts      | 30 +++++++----
 4 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 974b5aef7..c76e46650 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -95,45 +95,29 @@ export class HomePage implements OnInit {
     private RouteService: RouteService,
     private RocketChatClientService: RocketChatClientService) {
 
-    this.RocketChatClientService.connect(()=>{
+      this.RocketChatClientService.getRooms().then((rooms: any)=>{
+        console.log('rooms', rooms)
 
-      this.RocketChatClientService.login({
-        username: 'paulo.pinto',
-        email: 'paulo.pinto@gabinetedigital.local',
-        password: 'tabteste@006'
-      }).then((message) => {
-        // alert('login')
-        console.log('rocket chat login successfully', message)
-        this.RocketChatClientService.getRooms().then((rooms: any)=>{
-          // console.log('rooms', rooms)
-
-          rooms.result.update.forEach((room:any) => {
-            // console.log('room', room)
-            this.RocketChatClientService.subscribe(room.lastMessage.rid).then((subscription)=>{
-              console.log('subscription', subscription)
-            })
-          });
+        rooms.result.update.forEach((room:any) => {
+          console.log('room', room)
+          this.RocketChatClientService.subscribe(room.lastMessage.rid).then((subscription)=>{
+            console.log('subscription', subscription)
+          })
         });
+      });
 
-        this.RocketChatClientService.receiveLiveMessageFromRoom(
-          'fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM',
-          this.constructor.name,
-          (Chatmessage)=>{
-            console.log('chat', Chatmessage)
-          }
-        )
-
-        window['jj'] =  ()=>{
-          //send message                              // roomId                // Message
-          this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
+      this.RocketChatClientService.receiveLiveMessageFromRoom(
+        'fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM',
+        this.constructor.name,
+        (Chatmessage)=>{
+          console.log('chat', Chatmessage)
         }
+      )
 
-      }).catch((message)=>{
-        console.log('rocket chat login failed', message)
-      }).finally(()=>{
-      })  
-
-    })
+      window['jj'] =  ()=>{
+        //send message                              // roomId                // Message
+        this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
+      }
     
     // this.RocketChatClientService.send()
     /* this.webNotificationPopupService.askNotificationPermission() */
diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts
index 52b214313..e0e4984dc 100644
--- a/src/app/models/user.model.ts
+++ b/src/app/models/user.model.ts
@@ -56,6 +56,7 @@ export class UserSession {
     TypeShare: number;
   }[]
   UserName: string
+  Password: string
   Profile: any;
   LoginPreference: 'None' | 'Password' | 'Pin' | null;
   PIN: string
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 3024f8bff..c8ba0a3fb 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -30,12 +30,25 @@ export class AuthService {
     public alertController: AlertController,
     private aesencrypt: AESEncrypt,
     private cookieService: CookieService,
+    private RocketChatClientService: RocketChatClientService
     ) {
 
       this.headers = new HttpHeaders();
 
       if (SessionStore.exist) {
         this.ValidatedUser = SessionStore.user
+
+        this.RocketChatClientService.connect(()=>{
+          this.RocketChatClientService.login({
+            username: SessionStore.user.UserName,
+            password: SessionStore.user.Password
+          }).then((message) => {
+            console.log('rocket chat login successfully', message)
+          }).catch((message)=>{
+            console.log('rocket chat login failed', message)
+          })  
+        })
+
       }
 
       if (localStorage.getItem("userChat") != null) {
@@ -77,6 +90,8 @@ export class AuthService {
           session.Profile = 'MDGPR'
         }
 
+        session.Password = user.password
+
         session.BasicAuthKey = user.BasicAuthKey
 
         SessionStore.reset(session)
@@ -98,6 +113,22 @@ export class AuthService {
         "password": user.password,
       }
 
+
+      this.RocketChatClientService.connect(()=>{
+
+        this.RocketChatClientService.login({
+          username: user.username,
+          password: user.password
+        }).then((message) => {
+          console.log('rocket chat login successfully', message)
+        }).catch((message)=>{
+          console.log('rocket chat login failed', message)
+        }).finally(()=>{
+        })  
+  
+      })
+
+
       let responseChat = await this.httpService.post('login', postData).toPromise();
       if(responseChat) {
         console.log('Login to Rocket chat OK');
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 85a13a33c..89d27dc25 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -19,23 +19,34 @@ export class RocketChatClientService {
 
   private returns() {}
   
-  private attemptRequestQueue(arg, option) {
+  private attemptRequestQueue(arg, options) {
 
-    const conditionToSend = this.ws.connected == true && this.isLogin == true
+    const conditionToSend = this.ws.connected == false ||  this.isLogin == false
 
-    if(conditionToSend) {
+    if(!conditionToSend) {
+      console.log('requestQueue')
       this.requestQueue.push({
         arg: arg,
+        methodName: options.methodName,
         status: {
           isLogin: this.isLogin,
           isConnected: this.ws.connected
         }
       })
     }
+
     return conditionToSend
   }
 
-  private runRequestQueue(){}
+  private runRequestQueue(){
+    this.requestQueue.forEach((request,index, object)=>{
+      console.log('runRequestQueue '+index)
+      const method = request.methodName
+      const arg = request.arg
+      this[method](...arg)
+      object.splice(index, 1);
+    })
+  }
 
   connect(firstPingFunx: Function) {
     this.hasPing = false
@@ -91,8 +102,8 @@ export class RocketChatClientService {
           if(message.result) {
             if(message.result.token) {
               this.isLogin = true
-              this.runRequestQueue()
               this.ws.wsMsgQueue()
+              this.runRequestQueue()
               resolve(message)
             } else {
               this.isLogin = false
@@ -342,17 +353,14 @@ export class RocketChatClientService {
     onopen:()=> {
       this.ws.connected = true
       console.log('================== welcome to socket server =====================')
+      this.ws.wsMsgQueue()
+    },
+    wsMsgQueue:()=> {
       this.wsMsgQueue.forEach((item, index, object) => {
         this.ws.send(item.message, item.requestId);
         object.splice(index, 1);
       })
     },
-    wsMsgQueue:()=> {
-      // this.wsMsgQueue.forEach((item, index, object) => {
-      //   this.ws.send(item.message, item.requestId);
-      //   object.splice(index, 1);
-      // })
-    },
     send: (message: object, requestId = uuidv4()) => {
   
       if (this.ws.connected == false) { // save data to send when back online

From d04a57b35c38d28c9f6d7b36076a2ee89c059fba Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 22:04:04 +0100
Subject: [PATCH 026/112] Improve filter callback

---
 src/app/home/home.page.ts                     |   6 +
 src/app/models/rochet-chat-cliente-service.ts |   3 +-
 src/app/models/user.model.ts                  |   1 +
 src/app/services/auth.service.ts              |  12 +-
 .../socket/rocket-chat-client.service.ts      | 203 ++++++++----------
 src/plugin/deep.js                            |  18 ++
 6 files changed, 120 insertions(+), 123 deletions(-)
 create mode 100644 src/plugin/deep.js

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index c76e46650..beee87168 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -95,6 +95,7 @@ export class HomePage implements OnInit {
     private RouteService: RouteService,
     private RocketChatClientService: RocketChatClientService) {
 
+
       this.RocketChatClientService.getRooms().then((rooms: any)=>{
         console.log('rooms', rooms)
 
@@ -106,6 +107,7 @@ export class HomePage implements OnInit {
         });
       });
 
+
       this.RocketChatClientService.receiveLiveMessageFromRoom(
         'fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM',
         this.constructor.name,
@@ -114,6 +116,10 @@ export class HomePage implements OnInit {
         }
       )
 
+      this.RocketChatClientService.loadHistory('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 50).then((message)=>{
+        console.log('loadHistory', message)
+      })
+
       window['jj'] =  ()=>{
         //send message                              // roomId                // Message
         this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
diff --git a/src/app/models/rochet-chat-cliente-service.ts b/src/app/models/rochet-chat-cliente-service.ts
index 68956c823..7cf5e2949 100644
--- a/src/app/models/rochet-chat-cliente-service.ts
+++ b/src/app/models/rochet-chat-cliente-service.ts
@@ -8,5 +8,6 @@ export interface wsCallbacksParams {
 
 export interface msgQueue {
     message: object,
-    requestId: string
+    requestId: string,
+    loginRequired: boolean
 }
\ No newline at end of file
diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts
index e0e4984dc..89ea55fe4 100644
--- a/src/app/models/user.model.ts
+++ b/src/app/models/user.model.ts
@@ -57,6 +57,7 @@ export class UserSession {
   }[]
   UserName: string
   Password: string
+  RochetChatUser: string
   Profile: any;
   LoginPreference: 'None' | 'Password' | 'Pin' | null;
   PIN: string
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index c8ba0a3fb..e36670932 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -30,23 +30,23 @@ export class AuthService {
     public alertController: AlertController,
     private aesencrypt: AESEncrypt,
     private cookieService: CookieService,
-    private RocketChatClientService: RocketChatClientService
-    ) {
+    private RocketChatClientService: RocketChatClientService) {
 
       this.headers = new HttpHeaders();
 
       if (SessionStore.exist) {
         this.ValidatedUser = SessionStore.user
 
+        console.log('login', SessionStore.user.RochetChatUser, SessionStore.user.Password)
         this.RocketChatClientService.connect(()=>{
           this.RocketChatClientService.login({
-            username: SessionStore.user.UserName,
+            username: SessionStore.user.RochetChatUser,
             password: SessionStore.user.Password
           }).then((message) => {
             console.log('rocket chat login successfully', message)
           }).catch((message)=>{
             console.log('rocket chat login failed', message)
-          })  
+          })
         })
 
       }
@@ -91,6 +91,7 @@ export class AuthService {
         }
 
         session.Password = user.password
+        session.RochetChatUser = user.username.split('@')[0]
 
         session.BasicAuthKey = user.BasicAuthKey
 
@@ -117,9 +118,10 @@ export class AuthService {
       this.RocketChatClientService.connect(()=>{
 
         this.RocketChatClientService.login({
-          username: user.username,
+          username: SessionStore.user.RochetChatUser,
           password: user.password
         }).then((message) => {
+          alert('sucess')
           console.log('rocket chat login successfully', message)
         }).catch((message)=>{
           console.log('rocket chat login failed', message)
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 89d27dc25..9d46cc181 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -1,53 +1,21 @@
 import { Injectable } from '@angular/core';
 import { v4 as uuidv4 } from 'uuid'
 import { wsCallbacksParams, msgQueue } from 'src/app/models/rochet-chat-cliente-service'
-
+import { deepFind } from 'src/plugin/deep'
 /**
  * Use this class to interact with rocketChat realtime API
  */
-@Injectable({
+ @Injectable({
   providedIn: 'root'
 })
-export class RocketChatClientService {
+ export class RocketChatClientService {
 
   private hasPing = false
   private firstPingFunx: Function
   isLogin = false;
-  requestQueue = []
   
   constructor() {}
 
-  private returns() {}
-  
-  private attemptRequestQueue(arg, options) {
-
-    const conditionToSend = this.ws.connected == false ||  this.isLogin == false
-
-    if(!conditionToSend) {
-      console.log('requestQueue')
-      this.requestQueue.push({
-        arg: arg,
-        methodName: options.methodName,
-        status: {
-          isLogin: this.isLogin,
-          isConnected: this.ws.connected
-        }
-      })
-    }
-
-    return conditionToSend
-  }
-
-  private runRequestQueue(){
-    this.requestQueue.forEach((request,index, object)=>{
-      console.log('runRequestQueue '+index)
-      const method = request.methodName
-      const arg = request.arg
-      this[method](...arg)
-      object.splice(index, 1);
-    })
-  }
-
   connect(firstPingFunx: Function) {
     this.hasPing = false
     this.firstPingFunx = firstPingFunx
@@ -60,12 +28,12 @@ export class RocketChatClientService {
       support: ["1"]
     }
 
-    this.ws.send(connectMessage)
+    this.ws.send(connectMessage, 'connect', false)
     
-    this.ws.registerCallback({type:'Onmessage',funx:(message: any) => {
+    this.ws.registerCallback({type:'Onmessage', funx:(message: any) => {
 
       if(message.msg == "ping") {
-        this.ws.send({msg:"pong"})
+        this.ws.send({msg:"pong"},'recoonect', false)
         if(this.hasPing == false) {
           // first ping
           firstPingFunx()
@@ -93,39 +61,58 @@ export class RocketChatClientService {
         }
       ]
     }
-    this.ws.send(loginRequest, requestId)
+    this.ws.send(loginRequest, requestId, false)
 
     return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
-        // console.log(message.result.id, requestId)
-        if(message.id == requestId || message.result.id == requestId) { // same request send
-          if(message.result) {
-            if(message.result.token) {
-              this.isLogin = true
+      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
+        if(message.id == requestId || deepFind(message, 'result.id') == requestId) { // same request send
+          
+          if(message.result.token) {
+            this.isLogin = true
+            setTimeout(()=>{
               this.ws.wsMsgQueue()
-              this.runRequestQueue()
-              resolve(message)
-            } else {
-              this.isLogin = false
-              reject(message)
-            }
+            },0)
+            
+            resolve(message)
           } else {
             this.isLogin = false
             reject(message)
           }
+
+          reject(message)
+
+          return true
         }
       }})
     });
 
   }
 
+  getRooms(requestId =  uuidv4()) {
+
+    const request = {
+      "msg": "method",
+      "method": "rooms/get",
+      "id": requestId,
+      "params": [ { "$date": 1480377601 } ]
+    }
+
+    this.ws.send(request, requestId, true)
+
+    return new Promise((resolve, reject) => {
+      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
+        if(message.id == requestId) { // same request send
+          resolve(message)
+          return true
+        }
+      }})
+    });
+  }
+
   logout() {}
 
   send(roomId, message) {
 
-    const conditions = this.attemptRequestQueue({...roomId, message}, {methodName:'send'})
-    if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
-
     const requestId =  uuidv4()
 
     var request = {
@@ -139,12 +126,13 @@ export class RocketChatClientService {
       }]
     }
 
-    this.ws.send(request, requestId);
+    this.ws.send(request, requestId, true);
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
-        if(message.id == requestId || message.result.id == requestId) { // same request send
+        if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
           resolve(message)
+          return true
         }
       }})
     });
@@ -154,32 +142,9 @@ export class RocketChatClientService {
   deleteMessage() {}
   createRoom() {}
 
-  getRooms() {
-    const conditions = this.attemptRequestQueue({},{methodName: 'getRooms'})
-    if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
 
-    const requestId =  uuidv4()
-
-    const request = {
-      "msg": "method",
-      "method": "rooms/get",
-      "id": requestId,
-      "params": [ { "$date": 1480377601 } ]
-    }
-    this.ws.send(request, requestId)
-
-    return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
-        if(message.id == requestId || message.result.id == requestId) { // same request send
-          resolve(message)
-        }
-      }})
-    });
-  }
 
   loadHistory(roomId, limit: number = 50) {
-    const conditions = this.attemptRequestQueue({...roomId, limit}, {methodName:'loadHistory'})
-    if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
 
     const requestId =  uuidv4()
 
@@ -197,23 +162,20 @@ export class RocketChatClientService {
       ]
     }
 
-    this.ws.send(request, requestId)
+    this.ws.send(request, requestId, true)
 
-
-    // return new Promise((resolve, reject) => {
-    //   this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
-    //     if(message.id == requestId || message.result.id == requestId) { // same request send
-    //       resolve(message)
-    //     }
-    //   }})
-    // });
+    return new Promise((resolve, reject) => {
+      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
+        if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
+          resolve(message)
+          return true
+        }
+      }})
+    });
   }
 
   subscribe(roomId : string) {
 
-    const conditions = this.attemptRequestQueue({roomId},{methodName: 'subscribe'})
-    if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
-
     const requestId =  uuidv4()
     
     var subscribeRequest = {
@@ -226,12 +188,13 @@ export class RocketChatClientService {
       ]
     }
 
-    this.ws.send(subscribeRequest);
+    this.ws.send(subscribeRequest, requestId, true);
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
-        if(message.msg == 'ready' || message.subs[0] == requestId) { // same request send
+        if(message.msg == 'ready' || deepFind(message, 'subs.0') == requestId) { // same request send
           resolve(message)
+          return true
         }
       }})
     });
@@ -263,9 +226,6 @@ export class RocketChatClientService {
 
   streamRoomMessages(roomId : string) {
 
-    const conditions = this.attemptRequestQueue({roomId},{methodName: 'subscribe'})
-    if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
-
     const requestId =  uuidv4()
 
     const request = {
@@ -278,20 +238,19 @@ export class RocketChatClientService {
       ]
     } 
 
-    this.ws.send(request);
+    this.ws.send(request, requestId, true);
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
-        if(message.msg == 'ready' || message.subs[0] == requestId) { // same request send
+        if(message.msg == 'ready' || deepFind(message, 'subs.0') == requestId) { // same request send
           resolve(message)
+          return true
         }
       }})
     });
   }
 
   streamNotifyRoom(roomId : string) {
-    const conditions = this.attemptRequestQueue({roomId},{methodName: 'subscribe'})
-    if(conditions == false) { return new Promise((resolve, reject) => { reject('no error')}); }
     
     const requestId =  uuidv4()
 
@@ -306,12 +265,13 @@ export class RocketChatClientService {
       ]
     };
 
-    this.ws.send(streamNotifyObj, requestId)
+    this.ws.send(streamNotifyObj, requestId, true)
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
-        if(message.id == requestId || message.result.id == requestId) { // same request send
+        if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
           resolve('')
+          return true
         }
       }})
     });
@@ -334,12 +294,14 @@ export class RocketChatClientService {
 
       this.wsCallbacks[params.requestId] = {
         type: params.type,
-        funx: params.funx,
-        runOnces: params.runOnces
+        funx: params.funx
       }
 
     },
-    deleteCallback(){},
+    deleteCallback(requestId: string){
+      console.log('delete', this.wsCallbacks[requestId])
+      delete this.wsCallbacks[requestId]
+    },
     connect:(url)=> {
       this.ws.connected = false
       this.wsUrl = url
@@ -357,17 +319,23 @@ export class RocketChatClientService {
     },
     wsMsgQueue:()=> {
       this.wsMsgQueue.forEach((item, index, object) => {
-        this.ws.send(item.message, item.requestId);
-        object.splice(index, 1);
+        if(item.loginRequired && this.isLogin) {
+          this.ws.send(item.message, item.requestId, item.loginRequired);
+          object.splice(index, 1);
+        } else if(item.loginRequired == false) {
+          this.ws.send(item.message, item.requestId, item.loginRequired);
+          object.splice(index, 1);
+        }
+
       })
     },
-    send: (message: object, requestId = uuidv4()) => {
+    send: (message: object, requestId = uuidv4(), loginRequired) => {
   
-      if (this.ws.connected == false) { // save data to send when back online
+      if (this.ws.connected == false || loginRequired == true && this.isLogin == false) { // save data to send when back online
         console.log('save msgQueue')
-        this.wsMsgQueue.push({message, requestId})
+        this.wsMsgQueue.push({message, requestId, loginRequired})
       } else {
-        console.log('send to rocket chat', message)
+        // console.log('send to rocket chat', message)
         let messageStr = JSON.stringify(message)
         this.socket.send(messageStr)
       }
@@ -376,16 +344,17 @@ export class RocketChatClientService {
   
     onmessage:(event: any)=> {
       const data = JSON.parse(event.data)
-      console.log('event.data', data)
+      // console.log('event.data', data)
   
       for (const [key, value] of Object.entries(this.wsCallbacks)) {
         if(value.type== 'Onmessage') {
-          value.funx(data)
-          if(value.runOnces) {
-            delete this.wsCallbacks[value.requestId || key]
-          } 
-        }
+          const dontRepeat = value.funx(data)
+          
+          if(dontRepeat) {
+            delete this.wsCallbacks[key]
+          }
 
+        }
 
       }
 
diff --git a/src/plugin/deep.js b/src/plugin/deep.js
new file mode 100644
index 000000000..586c8077c
--- /dev/null
+++ b/src/plugin/deep.js
@@ -0,0 +1,18 @@
+function deepFind(obj, path) {
+    var paths = path.split('.')
+      , current = obj
+      , i;
+  
+    for (i = 0; i < paths.length; ++i) {
+      if (current[paths[i]] == undefined) {
+        return undefined;
+      } else {
+        current = current[paths[i]];
+      }
+    }
+    return current;
+}
+  
+module.exports = {
+    deepFind: deepFind,
+};
\ No newline at end of file

From 9c043e9853ad0def34798128d043aae836c3a04b Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 22:35:44 +0100
Subject: [PATCH 027/112] Fix all websocket bugs

---
 src/app/home/home.page.ts                     |  7 +++--
 .../socket/rocket-chat-client.service.ts      | 30 +++++++++----------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index beee87168..048b2e17b 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -95,6 +95,10 @@ export class HomePage implements OnInit {
     private RouteService: RouteService,
     private RocketChatClientService: RocketChatClientService) {
 
+      this.RocketChatClientService.loadHistory('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 10).then((message)=>{
+        console.log('loadHistory', message)
+      })
+
 
       this.RocketChatClientService.getRooms().then((rooms: any)=>{
         console.log('rooms', rooms)
@@ -116,9 +120,6 @@ export class HomePage implements OnInit {
         }
       )
 
-      this.RocketChatClientService.loadHistory('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 50).then((message)=>{
-        console.log('loadHistory', message)
-      })
 
       window['jj'] =  ()=>{
         //send message                              // roomId                // Message
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 9d46cc181..d6417db38 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -88,7 +88,9 @@ import { deepFind } from 'src/plugin/deep'
 
   }
 
-  getRooms(requestId =  uuidv4()) {
+  getRooms() {
+
+    const requestId =  uuidv4()
 
     const request = {
       "msg": "method",
@@ -129,7 +131,7 @@ import { deepFind } from 'src/plugin/deep'
     this.ws.send(request, requestId, true);
 
     return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
+      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
         if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
           resolve(message)
           return true
@@ -165,8 +167,9 @@ import { deepFind } from 'src/plugin/deep'
     this.ws.send(request, requestId, true)
 
     return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
-        if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
+      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
+        // console.log(message)
+        if(message.id == requestId ) { // same request send
           resolve(message)
           return true
         }
@@ -191,7 +194,7 @@ import { deepFind } from 'src/plugin/deep'
     this.ws.send(subscribeRequest, requestId, true);
 
     return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
+      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
         if(message.msg == 'ready' || deepFind(message, 'subs.0') == requestId) { // same request send
           resolve(message)
           return true
@@ -241,7 +244,7 @@ import { deepFind } from 'src/plugin/deep'
     this.ws.send(request, requestId, true);
 
     return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
+      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
         if(message.msg == 'ready' || deepFind(message, 'subs.0') == requestId) { // same request send
           resolve(message)
           return true
@@ -268,7 +271,7 @@ import { deepFind } from 'src/plugin/deep'
     this.ws.send(streamNotifyObj, requestId, true)
 
     return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
+      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
         if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
           resolve('')
           return true
@@ -298,10 +301,6 @@ import { deepFind } from 'src/plugin/deep'
       }
 
     },
-    deleteCallback(requestId: string){
-      console.log('delete', this.wsCallbacks[requestId])
-      delete this.wsCallbacks[requestId]
-    },
     connect:(url)=> {
       this.ws.connected = false
       this.wsUrl = url
@@ -319,12 +318,14 @@ import { deepFind } from 'src/plugin/deep'
     },
     wsMsgQueue:()=> {
       this.wsMsgQueue.forEach((item, index, object) => {
-        if(item.loginRequired && this.isLogin) {
+        if(item.loginRequired == true && this.isLogin == true) {
+          console.log('run msgQueue ',index)
           this.ws.send(item.message, item.requestId, item.loginRequired);
-          object.splice(index, 1);
+          delete this.wsMsgQueue[item.requestId]
         } else if(item.loginRequired == false) {
+          console.log('run msgQueue ',index)
           this.ws.send(item.message, item.requestId, item.loginRequired);
-          object.splice(index, 1);
+          delete this.wsMsgQueue[item.requestId]
         }
 
       })
@@ -335,7 +336,6 @@ import { deepFind } from 'src/plugin/deep'
         console.log('save msgQueue')
         this.wsMsgQueue.push({message, requestId, loginRequired})
       } else {
-        // console.log('send to rocket chat', message)
         let messageStr = JSON.stringify(message)
         this.socket.send(messageStr)
       }

From 3e4067e851e7d42b3fedd4c1db75013037929730 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 23:17:24 +0100
Subject: [PATCH 028/112] remove alert

---
 src/app/services/auth.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index e36670932..6293231b1 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -121,7 +121,6 @@ export class AuthService {
           username: SessionStore.user.RochetChatUser,
           password: user.password
         }).then((message) => {
-          alert('sucess')
           console.log('rocket chat login successfully', message)
         }).catch((message)=>{
           console.log('rocket chat login failed', message)

From 7a6b2a57eac5a969f53b4f2bd9c157fe0dc768ea Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 23:52:33 +0100
Subject: [PATCH 029/112] rewrite chat

---
 src/app/services/chat/chat-methods.service.ts | 31 -------------------
 ...vice.spec.ts => chat-user.service.spec.ts} |  8 ++---
 src/app/services/chat/chat-user.service.ts    |  9 ++++++
 src/app/services/chat/chat.service.ts         | 22 ++++++++++++-
 ...ervice.spec.ts => message.service.spec.ts} |  8 ++---
 src/app/services/chat/message.service.ts      |  9 ++++++
 src/app/services/chat/methods.service.ts      | 11 -------
 src/app/services/chat/room.service.ts         | 25 +++++++++++++--
 8 files changed, 69 insertions(+), 54 deletions(-)
 delete mode 100644 src/app/services/chat/chat-methods.service.ts
 rename src/app/services/chat/{chat-methods.service.spec.ts => chat-user.service.spec.ts} (51%)
 create mode 100644 src/app/services/chat/chat-user.service.ts
 rename src/app/services/chat/{methods.service.spec.ts => message.service.spec.ts} (54%)
 create mode 100644 src/app/services/chat/message.service.ts
 delete mode 100644 src/app/services/chat/methods.service.ts

diff --git a/src/app/services/chat/chat-methods.service.ts b/src/app/services/chat/chat-methods.service.ts
deleted file mode 100644
index e22f6ddc0..000000000
--- a/src/app/services/chat/chat-methods.service.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ChatService } from '../chat.service';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ChatMethodsService {
-
-  constructor(private chatService: ChatService) {
-  }
-
-  sendMessage(roomId:string, data:any) {
-
-    let body = {
-      "message":
-      {
-        "rid": roomId,
-        "msg":"",
-        "file":{
-          "type": "application/meeting",
-          "subject": data.subject,
-          "start_date": data.start,
-          "end_date": data.end,
-          "venue": data.venue,
-          "id": data.id,
-        }
-      }
-    }
-    this.chatService.sendMessage(body).subscribe(res=> {});
-  }
-}
diff --git a/src/app/services/chat/chat-methods.service.spec.ts b/src/app/services/chat/chat-user.service.spec.ts
similarity index 51%
rename from src/app/services/chat/chat-methods.service.spec.ts
rename to src/app/services/chat/chat-user.service.spec.ts
index 3e474e69d..089b979cf 100644
--- a/src/app/services/chat/chat-methods.service.spec.ts
+++ b/src/app/services/chat/chat-user.service.spec.ts
@@ -1,13 +1,13 @@
 import { TestBed } from '@angular/core/testing';
 
-import { ChatMethodsService } from './chat-methods.service';
+import { ChatUserService } from './chat-user.service';
 
-describe('ChatMethodsService', () => {
-  let service: ChatMethodsService;
+describe('ChatUserService', () => {
+  let service: ChatUserService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({});
-    service = TestBed.inject(ChatMethodsService);
+    service = TestBed.inject(ChatUserService);
   });
 
   it('should be created', () => {
diff --git a/src/app/services/chat/chat-user.service.ts b/src/app/services/chat/chat-user.service.ts
new file mode 100644
index 000000000..7a8fd0a8d
--- /dev/null
+++ b/src/app/services/chat/chat-user.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ChatUserService {
+
+  constructor() { }
+}
diff --git a/src/app/services/chat/chat.service.ts b/src/app/services/chat/chat.service.ts
index 0d00005d1..f5a29fc46 100644
--- a/src/app/services/chat/chat.service.ts
+++ b/src/app/services/chat/chat.service.ts
@@ -1,9 +1,29 @@
 import { Injectable } from '@angular/core';
+import { RoomService } from './room.service';
+import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service';
+import { MessageService } from 'src/app/services/chat/message.service'
 
 @Injectable({
   providedIn: 'root'
 })
 export class ChatService {
 
-  constructor() { }
+  rooms: RoomService[] = []
+  group = []
+  
+  constructor(
+    private RocketChatClientService: RocketChatClientService
+  ) {
+    this.getAllRoomAndSubscribe()
+  }
+
+  getAllRoomAndSubscribe() {
+    this.RocketChatClientService.getRooms().then((rooms: any) => {
+      rooms.result.update.forEach((roomData:any) => {
+        const room = new RoomService(new RocketChatClientService(), new MessageService())
+        room.setData({id: roomData.lastMessage.rid})
+      });
+    });
+  }
+
 }
diff --git a/src/app/services/chat/methods.service.spec.ts b/src/app/services/chat/message.service.spec.ts
similarity index 54%
rename from src/app/services/chat/methods.service.spec.ts
rename to src/app/services/chat/message.service.spec.ts
index f8337c418..1db761b5e 100644
--- a/src/app/services/chat/methods.service.spec.ts
+++ b/src/app/services/chat/message.service.spec.ts
@@ -1,13 +1,13 @@
 import { TestBed } from '@angular/core/testing';
 
-import { MethodsService } from './methods.service';
+import { MessageService } from './message.service';
 
-describe('MethodsService', () => {
-  let service: MethodsService;
+describe('MessageService', () => {
+  let service: MessageService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({});
-    service = TestBed.inject(MethodsService);
+    service = TestBed.inject(MessageService);
   });
 
   it('should be created', () => {
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
new file mode 100644
index 000000000..b22bacf6c
--- /dev/null
+++ b/src/app/services/chat/message.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class MessageService {
+
+  constructor() { }
+}
diff --git a/src/app/services/chat/methods.service.ts b/src/app/services/chat/methods.service.ts
deleted file mode 100644
index d46b19283..000000000
--- a/src/app/services/chat/methods.service.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ChatService } from '../chat.service';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class MethodsService {
-
-  constructor(private chatService: ChatService) {
-  }
-}
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 7bfb8d36e..c921a754c 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -1,9 +1,28 @@
-import { Injectable } from '@angular/core';
-
+import { Injectable } from '@angular/core'
+import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service';
+import { MessageService } from 'src/app/services/chat/message.service'
+import { ChatUserService } from 'src/app/services/chat/chat-user.service'
 @Injectable({
   providedIn: 'root'
 })
 export class RoomService {
 
-  constructor() { }
+  massages: MessageService[] = []
+  chatUser: ChatUserService[] = []
+  id = []
+
+  constructor(
+    private RocketChatClientService: RocketChatClientService,
+    private MessageService: MessageService
+  ) {}
+
+  setData({id}){
+    this.id= id
+  }
+
+  create() {}
+  sendMessage() {}
+  deleteMessage() {}
+  ReactToMessage() {}
+
 }

From 3b370996b55f35ebbc9b2d6363668248c4941bf0 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 Jan 2022 11:01:34 +0100
Subject: [PATCH 030/112] restore file

---
 .../chat/chat-methods.service.spec.ts         | 16 ++++++++++
 src/app/services/chat/chat-methods.service.ts | 31 +++++++++++++++++++
 src/app/services/chat/chat.service.ts         |  4 +++
 3 files changed, 51 insertions(+)
 create mode 100644 src/app/services/chat/chat-methods.service.spec.ts
 create mode 100644 src/app/services/chat/chat-methods.service.ts

diff --git a/src/app/services/chat/chat-methods.service.spec.ts b/src/app/services/chat/chat-methods.service.spec.ts
new file mode 100644
index 000000000..3e474e69d
--- /dev/null
+++ b/src/app/services/chat/chat-methods.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ChatMethodsService } from './chat-methods.service';
+
+describe('ChatMethodsService', () => {
+  let service: ChatMethodsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ChatMethodsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/chat/chat-methods.service.ts b/src/app/services/chat/chat-methods.service.ts
new file mode 100644
index 000000000..e22f6ddc0
--- /dev/null
+++ b/src/app/services/chat/chat-methods.service.ts
@@ -0,0 +1,31 @@
+import { Injectable } from '@angular/core';
+import { ChatService } from '../chat.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ChatMethodsService {
+
+  constructor(private chatService: ChatService) {
+  }
+
+  sendMessage(roomId:string, data:any) {
+
+    let body = {
+      "message":
+      {
+        "rid": roomId,
+        "msg":"",
+        "file":{
+          "type": "application/meeting",
+          "subject": data.subject,
+          "start_date": data.start,
+          "end_date": data.end,
+          "venue": data.venue,
+          "id": data.id,
+        }
+      }
+    }
+    this.chatService.sendMessage(body).subscribe(res=> {});
+  }
+}
diff --git a/src/app/services/chat/chat.service.ts b/src/app/services/chat/chat.service.ts
index f5a29fc46..1686dd66a 100644
--- a/src/app/services/chat/chat.service.ts
+++ b/src/app/services/chat/chat.service.ts
@@ -26,4 +26,8 @@ export class ChatService {
     });
   }
 
+  onJoinRoom() {
+    // live
+  }
+
 }

From d230d8cc8028b3fbe648d13934e30b5567b614f8 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 11 Jan 2022 12:12:45 +0100
Subject: [PATCH 031/112] merge

---
 src/app/app.module.ts                         |  4 +-
 src/app/home/home.page.ts                     |  7 +-
 src/app/pages/chat/chat.page.ts               | 66 +++++++++++--------
 src/app/pages/login/login.page.ts             |  2 +
 src/app/services/auth.service.ts              |  2 +
 src/app/services/chat.service.ts              | 17 +++--
 .../services/socket/websocket.service.spec.ts | 16 +++++
 src/app/services/socket/websocket.service.ts  | 43 ++++++++++++
 src/app/services/websocket.service.ts         |  4 +-
 .../shared/chat/messages/messages.page.html   |  1 +
 src/environments/environment.prod.ts          |  1 +
 src/environments/environment.ts               |  1 +
 12 files changed, 125 insertions(+), 39 deletions(-)
 create mode 100644 src/app/services/socket/websocket.service.spec.ts
 create mode 100644 src/app/services/socket/websocket.service.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 9b2c367a6..55f2210c0 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -28,7 +28,7 @@ import { CalendarModule, DateAdapter } from 'angular-calendar';
 import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { MessagesPage } from './pages/chat/messages/messages.page';
-import { WebsocketService } from './services/websocket.service'
+import { WebsocketService } from './services/socket/websocket.service'
 import { ChatService } from './services/chat.service';
 import {MatDatepickerModule} from '@angular/material/datepicker';
 // import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
@@ -111,7 +111,7 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
     HammerModule,
     CustomImageCachePageRoutingModule
 
-   
+
     ],
   providers: [
     { provide: MAT_DATE_LOCALE, useValue: 'pt' },
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index d2a700221..a6e45ce49 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -97,14 +97,13 @@ export class HomePage implements OnInit {
     private sqliteservice: SqliteService,
     private RouteService: RouteService) {
 
-    this.RocketChatClientService.connect(()=>{
+    /* this.RocketChatClientService.connect(()=>{
 
       this.RocketChatClientService.login({
         username: 'paulo.pinto',
         email: 'paulo.pinto@gabinetedigital.local',
         password: 'tabteste@006'
       }).then((message)=>{
-        // alert('login')
         console.log('rocket chat login successfully', message)
         this.RocketChatClientService.getRooms().then((rooms)=>{
           console.log('rooms', rooms)
@@ -112,9 +111,9 @@ export class HomePage implements OnInit {
       }).catch((message)=>{
         console.log('rocket chat login failed', message)
       }).finally(()=>{
-      })  
+      })
 
-    })
+    }) */
 
     // this.RocketChatClientService.send()
     /* this.webNotificationPopupService.askNotificationPermission() */
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 247df586f..8cc098b4b 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -134,6 +134,12 @@ export class ChatPage implements OnInit {
       }
     };
     this.showLoader = true;
+
+    console.log("CHAT PAGE");
+
+    chatService.messages.subscribe(msg => {
+      console.log("Response from Websocket server: "+msg);
+    });
   }
 
   ngOnInit() {
@@ -144,14 +150,14 @@ export class ChatPage implements OnInit {
 
     this.authService.userData$.subscribe((res: any) => {
       this.loggedUser = res;
-      console.log(this.loggedUser);
+      //console.log(this.loggedUser);
       this.load();
 
       this.getDirectMessagesDB();
     });
 
     /* websocket functions */
-    //this.sendMsg();
+    this.sendMsg();
 
     /* Fim websocket functions */
     this.hideRefreshButton();
@@ -159,7 +165,7 @@ export class ChatPage implements OnInit {
 
     //Teste
     let t = this.showDateDuration(new Date());
-    console.log(t);
+    //console.log(t);
 
     this.setStatus('away');
     /* if(this.dataService.get("newGroup")){
@@ -221,17 +227,23 @@ export class ChatPage implements OnInit {
     }
   }
 
+  /* loadWsChatMessages(){
+    this.chatService.messages.subscribe(msg => {
+      console.log("Response from Websocket server: "+msg);
+    });
+  } */
 
-  /* loadMessage(){
+
+  loadMessage(){
     this.chatService.messages.subscribe(msg => {
       console.log("Response from websocket: " + msg);
     });
-  } */
-  /* sendMsg() {
+  }
+  sendMsg() {
     console.log("new message from client to websocket: ", this.message);
     this.chatService.messages.next(this.message);
     this.message.msg = "";
-  } */
+  }
 
 
   /* Fim websockets functions */
@@ -409,7 +421,7 @@ export class ChatPage implements OnInit {
     let params = new HttpParams();
     params = params.set("types", "c");
     this.chatService.customsRooms(params).subscribe(res => {
-      console.log(res);
+      //console.log(res);
     });
   }
 
@@ -423,9 +435,9 @@ export class ChatPage implements OnInit {
           var dateB = new Date(b._updatedAt).getTime();
           return dateB - dateA;
         });
-        console.log('DIRECTMESSAGE FROM DB', this.userDirectMessages);
+        //console.log('DIRECTMESSAGE FROM DB', this.userDirectMessages);
 
-        console.log('ROOMS FROM DB', rooms)
+        //console.log('ROOMS FROM DB', rooms)
       })
 
       this.storageservice.get('chatusers').then((users) => {
@@ -433,7 +445,7 @@ export class ChatPage implements OnInit {
       })
     } else {
       this.sqlservice.getAllChatRoom().then((rooms: any) => {
-        console.log('ROOMS FROM DB', rooms)
+        //console.log('ROOMS FROM DB', rooms)
         let roomsArray = [];
         rooms.forEach(element => {
           let roomListDB = {
@@ -453,13 +465,13 @@ export class ChatPage implements OnInit {
           var dateB = new Date(b._updatedAt).getTime();
           return dateB - dateA;
         });
-        console.log('DIRECTMESSAGE FROM DB', this.userDirectMessages);
+        //console.log('DIRECTMESSAGE FROM DB', this.userDirectMessages);
 
-        console.log('ROOMS FROM DB', rooms)
+        //console.log('ROOMS FROM DB', rooms)
       })
 
       this.sqlservice.getAllChatUsers().then((userslist: any) => {
-        console.log('USERS FOM DB 1', userslist)
+        //console.log('USERS FOM DB 1', userslist)
         let chatusersArray = [];
         userslist.forEach(element => {
           console.log('USERS FOM DB 2', element)
@@ -490,7 +502,7 @@ export class ChatPage implements OnInit {
           _updatedAt: element._updatedAt
         }
 
-        console.log(' Web TRANSFORM ROOM LIST', roomList)
+        //console.log(' Web TRANSFORM ROOM LIST', roomList)
         roomsArray.push(roomList)
       });
 
@@ -506,7 +518,7 @@ export class ChatPage implements OnInit {
           updatedat: element._updatedAt
         }
 
-        console.log('TRANSFORM ROOM LIST', roomList)
+        //console.log('TRANSFORM ROOM LIST', roomList)
         this.sqlservice.addChatListRoom(roomList);
       });
     }
@@ -516,25 +528,25 @@ export class ChatPage implements OnInit {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
       let usersArray = [];
       users.forEach(element => {
-        console.log('TRANSFORM USER CHAT 1', element)
+        //console.log('TRANSFORM USER CHAT 1', element)
         let chatusers = {
           _id: element._id,
           name: element.name,
           username: element.username
         }
-        console.log('TRANSFORM USER CHAT 2', chatusers)
+        //console.log('TRANSFORM USER CHAT 2', chatusers)
         usersArray.push(chatusers);
       });
       this.storageservice.store('chatusers',usersArray);
     } else {
       users.forEach(element => {
-        console.log('TRANSFORM USER CHAT 1', element)
+        //console.log('TRANSFORM USER CHAT 1', element)
         let chatusers = {
           id: element._id,
           name: element.name,
           username: element.username
         }
-        console.log('TRANSFORM USER CHAT 2', chatusers)
+        //console.log('TRANSFORM USER CHAT 2', chatusers)
         this.sqlservice.addChatListUsers(chatusers);
       });
     }
@@ -545,7 +557,7 @@ export class ChatPage implements OnInit {
       this.showLoader = false;
       this.transformDataRoomList(res.ims)
       this.getDirectMessagesDB()
-      console.log('Chat list', res);
+      //console.log('Chat list', res);
 
       if (res != 200) {
         /* if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
@@ -592,12 +604,12 @@ export class ChatPage implements OnInit {
   async getChatMembers() {
     //return await this.chatService.getMembers(roomId).toPromise();
     this.chatService.getAllUsers().subscribe(res => {
-      console.log('chatusers', res);
+      //console.log('chatusers', res);
       this.transformDataUserList(res['users'])
 
       if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
         this.dmUsers = res['users'].filter(data => data.username != this.loggedUserChat.me.username);
-      console.log(this.dmUsers);
+      //console.log(this.dmUsers);
       }
 
     });
@@ -614,7 +626,7 @@ export class ChatPage implements OnInit {
           return dateB - dateA;
         });
 
-        console.log('GROUPS FROM DB',  this.allGroups)
+        //console.log('GROUPS FROM DB',  this.allGroups)
       })
 
       this.storageservice.get('chatusers').then((users) => {
@@ -643,7 +655,7 @@ export class ChatPage implements OnInit {
           var dateB = new Date(b._updatedAt).getTime();
           return dateB - dateA;
         });
-        console.log('Group FROM DB', this.allGroups);
+        //console.log('Group FROM DB', this.allGroups);
 
       })
 
@@ -725,7 +737,7 @@ export class ChatPage implements OnInit {
         //console.log(this.allGroups);
         /* }); */
         if (this.route.url != "/home/chat") {
-          console.log("Timer message stop")
+          //console.log("Timer message stop")
         }
         else {
           //Check if modal is opened
@@ -786,7 +798,7 @@ export class ChatPage implements OnInit {
   async openMessagesModal(roomId: any) {
     this.closeAllDesktopComponents();
 
-    console.log(roomId);
+    //console.log(roomId);
 
     const modal = await this.modalController.create({
       component: MessagesPage,
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 2197ab7ae..5792e916b 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -11,6 +11,7 @@ import { ClearStoreService } from 'src/app/services/clear-store.service';
 import { ChangeProfileService } from 'src/app/services/change-profile.service';
 import { ThemeService } from 'src/app/services/theme.service';
 import { StorageService } from 'src/app/services/storage.service';
+import { ChatService } from 'src/app/services/chat.service';
 
 @Component({
   selector: 'app-login',
@@ -40,6 +41,7 @@ export class LoginPage implements OnInit {
     private changeProfileService: ChangeProfileService,
     public ThemeService: ThemeService,
     private storageservice: StorageService,
+    private chatService: ChatService,
   ) {}
 
   ngOnInit() {
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 3024f8bff..4a704c605 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -30,6 +30,7 @@ export class AuthService {
     public alertController: AlertController,
     private aesencrypt: AESEncrypt,
     private cookieService: CookieService,
+    //private realtimeChat: RocketChatClientService;
     ) {
 
       this.headers = new HttpHeaders();
@@ -99,6 +100,7 @@ export class AuthService {
       }
 
       let responseChat = await this.httpService.post('login', postData).toPromise();
+
       if(responseChat) {
         console.log('Login to Rocket chat OK');
         this.ValidatedUserChat = responseChat;
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 16c07557c..1489b8c17 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -8,7 +8,7 @@ import { environment } from 'src/environments/environment';
 import { Storage } from '@ionic/storage';
 import { Message } from 'src/app/models/message.model';
 import { Observable, Subject } from "rxjs/Rx";
-import { WebsocketService } from './websocket.service';
+import { WebsocketService } from './socket/websocket.service';
 
 @Injectable({
   providedIn: 'root'
@@ -21,7 +21,7 @@ export class ChatService {
   X_Auth_Token:any;
 
   //SERVER_URL = 'wss://www.tabularium.pt/websocket';
-  //public messages: Subject<any>;
+  public messages: Subject<any>;
   loggedUserChat:any;
   bindOnMessage: any;
 
@@ -31,7 +31,7 @@ export class ChatService {
     private authService: AuthService,
     private storage: Storage,
     private storageService:StorageService,
-    //private wsService: WebsocketService,
+    private wsService: WebsocketService,
     )
     {
       this.loggedUserChat = authService.ValidatedUserChat;
@@ -42,11 +42,18 @@ export class ChatService {
         headers: this.headers,
       };
 
-      /* this.messages = <Subject<any>>this.wsService.connect(this.SERVER_URL).map((response: MessageEvent): any => {
+      console.log("CHAT SERVICE");
+
+      this.messages = <Subject<any>>this.wsService
+      .connect(environment.apiWsChatUrl)
+      .map((response: MessageEvent): any => {
           let data = JSON.parse(response.data);
           console.log(data);
           return (JSON.stringify(data));
-        }); */
+        });
+
+        console.log(this.messages);
+
     }
 
     getDocumentDetails(url:string){
diff --git a/src/app/services/socket/websocket.service.spec.ts b/src/app/services/socket/websocket.service.spec.ts
new file mode 100644
index 000000000..bf797727f
--- /dev/null
+++ b/src/app/services/socket/websocket.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { WebsocketService } from './websocket.service';
+
+describe('WebsocketService', () => {
+  let service: WebsocketService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(WebsocketService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/socket/websocket.service.ts b/src/app/services/socket/websocket.service.ts
new file mode 100644
index 000000000..162aac12b
--- /dev/null
+++ b/src/app/services/socket/websocket.service.ts
@@ -0,0 +1,43 @@
+import { Injectable } from '@angular/core';
+import * as Rx from 'rxjs/Rx';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class WebsocketService {
+
+  constructor() { }
+
+  private subject: Rx.Subject<MessageEvent>;
+
+  public connect(url): Rx.Subject<MessageEvent> {
+    if(!this.subject){
+      this.subject = this.create(url);
+      console.log("Sucessful connect :"+url);
+    }
+    return this.subject;
+  }
+
+  private create(url): Rx.Subject<MessageEvent>{
+    let ws = new WebSocket(url);
+
+    let observable = Rx.Observable.create(
+      (obs: Rx.Observer<MessageEvent>) => {
+        ws.onmessage = obs.next.bind(obs);
+        ws.onerror = obs.error.bind(obs);
+        ws.onclose = obs.complete.bind(obs);
+        return ws.close.bind(ws)
+      })
+
+      let observer = {
+        next: (data: Object) => {
+          if(ws.readyState === WebSocket.OPEN){
+            ws.send(JSON.stringify(data));
+          }
+        }
+      }
+
+    return Rx.Subject.create(observer, observable);
+
+  }
+}
diff --git a/src/app/services/websocket.service.ts b/src/app/services/websocket.service.ts
index 424a6914e..2f527d215 100644
--- a/src/app/services/websocket.service.ts
+++ b/src/app/services/websocket.service.ts
@@ -11,7 +11,9 @@ export class WebsocketService {
   currentUser = '';
   private subject: Rx.Subject<MessageEvent>;
 
-  constructor() { }
+  constructor() {
+    console.log("CHAT WEBSOCKET");
+   }
 
   public connect(url): Rx.Subject<MessageEvent> {
     if (!this.subject) {
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 09f89ba4b..d35dfa92b 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -83,6 +83,7 @@
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
+
       <div *ngIf="msg.file" class="info-meeting">
         <div *ngIf="msg.file.type == 'application/meeting'">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 9e3681dcb..d839c7ee7 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -2,6 +2,7 @@ export const environment = {
   production: true,
   apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
   apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
+  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
   domain: 'gabinetedigital.local',
   defaultuser: '',//paulo.pinto paulo.pinto@gabinetedigital.local
   defaultuserpwd: '', //tabteste@006,
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index a7de6b222..37e513724 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -7,6 +7,7 @@ export const environment = {
   apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
   //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
   apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
+  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
   //apiChatUrl: 'https://www.tabularium.pt/api/v1/',
   /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
   domain: 'gabinetedigital.local', //gabinetedigital.local

From a5b2b9eaea5ec1f3bf47785915412413a0e8689b Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 11 Jan 2022 12:32:46 +0100
Subject: [PATCH 032/112] save

---
 src/app/app.module.ts                         |  2 +-
 src/app/home/home.page.ts                     |  4 +--
 src/app/pages/chat/chat.page.ts               |  5 ++--
 src/app/services/chat.service.ts              |  2 +-
 .../socket/rocket-chat-client.service.ts      | 28 +++++++++----------
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 55f2210c0..3bbae25b0 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -28,7 +28,7 @@ import { CalendarModule, DateAdapter } from 'angular-calendar';
 import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { MessagesPage } from './pages/chat/messages/messages.page';
-import { WebsocketService } from './services/socket/websocket.service'
+import { WebsocketService } from './services/websocket.service'
 import { ChatService } from './services/chat.service';
 import {MatDatepickerModule} from '@angular/material/datepicker';
 // import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index a6e45ce49..a501f8ba2 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -97,7 +97,7 @@ export class HomePage implements OnInit {
     private sqliteservice: SqliteService,
     private RouteService: RouteService) {
 
-    /* this.RocketChatClientService.connect(()=>{
+    this.RocketChatClientService.connect(()=>{
 
       this.RocketChatClientService.login({
         username: 'paulo.pinto',
@@ -113,7 +113,7 @@ export class HomePage implements OnInit {
       }).finally(()=>{
       })
 
-    }) */
+    })
 
     // this.RocketChatClientService.send()
     /* this.webNotificationPopupService.askNotificationPermission() */
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 8cc098b4b..35197cb44 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -137,9 +137,9 @@ export class ChatPage implements OnInit {
 
     console.log("CHAT PAGE");
 
-    chatService.messages.subscribe(msg => {
+    /* chatService.messages.subscribe(msg => {
       console.log("Response from Websocket server: "+msg);
-    });
+    }); */
   }
 
   ngOnInit() {
@@ -243,6 +243,7 @@ export class ChatPage implements OnInit {
     console.log("new message from client to websocket: ", this.message);
     this.chatService.messages.next(this.message);
     this.message.msg = "";
+    this.loadMessage();
   }
 
 
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 1489b8c17..031e90166 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -8,7 +8,7 @@ import { environment } from 'src/environments/environment';
 import { Storage } from '@ionic/storage';
 import { Message } from 'src/app/models/message.model';
 import { Observable, Subject } from "rxjs/Rx";
-import { WebsocketService } from './socket/websocket.service';
+import { WebsocketService } from './websocket.service';
 
 @Injectable({
   providedIn: 'root'
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 92dc7f48a..b26c080dc 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -8,7 +8,7 @@ class _RocketChatClientService {
   private firstPingFunx: Function
   isLogin = false;
   request = []
-  
+
   constructor() {}
 
   private returns() {}
@@ -26,7 +26,7 @@ class _RocketChatClientService {
     }
 
     this.ws.send(connectMessage)
-    
+
     this.ws.registerCallback({type:'Onmessage',funx:(message: any) => {
 
       if(message.msg == "ping") {
@@ -141,7 +141,7 @@ class _RocketChatClientService {
     }
 
    this.ws.send(subscribeRequest);
-   
+
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{
         if(message.result.id == requestId) { // same request send
@@ -155,7 +155,7 @@ class _RocketChatClientService {
   private disconnect = () => {
 
   }
-  
+
   // socket class ==================================================================
   private socket!: WebSocket;
   private wsUrl = ''
@@ -165,7 +165,7 @@ class _RocketChatClientService {
   private ws = {
     connected: false,
     registerCallback:(params: wsCallbacksParams) =>{
-      
+
       if(!params.requestId) {
         params.requestId = uuidv4()
       }
@@ -191,15 +191,15 @@ class _RocketChatClientService {
     onopen:()=> {
       this.ws.connected = true
       console.log('================== welcome to socket server =====================')
-  
+
       this.wsMsgQueue.forEach((item, index, object) => {
         this.ws.send(item.message, item.requestId);
         object.splice(index, 1);
       })
-  
+
     },
     send: (message: object, requestId = uuidv4()) => {
-  
+
       if (this.ws.connected == false) { // save data to send when back online
         console.log('save msgQueue')
         this.wsMsgQueue.push({message, requestId})
@@ -210,24 +210,24 @@ class _RocketChatClientService {
       }
       return requestId
     },
-  
+
     onmessage:(event: any)=> {
       const data = JSON.parse(event.data)
       console.log('event.data', data)
-  
+
       for (const [key, value] of Object.entries(this.wsCallbacks)) {
         if(value.type== 'Onmessage') {
           value.funx(data)
           if(value.runOnces) {
             delete this.wsCallbacks[value.requestId || key]
-          } 
+          }
         }
 
 
       }
 
     },
-    
+
     onclose:(event: any)=> {
 
       this.connect(this.firstPingFunx())
@@ -235,7 +235,7 @@ class _RocketChatClientService {
       this.ws.connected = false
       console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
     },
-  
+
     onerror: (event: any) =>  {
       console.log(`[error] ${event.message}`);
     }
@@ -245,4 +245,4 @@ class _RocketChatClientService {
 }
 
 
-export const RocketChatClientService = new _RocketChatClientService()
\ No newline at end of file
+export const RocketChatClientService = new _RocketChatClientService()

From a8a1307becf34cabf01b3d1705c6e082dda63a07 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 Jan 2022 13:03:43 +0100
Subject: [PATCH 033/112] add user list

---
 src/app/pages/chat/chat.page.html     | 104 +++++++++++++-------------
 src/app/pages/chat/chat.page.ts       |  55 +++++++-------
 src/app/services/chat/chat.service.ts |  73 +++++++++++++++---
 src/app/services/chat/room.service.ts |  13 +++-
 4 files changed, 153 insertions(+), 92 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index d65c8aa73..c6dcc827c 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -43,64 +43,64 @@
         <div class=" aside overflow-y-auto d-flex flex-wrap flex-grow-1">
         <div class="width-100" [ngSwitch]="segment">
           <ion-list *ngSwitchCase="'Contactos'">
-              <ion-item-sliding>
-                <div class="item item-hover width-100 d-flex ion-no-padding ion-no-margin"
-                  *ngFor="let dm of userDirectMessages"
-                  [class.item-active]="dm._id == idSelected">
-                    <div class="item-icon">
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && dm._id != idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-chat-40.svg"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && dm._id == idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-chat-40-hover.svg"></ion-icon>
-                    </div>
-                    <div [class.highlight]="dm._id =='cjFv5XfreKz5j3fWW'"
-                     (click)="openMessagesPage(dm._id)"
-                     class="item-content flex-grow-1 cursor-pointer"><!-- (click)="openMessages(dm)" -->
-                      <div class="item-title-time">
-                        <div class="item-title" [class.item-title-active]="dm._id == idSelected">
-                          <ion-label *ngFor="let user of dm.uids">
-                            <span *ngIf="user !=loggedUserChat.me.username">
-                              <div *ngFor="let t of dmUsers">
-                                <div *ngIf="user == t._id">
-                                  {{t.name}}
-                                </div>
+            <ion-item-sliding>
+              <div class="item item-hover width-100 d-flex ion-no-padding ion-no-margin"
+                *ngFor="let room of ChatServiceGPR.individual | keyvalue"
+                [class.item-active]="room.value.id == idSelected">
+                  <div class="item-icon">
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && room.value.id != idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-chat-40.svg"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && room.value.id == idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-chat-40-hover.svg"></ion-icon>
+                  </div>
+                  <div [class.highlight]="room.value.id =='cjFv5XfreKz5j3fWW'"
+                   (click)="openMessagesPage(room.value.id)"
+                   class="item-content flex-grow-1 cursor-pointer"><!-- (click)="openMessages(dm)" -->
+                    <div class="item-title-time">
+                      <div class="item-title" [class.item-title-active]="room.value.id == idSelected">
+                        <ion-label >
+                          <span >
+                            <div >
+                              <div >
+                                {{room.value.name}}
                               </div>
-                          </span>
-                          </ion-label>
+                            </div>
+                        </span>
+                        </ion-label>
+                      </div>
+                      <!-- <div class="item-date" [class.item-date-active]="dm._id == idSelected">{{showDateDuration(dm._updatedAt)}}</div> -->
+                    </div>
+                    <div *ngIf="room.value.lastMessage" class="item-description" [class.item-description-active]="room.value.id == idSelected">
+                      <ion-label *ngIf="room.value.lastMessage">{{room.value.lastMessage.msg}}</ion-label>
+                      <ion-label *ngIf="room.value.lastMessage.file">
+                        <fa-icon *ngIf="room.value.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.value.id == idSelected"></fa-icon>
+                        <fa-icon *ngIf="room.value.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="room.value.id == idSelected"></fa-icon>
+                        <span> {{room.value.lastMessage.file.name || room.value.lastMessage.file.subject }}</span>
+                      </ion-label>
+                      <ion-label *ngIf="room.value.lastMessage.attachments">
+                        <div *ngIf="room.value.lastMessage.attachments[0].image_url">
+                          <fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="room.value.id == idSelected"></fa-icon>
+                          <span> Fotografia</span>
                         </div>
-                        <div class="item-date" [class.item-date-active]="dm._id == idSelected">{{showDateDuration(dm._updatedAt)}}</div>
-                      </div>
-                      <div *ngIf="dm.lastMessage" class="item-description" [class.item-description-active]="dm._id == idSelected">
-                        <ion-label *ngIf="dm.lastMessage">{{dm.lastMessage.msg}}</ion-label>
-                        <ion-label *ngIf="dm.lastMessage.file">
-                          <fa-icon *ngIf="dm.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="dm._id == idSelected"></fa-icon>
-                          <fa-icon *ngIf="dm.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="dm._id == idSelected"></fa-icon>
-                          <span> {{dm.lastMessage.file.name || dm.lastMessage.file.subject }}</span>
-                        </ion-label>
-                        <ion-label *ngIf="dm.lastMessage.attachments">
-                          <div *ngIf="dm.lastMessage.attachments[0].image_url">
-                            <fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="dm._id == idSelected"></fa-icon>
-                            <span> Fotografia</span>
-                          </div>
-                        </ion-label>
-                      </div>
+                      </ion-label> 
                     </div>
                   </div>
-              </ion-item-sliding>
-              <ion-item-sliding *ngIf="showLoader || userDirectMessages.length < 1">
-                  <div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
-                    <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-chat-grey.svg"></ion-icon></div>
-                    <div class="item-content flex-grow-1 cursor-pointer">
-                      <div class="item-title-time">
-                        <div class="item-title"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></div>
-                        <div class="item-date"><ion-skeleton-text animated></ion-skeleton-text></div>
-                      </div>
-                      <div class="item-description d-flex align-items-center">
-                        <fa-icon icon="file-alt" class="file-icon"></fa-icon>
-                        <ion-skeleton-text animated style="width: 95%; margin-left:5%"></ion-skeleton-text>
-                      </div>
+                </div>
+            </ion-item-sliding>
+            <ion-item-sliding *ngIf="ChatServiceGPR.loadingWholeList || ChatServiceGPR.individualCount < 1">
+                <div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
+                  <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-chat-grey.svg"></ion-icon></div>
+                  <div class="item-content flex-grow-1 cursor-pointer">
+                    <div class="item-title-time">
+                      <div class="item-title"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></div>
+                      <div class="item-date"><ion-skeleton-text animated></ion-skeleton-text></div>
+                    </div>
+                    <div class="item-description d-flex align-items-center">
+                      <fa-icon icon="file-alt" class="file-icon"></fa-icon>
+                      <ion-skeleton-text animated style="width: 95%; margin-left:5%"></ion-skeleton-text>
                     </div>
                   </div>
-              </ion-item-sliding>
+                </div>
+            </ion-item-sliding>
           </ion-list>
           <ion-list *ngSwitchCase="'Grupos'">
               <ion-item-sliding *ngIf="!showLoader">
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 247df586f..df13a2278 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -12,6 +12,7 @@ import {
 import { ModalController, Platform } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
+import { ChatService as ChatServiceGPR} from 'src/app/services/chat/chat.service'
 import { GroupMessagesPage } from './group-messages/group-messages.page';
 import { ContactsPage } from './messages/contacts/contacts.page';
 import { MessagesPage } from './messages/messages.page';
@@ -123,9 +124,11 @@ export class ChatPage implements OnInit {
     private router: Router,
     private sqlservice: SqliteService,
     private platform: Platform,
-    private storageservice: StorageService
+    private storageservice: StorageService,
+    public ChatServiceGPR: ChatServiceGPR
 
   ) {
+
     this.loggedUserChat = authService.ValidatedUserChat['data'];
     this.headers = new HttpHeaders();
     window.onresize = (event) => {
@@ -142,44 +145,44 @@ export class ChatPage implements OnInit {
 
     this.segment = "Contactos";
 
-    this.authService.userData$.subscribe((res: any) => {
-      this.loggedUser = res;
-      console.log(this.loggedUser);
-      this.load();
+    // this.authService.userData$.subscribe((res: any) => {
+    //   this.loggedUser = res;
+    //   console.log(this.loggedUser);
+    //   this.load();
 
-      this.getDirectMessagesDB();
-    });
+    //   // this.getDirectMessagesDB();
+    // });
 
     /* websocket functions */
     //this.sendMsg();
 
     /* Fim websocket functions */
-    this.hideRefreshButton();
-    this.getChatMembers();
+    // this.hideRefreshButton();
+    // this.getChatMembers();
 
     //Teste
-    let t = this.showDateDuration(new Date());
-    console.log(t);
+    // let t = this.showDateDuration(new Date());
+    // console.log(t);
 
-    this.setStatus('away');
+    // this.setStatus('away');
     /* if(this.dataService.get("newGroup")){
       this.openNewGroupPage();
     } */
 
-    this.router.events.forEach((event) => {
-      if (event instanceof NavigationStart && event.url.startsWith('/home/chat')) {
-        if (this.dataService.get("newGroup")) {
-          this.openNewGroupPage();
-        }
-        else{
-          this.closeAllDesktopComponents();
-          this.showEmptyComponent = true;
-        }
-      }
-      else{
-        this.dataService.set("newGroup", false);
-      }
-    });
+    // this.router.events.forEach((event) => {
+    //   if (event instanceof NavigationStart && event.url.startsWith('/home/chat')) {
+    //     if (this.dataService.get("newGroup")) {
+    //       this.openNewGroupPage();
+    //     }
+    //     else{
+    //       this.closeAllDesktopComponents();
+    //       this.showEmptyComponent = true;
+    //     }
+    //   }
+    //   else{
+    //     this.dataService.set("newGroup", false);
+    //   }
+    // });
   }
 
   numSequence(n: number): Array<number> {
diff --git a/src/app/services/chat/chat.service.ts b/src/app/services/chat/chat.service.ts
index 1686dd66a..89c2b440f 100644
--- a/src/app/services/chat/chat.service.ts
+++ b/src/app/services/chat/chat.service.ts
@@ -2,14 +2,21 @@ import { Injectable } from '@angular/core';
 import { RoomService } from './room.service';
 import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service';
 import { MessageService } from 'src/app/services/chat/message.service'
+import { SessionStore } from 'src/app/store/session.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class ChatService {
 
-  rooms: RoomService[] = []
-  group = []
+
+  individual: {[key: string]:  RoomService} = {}
+  group: {[key: string]:  RoomService} = {}
+
+  loadingWholeList = false
+
+  individualCount = 0;
+  groupCount = 0;
   
   constructor(
     private RocketChatClientService: RocketChatClientService
@@ -17,17 +24,63 @@ export class ChatService {
     this.getAllRoomAndSubscribe()
   }
 
-  getAllRoomAndSubscribe() {
-    this.RocketChatClientService.getRooms().then((rooms: any) => {
-      rooms.result.update.forEach((roomData:any) => {
-        const room = new RoomService(new RocketChatClientService(), new MessageService())
-        room.setData({id: roomData.lastMessage.rid})
-      });
+  async getAllRoomAndSubscribe () {
+    this.loadingWholeList = true
+
+    const rooms: any = await this.RocketChatClientService.getRooms();
+
+    rooms.result.update.forEach((roomData:any) => {
+      let room
+      let roomId = roomData.lastMessage.rid
+      if(this.isIndividual(roomData)) {
+        room = new RoomService(new RocketChatClientService(), new MessageService())
+        room.setData({
+          id: this.getRoomId(roomData),
+          name: this.getChatName(roomData),
+          lastMessage: this.getRoomLastMessage(roomData)
+        })
+        this.individual[roomId] = room
+        this.individualCount++
+      } else {
+        room = new RoomService(new RocketChatClientService(), new MessageService())
+        room.setData({
+          id: this.getRoomId(roomData),
+          name: this.getChatName(roomData),
+          lastMessage: this.getRoomLastMessage(roomData)
+        })
+        this.group[roomId] = room
+        this.groupCount++
+      }
+      
     });
+
+    this.loadingWholeList = false
+   
   }
 
-  onJoinRoom() {
-    // live
+  getChatName(roomData) {
+    if(this.isIndividual(roomData)) {
+      const names: String[] = roomData.usernames
+      const roomName = names.filter((name)=>{
+        return name != SessionStore.user.RochetChatUser
+      })[0]
+
+      return roomName
+    } else {
+      return roomData.fName
+    }
+  }
+
+  getRoomId(roomData) {
+    return roomData.lastMessage.rid
+  }
+
+  getRoomLastMessage(roomData) {
+    return roomData.lastMessage
+  }
+
+  private isIndividual(roomData) {
+    return !roomData.fname
   }
 
 }
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index c921a754c..67a751fe9 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -7,17 +7,22 @@ import { ChatUserService } from 'src/app/services/chat/chat-user.service'
 })
 export class RoomService {
 
-  massages: MessageService[] = []
+  massages: {[key: string]:  MessageService} = {}
+  lastMessage: MessageService;
+
   chatUser: ChatUserService[] = []
-  id = []
+  id = ''
+  name = ''
 
   constructor(
     private RocketChatClientService: RocketChatClientService,
     private MessageService: MessageService
   ) {}
 
-  setData({id}){
-    this.id= id
+  setData({id, name, lastMessage}) {
+    this.id = id
+    this.name = name
+    this.lastMessage = lastMessage
   }
 
   create() {}

From dcee5aa2f4d8839898f26dd0dc581bd3352a6153 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 Jan 2022 15:43:09 +0100
Subject: [PATCH 034/112] improve chat remove loop

---
 src/app/home/home.page.ts                     | 22 --------
 .../pages/chat/messages/messages.page.html    |  2 +-
 src/app/pages/chat/messages/messages.page.ts  |  9 ++-
 src/app/services/chat/chat.service.ts         | 41 ++++++++++++--
 src/app/services/chat/message.service.ts      |  4 ++
 src/app/services/chat/room.service.ts         | 40 ++++++++++++--
 .../socket/rocket-chat-client.service.ts      |  5 +-
 .../shared/chat/messages/messages.page.html   |  2 +-
 src/app/shared/chat/messages/messages.page.ts | 55 ++++---------------
 9 files changed, 96 insertions(+), 84 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 048b2e17b..8b28279b0 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -99,28 +99,6 @@ export class HomePage implements OnInit {
         console.log('loadHistory', message)
       })
 
-
-      this.RocketChatClientService.getRooms().then((rooms: any)=>{
-        console.log('rooms', rooms)
-
-        rooms.result.update.forEach((room:any) => {
-          console.log('room', room)
-          this.RocketChatClientService.subscribe(room.lastMessage.rid).then((subscription)=>{
-            console.log('subscription', subscription)
-          })
-        });
-      });
-
-
-      this.RocketChatClientService.receiveLiveMessageFromRoom(
-        'fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM',
-        this.constructor.name,
-        (Chatmessage)=>{
-          console.log('chat', Chatmessage)
-        }
-      )
-
-
       window['jj'] =  ()=>{
         //send message                              // roomId                // Message
         this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 02df0983c..dd895bbfc 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -49,7 +49,7 @@
     </ion-refresher-content>
   </ion-refresher> -->
   <div (click)="handleClick()" class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of messages; let last = last"
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of ChatServiceGPR.getRoom(this.roomId).mmm; let last = last"
     [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId"  >
       <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)" *ngIf="msg.msg !=''">
         <div class="title">
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 0e72b5634..aee83350b 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -28,6 +28,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { elementAt } from 'rxjs-compat/operator/elementAt';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
+import { ChatService as ChatServiceGPR} from 'src/app/services/chat/chat.service'
 
 const IMAGE_DIR = 'stored-images';
 
@@ -94,7 +95,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     public ThemeService: ThemeService,
     private changeDetectorRef: ChangeDetectorRef,
     private platform: Platform,
-    private sqlservice: SqliteService
+    private sqlservice: SqliteService,
+    public ChatServiceGPR: ChatServiceGPR
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
     this.roomId = this.navParams.get('roomId');
@@ -105,10 +107,13 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         this.modalController.dismiss();
       }
     };
+
+    this.ChatServiceGPR.getRoom(this.roomId).loadHistory()
+
   }
 
   ngOnInit() {
-    this.load();
+    //this.load();
     this.setStatus('online');
 
     //this.loadFiles();
diff --git a/src/app/services/chat/chat.service.ts b/src/app/services/chat/chat.service.ts
index 89c2b440f..b8e1e92c4 100644
--- a/src/app/services/chat/chat.service.ts
+++ b/src/app/services/chat/chat.service.ts
@@ -21,33 +21,41 @@ export class ChatService {
   constructor(
     private RocketChatClientService: RocketChatClientService
   ) {
-    this.getAllRoomAndSubscribe()
+
+    (async()=>{
+      await this.getAllRoom();
+      this.subscribeToRoom()
+    })()
+    
   }
 
-  async getAllRoomAndSubscribe () {
+  async getAllRoom () {
     this.loadingWholeList = true
 
     const rooms: any = await this.RocketChatClientService.getRooms();
 
     rooms.result.update.forEach((roomData:any) => {
-      let room
+      let room:RoomService;
+
       let roomId = roomData.lastMessage.rid
       if(this.isIndividual(roomData)) {
-        room = new RoomService(new RocketChatClientService(), new MessageService())
+        room = new RoomService(this.RocketChatClientService, new MessageService())
         room.setData({
           id: this.getRoomId(roomData),
           name: this.getChatName(roomData),
           lastMessage: this.getRoomLastMessage(roomData)
         })
+        room.receiveMessage()
         this.individual[roomId] = room
         this.individualCount++
       } else {
-        room = new RoomService(new RocketChatClientService(), new MessageService())
+        room = new RoomService(this.RocketChatClientService, new MessageService())
         room.setData({
           id: this.getRoomId(roomData),
           name: this.getChatName(roomData),
           lastMessage: this.getRoomLastMessage(roomData)
         })
+        room.receiveMessage()
         this.group[roomId] = room
         this.groupCount++
       }
@@ -55,7 +63,28 @@ export class ChatService {
     });
 
     this.loadingWholeList = false
-   
+  }
+
+  subscribeToRoom() {
+    for (const id in this.individual) {
+      this.RocketChatClientService.subscribe(id).then((subscription)=>{
+        console.log('subscription', subscription)
+      })
+    }
+
+    for (const id in this.group) {
+      this.RocketChatClientService.subscribe(id).then((subscription)=>{
+        console.log('subscription', subscription)
+      })
+    }
+  }
+
+  getRoom(id): RoomService {
+    try {
+      return this.individual[id]
+    } catch(e) {
+      return this.group[id]
+    }
   }
 
   getChatName(roomData) {
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index b22bacf6c..0637c7516 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -5,5 +5,9 @@ import { Injectable } from '@angular/core';
 })
 export class MessageService {
 
+  channels = []
+  mentions = []
+  msg = ''
+  rid = ''
   constructor() { }
 }
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 67a751fe9..873b3d240 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -13,21 +13,53 @@ export class RoomService {
   chatUser: ChatUserService[] = []
   id = ''
   name = ''
+  mmm = []
+  private hasLoadHistory = false
 
   constructor(
-    private RocketChatClientService: RocketChatClientService,
+    public RocketChatClientService: RocketChatClientService,
     private MessageService: MessageService
-  ) {}
+  ) {
+    
+  }
 
   setData({id, name, lastMessage}) {
+
     this.id = id
     this.name = name
     this.lastMessage = lastMessage
   }
 
+  receiveMessage() {
+    this.RocketChatClientService.receiveLiveMessageFromRoom(
+      this.id,
+      this.constructor.name+this.id,
+      (Chatmessage)=>{
+        this.hasLoadHistory = false
+        this.loadHistory()
+      }
+    )
+  }
+
+  send(msg) {
+    this.RocketChatClientService.send(this.id, msg)
+  }
+
+  // runs onces only
+  loadHistory(limit= 100) {
+
+    if(this.hasLoadHistory){ return false }
+
+    this.RocketChatClientService.loadHistory(this.id, limit).then((message:any)=>{
+      console.log('loadHistory', message)
+      this.mmm = message.result.messages.reverse()
+    })
+
+    this.hasLoadHistory = true
+  }
+
   create() {}
-  sendMessage() {}
-  deleteMessage() {}
+  deleteMessage(msgId) {}
   ReactToMessage() {}
 
 }
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index d6417db38..87f1c7930 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -209,7 +209,7 @@ import { deepFind } from 'src/plugin/deep'
    * @param key 
    * @param funx 
    */
-  receiveLiveMessageFromRoom(roomId, key, funx: Function) {
+  receiveLiveMessageFromRoom(roomId =')(', key, funx: Function) {
     
     this.ws.registerCallback({
       type:'Onmessage',
@@ -302,7 +302,6 @@ import { deepFind } from 'src/plugin/deep'
 
     },
     connect:(url)=> {
-      this.ws.connected = false
       this.wsUrl = url
       this.socket = new WebSocket(this.wsUrl);
       // bind function
@@ -333,7 +332,7 @@ import { deepFind } from 'src/plugin/deep'
     send: (message: object, requestId = uuidv4(), loginRequired) => {
   
       if (this.ws.connected == false || loginRequired == true && this.isLogin == false) { // save data to send when back online
-        console.log('save msgQueue')
+        console.log('save msgQueue this.ws.connected == false || loginRequired == true && this.isLogin == false',this.ws.connected, loginRequired, this.isLogin)
         this.wsMsgQueue.push({message, requestId, loginRequired})
       } else {
         let messageStr = JSON.stringify(message)
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 09f89ba4b..d5ac2116f 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -37,7 +37,7 @@
     </ion-refresher-content>
   </ion-refresher>
   <div class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of chatMessageStore.message[roomId]; let last = last">
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of ChatServiceGPR.getRoom(roomId).mmm; let last = last">
       <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg !=''">
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 59184d9b2..d676710f5 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -19,6 +19,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
+import { ChatService as ChatServiceGPR} from 'src/app/services/chat/chat.service'
 
 @Component({
   selector: 'app-messages',
@@ -77,27 +78,17 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     public ThemeService: ThemeService,
     private changeDetectorRef: ChangeDetectorRef,
     private router: Router,
+    public ChatServiceGPR: ChatServiceGPR
   ) {
+    
     this.loggedUser = authService.ValidatedUserChat['data'];
-
-   /*  this.dm = this.navParams.get('dm'); */
   }
   ngOnChanges(changes: SimpleChanges): void {
-    this.load();
-
-    //throw new Error('Method not implemented.');
+    this.ChatServiceGPR.getRoom(this.roomId).loadHistory()
   }
 
   ngOnInit() {
-
     this.scrollToBottom();
-
-    /* setInterval(()=>{ */
-      this.load();
-    /* }, 9000); */
-    console.log(this.roomId);
-    console.log("Chat route", this.route.url)
-
     this.setStatus('online');
   }
 
@@ -223,19 +214,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   sendMessage() {
-    let body = {
-      "message":
-      {
-        "rid": this.roomId, "msg": this.message,
-      }
-    }
-    this.chatService.sendMessage(body).subscribe(res=> {
-      this.scrollingOnce = true;
-    });
+    this.ChatServiceGPR.getRoom(this.roomId).send(this.message)
     this.message = "";
   }
 
-  deleteMessage(msgId:string){
+  deleteMessage(msgId:string) {
     let body = {
       "roomId": this.roomId,
       "msgId": msgId,
@@ -247,23 +230,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     }); */
   }
 
-  loadMessages(){
-    //this.showLoader = true;
-    const roomId = this.roomId
-    this.chatService.getRoomMessages(this.roomId).subscribe(res => {
-      console.log(res);
-      this.messages = res['messages'].reverse();
-      this.chatMessageStore.add(roomId, this.messages)
-
-      console.log(this.messages);
-      //this.serverLongPull(res)
-      /* this.chatService.subscribe(this.roomId).then(res => {
-        console.log("Real fake msg", res)
-      }); */
-      //this.showLoader = false;
-    })
-  }
-
   async viewDocument(msg:any, url?:string){
     if(msg.file.type == "application/img"){
       let response:any = await this.fileService.getFile(msg.file.guid).toPromise();
@@ -539,7 +505,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
         this.showLoader = false;
         //this.addDocGestaoDocumental();
       }
-      this.loadMessages();
 
     });
   }
@@ -555,7 +520,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
      if (res['success'] == true) {
       // Show Error
       //showMessage(response.statusText);
-      this.loadMessages()
       this.messages = res['messages'].reverse();
       this.chatMessageStore.add(roomId, this.messages)
 
@@ -567,7 +531,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       else{
         if(document.querySelector('app-messages')){
           await new Promise(resolve => setTimeout(resolve, 5000));
-          await this.serverLongPull();
+          // await this.serverLongPull();
           this.getDirectMessages.emit();
           console.log('Timer message running')
         }
@@ -580,10 +544,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     } */
   }, (error)=>{
     console.log(error);
-    this.serverLongPull();
+    // this.serverLongPull();
 
   });
-  }sliderOpts = {
+  }
+  sliderOpts = {
     zoom: false,
     slidesPerView: 1.5,
     spaceBetween: 20,

From ab2198a4120ccfd1cec385e93fd7d4b30fee15cd Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 Jan 2022 16:07:54 +0100
Subject: [PATCH 035/112] improve chat

---
 src/app/pages/chat/chat.page.ts               | 64 ++-----------------
 .../pages/chat/messages/messages.page.html    |  2 +-
 src/app/services/chat/message.service.ts      | 19 ++++++
 src/app/services/chat/room.service.ts         | 15 +++--
 .../shared/chat/messages/messages.page.html   |  2 +-
 5 files changed, 37 insertions(+), 65 deletions(-)

diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index df13a2278..712b4bddc 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -136,7 +136,9 @@ export class ChatPage implements OnInit {
         this.modalController.dismiss();
       }
     };
+    
     this.showLoader = true;
+    this.load()
   }
 
   ngOnInit() {
@@ -144,45 +146,6 @@ export class ChatPage implements OnInit {
     console.log(this.loggedUserChat);
 
     this.segment = "Contactos";
-
-    // this.authService.userData$.subscribe((res: any) => {
-    //   this.loggedUser = res;
-    //   console.log(this.loggedUser);
-    //   this.load();
-
-    //   // this.getDirectMessagesDB();
-    // });
-
-    /* websocket functions */
-    //this.sendMsg();
-
-    /* Fim websocket functions */
-    // this.hideRefreshButton();
-    // this.getChatMembers();
-
-    //Teste
-    // let t = this.showDateDuration(new Date());
-    // console.log(t);
-
-    // this.setStatus('away');
-    /* if(this.dataService.get("newGroup")){
-      this.openNewGroupPage();
-    } */
-
-    // this.router.events.forEach((event) => {
-    //   if (event instanceof NavigationStart && event.url.startsWith('/home/chat')) {
-    //     if (this.dataService.get("newGroup")) {
-    //       this.openNewGroupPage();
-    //     }
-    //     else{
-    //       this.closeAllDesktopComponents();
-    //       this.showEmptyComponent = true;
-    //     }
-    //   }
-    //   else{
-    //     this.dataService.set("newGroup", false);
-    //   }
-    // });
   }
 
   numSequence(n: number): Array<number> {
@@ -224,21 +187,6 @@ export class ChatPage implements OnInit {
     }
   }
 
-
-  /* loadMessage(){
-    this.chatService.messages.subscribe(msg => {
-      console.log("Response from websocket: " + msg);
-    });
-  } */
-  /* sendMsg() {
-    console.log("new message from client to websocket: ", this.message);
-    this.chatService.messages.next(this.message);
-    this.message.msg = "";
-  } */
-
-
-  /* Fim websockets functions */
-
   closeAllDesktopComponents() {
     this.showMessages = false;
     this.showContacts = false;
@@ -570,7 +518,7 @@ export class ChatPage implements OnInit {
           //Check if modal is opened
           if (this.segment == "Contactos" && this.showMessages != true) {
             await new Promise(resolve => setTimeout(resolve, 1000));
-            await this.getDirectMessages();
+            //await this.getDirectMessages();
             //console.log('Timer contactos list running')
           }
           else {
@@ -579,7 +527,7 @@ export class ChatPage implements OnInit {
         }
       }
       else {
-        await this.getDirectMessages();
+        //await this.getDirectMessages();
       }
     });
   }
@@ -734,12 +682,12 @@ export class ChatPage implements OnInit {
           //Check if modal is opened
           if (this.segment == "Grupos" && this.showGroupMessages != true) {
             await new Promise(resolve => setTimeout(resolve, 1000));
-            await this.getGroups();
+            //await this.getGroups();
           }
         }
       }
       else {
-        await this.getGroups();
+        //await this.getGroups();
       }
     });
   }
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index dd895bbfc..836d6ff58 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -49,7 +49,7 @@
     </ion-refresher-content>
   </ion-refresher> -->
   <div (click)="handleClick()" class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of ChatServiceGPR.getRoom(this.roomId).mmm; let last = last"
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of ChatServiceGPR.getRoom(this.roomId).massages; let last = last"
     [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId"  >
       <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)" *ngIf="msg.msg !=''">
         <div class="title">
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 0637c7516..66e228556 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -9,5 +9,24 @@ export class MessageService {
   mentions = []
   msg = ''
   rid = ''
+  ts = {}
+  u = {}
+  _id  =''
+  _updatedAt = {}
+
   constructor() { }
+
+  setData({channels, mentions, msg ,rid ,ts, u, _id, _updatedAt}) {
+    this.channels = channels
+    this.mentions = mentions
+    this.msg = msg
+    this.rid = rid
+    this.ts = ts
+    this.u = u
+    this._id = _id
+    this._updatedAt = _updatedAt
+  }
+
+  delete() {}
+
 }
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 873b3d240..2c483140d 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -7,7 +7,7 @@ import { ChatUserService } from 'src/app/services/chat/chat-user.service'
 })
 export class RoomService {
 
-  massages: {[key: string]:  MessageService} = {}
+  massages: MessageService[] = []
   lastMessage: MessageService;
 
   chatUser: ChatUserService[] = []
@@ -35,8 +35,7 @@ export class RoomService {
       this.id,
       this.constructor.name+this.id,
       (Chatmessage)=>{
-        this.hasLoadHistory = false
-        this.loadHistory()
+        this.massages.push(Chatmessage.result)
       }
     )
   }
@@ -50,9 +49,15 @@ export class RoomService {
 
     if(this.hasLoadHistory){ return false }
 
-    this.RocketChatClientService.loadHistory(this.id, limit).then((message:any)=>{
+    this.RocketChatClientService.loadHistory(this.id, limit).then((message:any) => {
       console.log('loadHistory', message)
-      this.mmm = message.result.messages.reverse()
+      
+      message.result.messages.reverse().forEach(element => {
+        const message = new MessageService()
+        message.setData(element)
+        this.massages.push(message)
+      });
+
     })
 
     this.hasLoadHistory = true
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index d5ac2116f..cf0913ab6 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -37,7 +37,7 @@
     </ion-refresher-content>
   </ion-refresher>
   <div class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of ChatServiceGPR.getRoom(roomId).mmm; let last = last">
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of ChatServiceGPR.getRoom(roomId).massages; let last = last">
       <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg !=''">
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>

From e8a13f08d93707be0152be5a9afe40fc606ff2c8 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 Jan 2022 16:09:14 +0100
Subject: [PATCH 036/112] improve

---
 src/app/pages/chat/chat.page.html     | 2 --
 src/app/services/chat/room.service.ts | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index c6dcc827c..27f9acffc 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -259,5 +259,3 @@
       </div>
   </div>
 </ion-content>
-
-
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 2c483140d..482e33dce 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -13,7 +13,6 @@ export class RoomService {
   chatUser: ChatUserService[] = []
   id = ''
   name = ''
-  mmm = []
   private hasLoadHistory = false
 
   constructor(

From 5ffcadbd40335fc31441f0176597385d5f8519b1 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 Jan 2022 16:28:59 +0100
Subject: [PATCH 037/112] add showDateDuration method

---
 src/app/services/chat/message.service.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 66e228556..47c0c09cc 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -29,4 +29,6 @@ export class MessageService {
 
   delete() {}
 
+  showDateDuration() {}
+
 }

From e79501e83cf56ddf6c8ee29d987c5e8948a69e0c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 Jan 2022 19:49:43 +0100
Subject: [PATCH 038/112] improve message

---
 src/app/home/home.page.ts             | 5 -----
 src/app/pages/chat/chat.page.html     | 2 +-
 src/app/services/chat/room.service.ts | 6 ++++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 8b28279b0..c39f473f3 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -94,11 +94,6 @@ export class HomePage implements OnInit {
     private sqliteservice: SqliteService,
     private RouteService: RouteService,
     private RocketChatClientService: RocketChatClientService) {
-
-      this.RocketChatClientService.loadHistory('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 10).then((message)=>{
-        console.log('loadHistory', message)
-      })
-
       window['jj'] =  ()=>{
         //send message                              // roomId                // Message
         this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 27f9acffc..09b092845 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -86,7 +86,7 @@
                   </div>
                 </div>
             </ion-item-sliding>
-            <ion-item-sliding *ngIf="ChatServiceGPR.loadingWholeList || ChatServiceGPR.individualCount < 1">
+            <ion-item-sliding *ngIf=" ChatServiceGPR.individualCount < 1">
                 <div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
                   <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-chat-grey.svg"></ion-icon></div>
                   <div class="item-content flex-grow-1 cursor-pointer">
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 482e33dce..d0af942f4 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -33,8 +33,10 @@ export class RoomService {
     this.RocketChatClientService.receiveLiveMessageFromRoom(
       this.id,
       this.constructor.name+this.id,
-      (Chatmessage)=>{
-        this.massages.push(Chatmessage.result)
+      (Chatmessage) => {
+        const message = new MessageService()
+        message.setData(Chatmessage.result)
+        this.massages.push(message)
       }
     )
   }

From 890048dc8731519410b1a06ad8ff8b98c508dd5a Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 Jan 2022 20:33:46 +0100
Subject: [PATCH 039/112] improve create room

---
 src/plugin/showDateDuration.js | 42 ++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 src/plugin/showDateDuration.js

diff --git a/src/plugin/showDateDuration.js b/src/plugin/showDateDuration.js
new file mode 100644
index 000000000..4e8301a3b
--- /dev/null
+++ b/src/plugin/showDateDuration.js
@@ -0,0 +1,42 @@
+
+function addZero(i) {
+  if (i < 10) {
+    i = "0" + i;
+  }
+  return i;
+}
+
+function showDateDuration(start) {
+    let end;
+    end = new Date();
+    start = new Date(start);
+    let customizedDate;
+
+
+    const totalSeconds     = Math.floor((end - (start))/1000);;
+    const totalMinutes     = Math.floor(totalSeconds/60);
+    const totalHours       = Math.floor(totalMinutes/60);
+    const totalDays        = Math.floor(totalHours/24);
+
+    const hours   = totalHours - ( totalDays * 24 );
+    const minutes = totalMinutes - ( totalDays * 24 * 60 ) - ( hours * 60 );
+    const seconds = totalSeconds - ( totalDays * 24 * 60 * 60 ) - ( hours * 60 * 60 ) - ( minutes * 60 );
+
+    if(totalDays == 0){
+      if(start.getDate() == new Date().getDate()){
+        let time = start.getHours() + ":" + addZero(start.getUTCMinutes());
+        return time;
+      }
+      else{
+        return 'Ontem';
+      }
+    }
+    else{
+      let date = addZero(start.getDate()) + "/" + addZero(start.getMonth()+1) + "/" + start.getFullYear();
+      return date;
+    }
+}
+
+module.exports = {
+    showDateDuration: showDateDuration
+};
\ No newline at end of file

From b8b4ba6a05ade56dc2c74b80d7641551ce41c15e Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 Jan 2022 20:56:21 +0100
Subject: [PATCH 040/112] improve chat

---
 src/app/home/home.page.ts             |  2 +-
 src/app/pages/chat/chat.page.html     |  2 +-
 src/app/services/chat/chat.service.ts | 25 ++++++++-----------
 src/app/services/chat/room.service.ts | 36 +++++++++++++++++++++++----
 4 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index c39f473f3..656e38716 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -94,7 +94,7 @@ export class HomePage implements OnInit {
     private sqliteservice: SqliteService,
     private RouteService: RouteService,
     private RocketChatClientService: RocketChatClientService) {
-      window['jj'] =  ()=>{
+      window['jj'] =  ()=> {
         //send message                              // roomId                // Message
         this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
       }
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 09b092845..141e2871c 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -67,7 +67,7 @@
                         </span>
                         </ion-label>
                       </div>
-                      <!-- <div class="item-date" [class.item-date-active]="dm._id == idSelected">{{showDateDuration(dm._updatedAt)}}</div> -->
+                      <div class="item-date" [class.item-date-active]="room.value.id == idSelected">{{room.value.duration}}</div>
                     </div>
                     <div *ngIf="room.value.lastMessage" class="item-description" [class.item-description-active]="room.value.id == idSelected">
                       <ion-label *ngIf="room.value.lastMessage">{{room.value.lastMessage.msg}}</ion-label>
diff --git a/src/app/services/chat/chat.service.ts b/src/app/services/chat/chat.service.ts
index b8e1e92c4..501c26195 100644
--- a/src/app/services/chat/chat.service.ts
+++ b/src/app/services/chat/chat.service.ts
@@ -36,26 +36,23 @@ export class ChatService {
 
     rooms.result.update.forEach((roomData:any) => {
       let room:RoomService;
+      
+      room = new RoomService(this.RocketChatClientService, new MessageService())
+      room.setData({
+        id: this.getRoomId(roomData),
+        name: this.getChatName(roomData),
+        lastMessage: this.getRoomLastMessage(roomData),
+        _updatedAt: roomData._updatedAt['$date']
+      })
+
+      room.receiveMessage()
 
       let roomId = roomData.lastMessage.rid
+
       if(this.isIndividual(roomData)) {
-        room = new RoomService(this.RocketChatClientService, new MessageService())
-        room.setData({
-          id: this.getRoomId(roomData),
-          name: this.getChatName(roomData),
-          lastMessage: this.getRoomLastMessage(roomData)
-        })
-        room.receiveMessage()
         this.individual[roomId] = room
         this.individualCount++
       } else {
-        room = new RoomService(this.RocketChatClientService, new MessageService())
-        room.setData({
-          id: this.getRoomId(roomData),
-          name: this.getChatName(roomData),
-          lastMessage: this.getRoomLastMessage(roomData)
-        })
-        room.receiveMessage()
         this.group[roomId] = room
         this.groupCount++
       }
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index d0af942f4..ef85e84a0 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -2,6 +2,9 @@ import { Injectable } from '@angular/core'
 import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service';
 import { MessageService } from 'src/app/services/chat/message.service'
 import { ChatUserService } from 'src/app/services/chat/chat-user.service'
+import { TimeService } from 'src/app/services/functions/time.service';
+import { ChatService } from '../chat.service';
+import { showDateDuration } from 'src/plugin/showDateDuration'
 @Injectable({
   providedIn: 'root'
 })
@@ -13,20 +16,24 @@ export class RoomService {
   chatUser: ChatUserService[] = []
   id = ''
   name = ''
+  _updatedAt = {}
   private hasLoadHistory = false
+  duration  = ''
+  
 
   constructor(
     public RocketChatClientService: RocketChatClientService,
-    private MessageService: MessageService
-  ) {
-    
-  }
+    private MessageService: MessageService,
+  ) {}
 
-  setData({id, name, lastMessage}) {
+  setData({id, name, lastMessage, _updatedAt}) {
 
     this.id = id
     this.name = name
     this.lastMessage = lastMessage
+    this._updatedAt = _updatedAt
+
+    this.calDateDuration()
   }
 
   receiveMessage() {
@@ -34,9 +41,12 @@ export class RoomService {
       this.id,
       this.constructor.name+this.id,
       (Chatmessage) => {
+
+        Chatmessage = this.fix_updatedAt(Chatmessage)
         const message = new MessageService()
         message.setData(Chatmessage.result)
         this.massages.push(message)
+        this.calDateDuration(Chatmessage.result._updatedAt)
       }
     )
   }
@@ -54,6 +64,8 @@ export class RoomService {
       console.log('loadHistory', message)
       
       message.result.messages.reverse().forEach(element => {
+        console.log('element', element)
+        element = this.fix_updatedAt(element)
         const message = new MessageService()
         message.setData(element)
         this.massages.push(message)
@@ -68,4 +80,18 @@ export class RoomService {
   deleteMessage(msgId) {}
   ReactToMessage() {}
 
+  private calDateDuration(date = null) {
+    this.duration = showDateDuration(date || this._updatedAt);
+  }
+
+
+  private fix_updatedAt(message) {
+    if(message.result) {
+      message.result._updatedAt = message.result._updatedAt['$date']
+    } else{
+      message._updatedAt = message._updatedAt['$date']
+    }
+    return message
+  }
+
 }

From d0b1401d420b574525a31f82bb4c2556c56d9e7f Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 12 Jan 2022 09:29:48 +0100
Subject: [PATCH 041/112] save

---
 src/app/home/home.page.ts                     |  6 ++--
 src/app/pages/chat/chat.page.html             |  3 ++
 src/app/pages/chat/chat.page.ts               | 15 +++++----
 src/app/services/auth.service.ts              | 29 +++++++++++++---
 src/app/services/chat.service.ts              | 33 +++++++++++++++++--
 .../socket/rocket-chat-client.service.ts      |  2 --
 src/app/services/websocket.service.ts         |  3 +-
 7 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index b3ad96634..059d8eeb4 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -95,7 +95,7 @@ export class HomePage implements OnInit {
     private RouteService: RouteService,
     private RocketChatClientService: RocketChatClientService) {
 
-      this.RocketChatClientService.loadHistory('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 10).then((message)=>{
+      /* this.RocketChatClientService.loadHistory('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 10).then((message)=>{
         console.log('loadHistory', message)
       })
 
@@ -118,12 +118,12 @@ export class HomePage implements OnInit {
         (Chatmessage)=>{
           console.log('chat', Chatmessage)
         }
-      )
+      ) */
 
 
       window['jj'] =  ()=>{
         //send message                              // roomId                // Message
-        this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
+        //this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
       }
 
     // this.RocketChatClientService.send()
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index d65c8aa73..ba5d7fbca 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -17,6 +17,9 @@
               <ion-label class="title">Chat</ion-label>
             </div>
             <div class="div-icon">
+              <button class="btn-no-color" (click)="sendMsg()">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-conversation.svg"></ion-icon>
+              </button>
               <button class="btn-no-color" (click)="openContactsPage()">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-conversation.svg"></ion-icon>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 35197cb44..483523ea8 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -31,6 +31,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { DataService } from 'src/app/services/data.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { StorageService } from 'src/app/services/storage.service';
+import { WebsocketService } from 'src/app/services/websocket.service';
 
 
 
@@ -38,6 +39,7 @@ import { StorageService } from 'src/app/services/storage.service';
   selector: 'app-chat',
   templateUrl: './chat.page.html',
   styleUrls: ['./chat.page.scss'],
+  providers: [WebsocketService, ChatService]
 })
 export class ChatPage implements OnInit {
 
@@ -123,7 +125,8 @@ export class ChatPage implements OnInit {
     private router: Router,
     private sqlservice: SqliteService,
     private platform: Platform,
-    private storageservice: StorageService
+    private storageservice: StorageService,
+    private wsService: WebsocketService,
 
   ) {
     this.loggedUserChat = authService.ValidatedUserChat['data'];
@@ -137,9 +140,9 @@ export class ChatPage implements OnInit {
 
     console.log("CHAT PAGE");
 
-    /* chatService.messages.subscribe(msg => {
+    wsService.messages.subscribe(msg => {
       console.log("Response from Websocket server: "+msg);
-    }); */
+    });
   }
 
   ngOnInit() {
@@ -157,7 +160,7 @@ export class ChatPage implements OnInit {
     });
 
     /* websocket functions */
-    this.sendMsg();
+    //this.sendMsg();
 
     /* Fim websocket functions */
     this.hideRefreshButton();
@@ -235,13 +238,13 @@ export class ChatPage implements OnInit {
 
 
   loadMessage(){
-    this.chatService.messages.subscribe(msg => {
+    this.wsService.messages.subscribe(msg => {
       console.log("Response from websocket: " + msg);
     });
   }
   sendMsg() {
     console.log("new message from client to websocket: ", this.message);
-    this.chatService.messages.next(this.message);
+    this.wsService.messages.next(this.message);
     this.message.msg = "";
     this.loadMessage();
   }
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 1ba76457a..3678eed54 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -11,6 +11,8 @@ import { SessionStore } from '../store/session.service';
 import { AESEncrypt } from '../services/aesencrypt.service';
 import { CookieService } from 'ngx-cookie-service';
 import { RocketChatClientService } from '../services/socket/rocket-chat-client.service';
+import { ChatService } from './chat.service';
+import { WebsocketService } from './websocket.service';
 
 @Injectable({
   providedIn: 'root'
@@ -20,7 +22,9 @@ export class AuthService {
   userId$ = new BehaviorSubject<any>('');
   headers: HttpHeaders;
   public ValidatedUser: UserSession;
+  public wsValidatedUserChat:any;
   public ValidatedUserChat:any;
+  public isWsAuthenticated: boolean = false;
   opts:any;
 
   constructor(
@@ -30,6 +34,7 @@ export class AuthService {
     public alertController: AlertController,
     private aesencrypt: AESEncrypt,
     private cookieService: CookieService,
+    private wsService: WebsocketService,
     private RocketChatClientService: RocketChatClientService) {
 
       this.headers = new HttpHeaders();
@@ -38,7 +43,7 @@ export class AuthService {
         this.ValidatedUser = SessionStore.user
 
         console.log('login', SessionStore.user.RochetChatUser, SessionStore.user.Password)
-        this.RocketChatClientService.connect(()=>{
+        /* this.RocketChatClientService.connect(()=>{
           this.RocketChatClientService.login({
             username: SessionStore.user.RochetChatUser,
             password: SessionStore.user.Password
@@ -47,7 +52,7 @@ export class AuthService {
           }).catch((message)=>{
             console.log('rocket chat login failed', message)
           })
-        })
+        }) */
 
       }
 
@@ -107,6 +112,22 @@ export class AuthService {
       this.ValidatedUser = null;
     }
 
+    loginWsChat(){
+      let msg = {
+        "msg": "method",
+        "method": "login",
+        "id":"42",
+        "params":[
+          {
+            "user": { "username": "paulo.pinto" },
+            "password": "tabteste@006"
+            }
+        ]
+      }
+      this.wsService.messages.next(msg);
+      this.isWsAuthenticated = true;
+    }
+
     //Login to rocketChat server
     async loginChat(user: UserForm): Promise<boolean> {
       let postData = {
@@ -115,7 +136,7 @@ export class AuthService {
       }
 
 
-      this.RocketChatClientService.connect(()=>{
+      /* this.RocketChatClientService.connect(()=>{
 
         this.RocketChatClientService.login({
           username: SessionStore.user.RochetChatUser,
@@ -127,7 +148,7 @@ export class AuthService {
         }).finally(()=>{
         })
 
-      })
+      }) */
 
 
       let responseChat = await this.httpService.post('login', postData).toPromise();
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 031e90166..08a3c26df 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -21,7 +21,7 @@ export class ChatService {
   X_Auth_Token:any;
 
   //SERVER_URL = 'wss://www.tabularium.pt/websocket';
-  public messages: Subject<any>;
+  //public messages: Subject<any>;
   loggedUserChat:any;
   bindOnMessage: any;
 
@@ -44,15 +44,42 @@ export class ChatService {
 
       console.log("CHAT SERVICE");
 
-      this.messages = <Subject<any>>this.wsService
+      wsService.messages = <Subject<any>>this.wsService
       .connect(environment.apiWsChatUrl)
       .map((response: MessageEvent): any => {
           let data = JSON.parse(response.data);
           console.log(data);
+
+          if(data.msg == 'ping'){
+            wsService.messages.next({msg:'pong'});
+            if(!this.authService.isWsAuthenticated){
+              //this.authService.loginWsChat();
+
+              let msg = {
+                "msg": "method",
+                "method": "login",
+                "id":"1",
+                "params":[
+                  {
+                    "user": { "username": "paulo.pinto" },
+                    "password": "tabteste@006"
+                    }
+                ]
+              }
+              wsService.messages.next(msg);
+              console.log('Authenticate');
+              this.authService.isWsAuthenticated = true;
+
+            }
+            //this.authService.loginWsChat();
+          }
+          if(data.id == '1'){
+            this.authService.wsValidatedUserChat = data;
+          }
           return (JSON.stringify(data));
         });
 
-        console.log(this.messages);
+        console.log(wsService.messages);
 
     }
 
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 40a2104c3..6188656f3 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -31,7 +31,6 @@ import { deepFind } from 'src/plugin/deep'
     this.ws.send(connectMessage, 'connect', false)
 
     this.ws.registerCallback({type:'Onmessage', funx:(message: any) => {
-
       if(message.msg == "ping") {
         this.ws.send({msg:"pong"},'recoonect', false)
         if(this.hasPing == false) {
@@ -40,7 +39,6 @@ import { deepFind } from 'src/plugin/deep'
           this.hasPing = true
         }
       }
-
     }})
 
   }
diff --git a/src/app/services/websocket.service.ts b/src/app/services/websocket.service.ts
index 2f527d215..5587005e2 100644
--- a/src/app/services/websocket.service.ts
+++ b/src/app/services/websocket.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import * as Rx from "rxjs/Rx";
+import { Observable, Subject } from "rxjs/Rx";
 
 @Injectable({
   providedIn: 'root'
@@ -7,7 +8,7 @@ import * as Rx from "rxjs/Rx";
 export class WebsocketService {
 
   message = '';
-  messages = [];
+  public messages: Subject<any>;
   currentUser = '';
   private subject: Rx.Subject<MessageEvent>;
 

From 5552aa484b4ce5f53dc00a063630e708613ddffa Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 11:52:05 +0100
Subject: [PATCH 042/112] improve chat

---
 src/app/home/home.page.ts                     |  6 ++++
 src/app/pages/chat/chat.page.html             |  4 +--
 src/app/pages/chat/chat.page.ts               |  4 +--
 .../pages/chat/messages/messages.page.html    |  2 +-
 src/app/pages/chat/messages/messages.page.ts  |  8 ++---
 src/app/services/auth.service.ts              |  2 ++
 src/app/services/chat/chat.service.ts         |  8 +++--
 src/app/services/chat/message.service.ts      |  3 ++
 src/app/services/chat/room.service.ts         |  5 ++-
 .../socket/rocket-chat-client.service.ts      | 35 +++++++------------
 .../shared/chat/messages/messages.page.html   |  4 +--
 src/app/shared/chat/messages/messages.page.ts |  8 ++---
 src/environments/environment.ts               |  1 +
 13 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 656e38716..0be604403 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -98,6 +98,12 @@ export class HomePage implements OnInit {
         //send message                              // roomId                // Message
         this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
       }
+
+      
+      this.RocketChatClientService.registerCallback({type:'Onmessage',requestId:'asdfasdfasdf',funx:(message)=>{
+        // console.log('message', message)
+      }})
+
     
     // this.RocketChatClientService.send()
     /* this.webNotificationPopupService.askNotificationPermission() */
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 141e2871c..24c1a9eda 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -45,7 +45,7 @@
           <ion-list *ngSwitchCase="'Contactos'">
             <ion-item-sliding>
               <div class="item item-hover width-100 d-flex ion-no-padding ion-no-margin"
-                *ngFor="let room of ChatServiceGPR.individual | keyvalue"
+                *ngFor="let room of wsChatService.individual | keyvalue"
                 [class.item-active]="room.value.id == idSelected">
                   <div class="item-icon">
                     <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
@@ -86,7 +86,7 @@
                   </div>
                 </div>
             </ion-item-sliding>
-            <ion-item-sliding *ngIf=" ChatServiceGPR.individualCount < 1">
+            <ion-item-sliding *ngIf=" wsChatService.individualCount < 1">
                 <div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
                   <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-chat-grey.svg"></ion-icon></div>
                   <div class="item-content flex-grow-1 cursor-pointer">
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 712b4bddc..aeeba0080 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -12,7 +12,7 @@ import {
 import { ModalController, Platform } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
-import { ChatService as ChatServiceGPR} from 'src/app/services/chat/chat.service'
+import { wsChatService as wsChatService} from 'src/app/services/chat/chat.service'
 import { GroupMessagesPage } from './group-messages/group-messages.page';
 import { ContactsPage } from './messages/contacts/contacts.page';
 import { MessagesPage } from './messages/messages.page';
@@ -125,7 +125,7 @@ export class ChatPage implements OnInit {
     private sqlservice: SqliteService,
     private platform: Platform,
     private storageservice: StorageService,
-    public ChatServiceGPR: ChatServiceGPR
+    public wsChatService: wsChatService
 
   ) {
 
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 836d6ff58..693f1c0cc 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -49,7 +49,7 @@
     </ion-refresher-content>
   </ion-refresher> -->
   <div (click)="handleClick()" class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of ChatServiceGPR.getRoom(this.roomId).massages; let last = last"
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatService.getRoom(this.roomId).massages; let last = last"
     [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId"  >
       <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)" *ngIf="msg.msg !=''">
         <div class="title">
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index aee83350b..9939181c0 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -28,7 +28,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { elementAt } from 'rxjs-compat/operator/elementAt';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
-import { ChatService as ChatServiceGPR} from 'src/app/services/chat/chat.service'
+import { wsChatService as wsChatService} from 'src/app/services/chat/chat.service'
 
 const IMAGE_DIR = 'stored-images';
 
@@ -96,7 +96,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private changeDetectorRef: ChangeDetectorRef,
     private platform: Platform,
     private sqlservice: SqliteService,
-    public ChatServiceGPR: ChatServiceGPR
+    public wsChatService: wsChatService
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
     this.roomId = this.navParams.get('roomId');
@@ -108,7 +108,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       }
     };
 
-    this.ChatServiceGPR.getRoom(this.roomId).loadHistory()
+    this.wsChatService.getRoom(this.roomId).loadHistory()
 
   }
 
@@ -335,8 +335,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     window.removeEventListener('scroll', this.scrollChangeCallback, true);
   }
 
-
-
   sendMessage() {
     let body = {
       "message":
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 6293231b1..27a64fa3a 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -39,6 +39,7 @@ export class AuthService {
 
         console.log('login', SessionStore.user.RochetChatUser, SessionStore.user.Password)
         this.RocketChatClientService.connect(()=>{
+          
           this.RocketChatClientService.login({
             username: SessionStore.user.RochetChatUser,
             password: SessionStore.user.Password
@@ -47,6 +48,7 @@ export class AuthService {
           }).catch((message)=>{
             console.log('rocket chat login failed', message)
           })
+
         })
 
       }
diff --git a/src/app/services/chat/chat.service.ts b/src/app/services/chat/chat.service.ts
index 501c26195..4b87fa4d7 100644
--- a/src/app/services/chat/chat.service.ts
+++ b/src/app/services/chat/chat.service.ts
@@ -7,7 +7,7 @@ import { SessionStore } from 'src/app/store/session.service';
 @Injectable({
   providedIn: 'root'
 })
-export class ChatService {
+export class wsChatService {
 
 
   individual: {[key: string]:  RoomService} = {}
@@ -23,17 +23,19 @@ export class ChatService {
   ) {
 
     (async()=>{
-      await this.getAllRoom();
+      await this.getAllRooms();
       this.subscribeToRoom()
     })()
     
   }
 
-  async getAllRoom () {
+  async getAllRooms () {
     this.loadingWholeList = true
 
     const rooms: any = await this.RocketChatClientService.getRooms();
 
+    console.log(rooms)
+
     rooms.result.update.forEach((roomData:any) => {
       let room:RoomService;
       
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 47c0c09cc..cf1b39a98 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -31,4 +31,7 @@ export class MessageService {
 
   showDateDuration() {}
 
+
+  
+
 }
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index ef85e84a0..2ce1f27b4 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -2,8 +2,6 @@ import { Injectable } from '@angular/core'
 import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service';
 import { MessageService } from 'src/app/services/chat/message.service'
 import { ChatUserService } from 'src/app/services/chat/chat-user.service'
-import { TimeService } from 'src/app/services/functions/time.service';
-import { ChatService } from '../chat.service';
 import { showDateDuration } from 'src/plugin/showDateDuration'
 @Injectable({
   providedIn: 'root'
@@ -47,6 +45,7 @@ export class RoomService {
         message.setData(Chatmessage.result)
         this.massages.push(message)
         this.calDateDuration(Chatmessage.result._updatedAt)
+
       }
     )
   }
@@ -58,7 +57,7 @@ export class RoomService {
   // runs onces only
   loadHistory(limit= 100) {
 
-    if(this.hasLoadHistory){ return false }
+    if(this.hasLoadHistory){ return false}
 
     this.RocketChatClientService.loadHistory(this.id, limit).then((message:any) => {
       console.log('loadHistory', message)
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 87f1c7930..1e19fcba0 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { v4 as uuidv4 } from 'uuid'
 import { wsCallbacksParams, msgQueue } from 'src/app/models/rochet-chat-cliente-service'
 import { deepFind } from 'src/plugin/deep'
+import { environment } from 'src/environments/environment';
 /**
  * Use this class to interact with rocketChat realtime API
  */
@@ -10,17 +11,15 @@ import { deepFind } from 'src/plugin/deep'
 })
  export class RocketChatClientService {
 
-  private hasPing = false
   private firstPingFunx: Function
   isLogin = false;
   
   constructor() {}
 
   connect(firstPingFunx: Function) {
-    this.hasPing = false
-    this.firstPingFunx = firstPingFunx
+    this.firstPingFunx = firstPingFunx // 
 
-    this.ws.connect('wss://gabinetedigitalchat.dyndns.info/websocket');
+    this.ws.connect(environment.apiWsChatUrl);
 
     const connectMessage = {
       msg: "connect",
@@ -29,19 +28,8 @@ import { deepFind } from 'src/plugin/deep'
     }
 
     this.ws.send(connectMessage, 'connect', false)
-    
-    this.ws.registerCallback({type:'Onmessage', funx:(message: any) => {
-
-      if(message.msg == "ping") {
-        this.ws.send({msg:"pong"},'recoonect', false)
-        if(this.hasPing == false) {
-          // first ping
-          firstPingFunx()
-          this.hasPing = true
-        }
-      }
-
-    }})
+    this.ws.send({msg:"pong"},'recoonect', false)
+    firstPingFunx()
 
   }
 
@@ -65,13 +53,12 @@ import { deepFind } from 'src/plugin/deep'
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
-        if(message.id == requestId || deepFind(message, 'result.id') == requestId) { // same request send
+        if(message.id == requestId ) { // same request send
           
           if(message.result.token) {
             this.isLogin = true
-            setTimeout(()=>{
-              this.ws.wsMsgQueue()
-            },0)
+
+            this.ws.wsMsgQueue()
             
             resolve(message)
           } else {
@@ -88,7 +75,7 @@ import { deepFind } from 'src/plugin/deep'
 
   }
 
-  getRooms() {
+  getRooms(roomOlder = 1480377601) {
 
     const requestId =  uuidv4()
 
@@ -281,6 +268,10 @@ import { deepFind } from 'src/plugin/deep'
 
   }
   
+  registerCallback(data:wsCallbacksParams) {
+    return this.ws.registerCallback(data)
+  }
+
   // socket class ==================================================================
   private socket!: WebSocket;
   private wsUrl = ''
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index cf0913ab6..2eb06d3eb 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="header-top">
         <div class="middle" *ngFor="let users of dmUsers">
-          <ion-label class="title">{{users.name}}</ion-label>
+          <ion-label class="title">{{ wsChatService.getRoom(roomId).name }}</ion-label>
           <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
         </div>
         <div hidden class="right">
@@ -37,7 +37,7 @@
     </ion-refresher-content>
   </ion-refresher>
   <div class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of ChatServiceGPR.getRoom(roomId).massages; let last = last">
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatService.getRoom(roomId).massages; let last = last">
       <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg !=''">
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index d676710f5..bfae00cb9 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -19,7 +19,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
-import { ChatService as ChatServiceGPR} from 'src/app/services/chat/chat.service'
+import { wsChatService as wsChatService} from 'src/app/services/chat/chat.service'
 
 @Component({
   selector: 'app-messages',
@@ -78,13 +78,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     public ThemeService: ThemeService,
     private changeDetectorRef: ChangeDetectorRef,
     private router: Router,
-    public ChatServiceGPR: ChatServiceGPR
+    public wsChatService: wsChatService
   ) {
     
     this.loggedUser = authService.ValidatedUserChat['data'];
   }
   ngOnChanges(changes: SimpleChanges): void {
-    this.ChatServiceGPR.getRoom(this.roomId).loadHistory()
+    this.wsChatService.getRoom(this.roomId).loadHistory()
   }
 
   ngOnInit() {
@@ -214,7 +214,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   sendMessage() {
-    this.ChatServiceGPR.getRoom(this.roomId).send(this.message)
+    this.wsChatService.getRoom(this.roomId).send(this.message)
     this.message = "";
   }
 
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index a7de6b222..37e513724 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -7,6 +7,7 @@ export const environment = {
   apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
   //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
   apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
+  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
   //apiChatUrl: 'https://www.tabularium.pt/api/v1/',
   /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
   domain: 'gabinetedigital.local', //gabinetedigital.local

From 2d7aea07458fd454e3f911cdbdb7039e7c493e93 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 12:04:28 +0100
Subject: [PATCH 043/112] improve loader

---
 src/app/pages/chat/chat.page.html | 2 +-
 src/app/pages/chat/chat.page.ts   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 24c1a9eda..5d61fdc88 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -4,7 +4,7 @@
 
 <ion-content class="height-100 container-wrapper">
   <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="wsChatService.loadingWholeList"></ion-progress-bar>
     <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index aeeba0080..b8f7cb9fd 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -126,7 +126,6 @@ export class ChatPage implements OnInit {
     private platform: Platform,
     private storageservice: StorageService,
     public wsChatService: wsChatService
-
   ) {
 
     this.loggedUserChat = authService.ValidatedUserChat['data'];

From 2f0935b0d3adedc8664f2b7959e3d54afe01518f Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 12:07:36 +0100
Subject: [PATCH 044/112] fix

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

diff --git a/src/app/services/chat/chat.service.spec.ts b/src/app/services/chat/chat.service.spec.ts
index 4d8abdfc0..8cb3b6ba3 100644
--- a/src/app/services/chat/chat.service.spec.ts
+++ b/src/app/services/chat/chat.service.spec.ts
@@ -1,13 +1,13 @@
 import { TestBed } from '@angular/core/testing';
 
-import { ChatService } from './chat.service';
+import { wsChatService } from './chat.service';
 
 describe('ChatService', () => {
-  let service: ChatService;
+  let service: wsChatService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({});
-    service = TestBed.inject(ChatService);
+    service = TestBed.inject(wsChatService);
   });
 
   it('should be created', () => {

From 45284fc1a667acf977ab77cb00b2816be8611153 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 12:44:51 +0100
Subject: [PATCH 045/112] improve

---
 src/app/home/home.page.ts                     |  15 +-
 src/app/pages/chat/chat.page.html             |   6 +-
 src/app/pages/chat/chat.page.ts               |   4 +-
 .../pages/chat/messages/messages.page.html    |   2 +-
 src/app/pages/chat/messages/messages.page.ts  |   6 +-
 src/app/services/auth.service.ts              |  13 +-
 src/app/services/chat/chat.service.spec.ts    |   6 +-
 src/app/services/chat/chat.service.ts         |  30 +--
 src/app/services/chat/room.service.ts         |  10 +-
 .../chat/ws-chat-methods.service.spec.ts      |  16 ++
 .../services/chat/ws-chat-methods.service.ts  | 116 ++++++++++
 .../ws-chat.service.spec.ts}                  |   8 +-
 .../ws-chat.service.ts}                       |  14 +-
 .../socket/rocket-chat-client.service.spec.ts |  16 --
 src/app/services/socket/synchro.service.ts    | 215 ------------------
 .../shared/chat/messages/messages.page.html   |   4 +-
 src/app/shared/chat/messages/messages.page.ts |   8 +-
 17 files changed, 187 insertions(+), 302 deletions(-)
 create mode 100644 src/app/services/chat/ws-chat-methods.service.spec.ts
 create mode 100644 src/app/services/chat/ws-chat-methods.service.ts
 rename src/app/services/{socket/synchro.service.spec.ts => chat/ws-chat.service.spec.ts} (54%)
 rename src/app/services/{socket/rocket-chat-client.service.ts => chat/ws-chat.service.ts} (98%)
 delete mode 100644 src/app/services/socket/rocket-chat-client.service.spec.ts
 delete mode 100644 src/app/services/socket/synchro.service.ts

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 31c9647c1..1a4abe39b 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -26,7 +26,7 @@ import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { Device } from '@capacitor/device';
 import { RouteService } from 'src/app/services/route.service';
-import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service';
+import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 import { environment } from 'src/environments/environment';
 import { v4 as uuidv4 } from 'uuid'
 
@@ -100,19 +100,8 @@ export class HomePage implements OnInit {
     private screenOrientation: ScreenOrientation,
     private sqliteservice: SqliteService,
     private RouteService: RouteService,
-    private RocketChatClientService: RocketChatClientService) {
-      window['jj'] =  ()=> {
-        //send message                              // roomId                // Message
-        this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
-      }
+    private WsChatService: WsChatService) {
 
-      
-      this.RocketChatClientService.registerCallback({type:'Onmessage',requestId:'asdfasdfasdf',funx:(message)=>{
-        // console.log('message', message)
-      }})
-
-    
-    // this.RocketChatClientService.send()
     /* this.webNotificationPopupService.askNotificationPermission() */
 
     this.router.events.subscribe((val) => {
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 5d61fdc88..aec57d9d4 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -4,7 +4,7 @@
 
 <ion-content class="height-100 container-wrapper">
   <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-    <ion-progress-bar type="indeterminate" *ngIf="wsChatService.loadingWholeList"></ion-progress-bar>
+    <ion-progress-bar type="indeterminate" *ngIf="wsChatMethodsService.loadingWholeList"></ion-progress-bar>
     <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
@@ -45,7 +45,7 @@
           <ion-list *ngSwitchCase="'Contactos'">
             <ion-item-sliding>
               <div class="item item-hover width-100 d-flex ion-no-padding ion-no-margin"
-                *ngFor="let room of wsChatService.individual | keyvalue"
+                *ngFor="let room of wsChatMethodsService.dm | keyvalue"
                 [class.item-active]="room.value.id == idSelected">
                   <div class="item-icon">
                     <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
@@ -86,7 +86,7 @@
                   </div>
                 </div>
             </ion-item-sliding>
-            <ion-item-sliding *ngIf=" wsChatService.individualCount < 1">
+            <ion-item-sliding *ngIf=" wsChatMethodsService.dmCount < 1">
                 <div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
                   <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-chat-grey.svg"></ion-icon></div>
                   <div class="item-content flex-grow-1 cursor-pointer">
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index b8f7cb9fd..07cfffcf0 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -12,7 +12,7 @@ import {
 import { ModalController, Platform } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
-import { wsChatService as wsChatService} from 'src/app/services/chat/chat.service'
+import { wsChatMethodsService as wsChatMethodsService} from 'src/app/services/chat/chat.service'
 import { GroupMessagesPage } from './group-messages/group-messages.page';
 import { ContactsPage } from './messages/contacts/contacts.page';
 import { MessagesPage } from './messages/messages.page';
@@ -125,7 +125,7 @@ export class ChatPage implements OnInit {
     private sqlservice: SqliteService,
     private platform: Platform,
     private storageservice: StorageService,
-    public wsChatService: wsChatService
+    public wsChatMethodsService: wsChatMethodsService
   ) {
 
     this.loggedUserChat = authService.ValidatedUserChat['data'];
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 1cf59303b..f589e9f12 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -49,7 +49,7 @@
     </ion-refresher-content>
   </ion-refresher> -->
   <div (click)="handleClick()" class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatService.getRoom(this.roomId).massages; let last = last"
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getRoom(this.roomId).massages; let last = last"
     [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId"  >
       <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)" *ngIf="msg.msg !=''">
         <div class="title">
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index f240b6fe9..34bf21e39 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -28,7 +28,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { elementAt } from 'rxjs-compat/operator/elementAt';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
-import { wsChatService as wsChatService} from 'src/app/services/chat/chat.service'
+import { wsChatMethodsService } from 'src/app/services/chat/chat.service'
 
 const IMAGE_DIR = 'stored-images';
 
@@ -96,7 +96,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private changeDetectorRef: ChangeDetectorRef,
     private platform: Platform,
     private sqlservice: SqliteService,
-    public wsChatService: wsChatService
+    public wsChatMethodsService: wsChatMethodsService
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
     this.roomId = this.navParams.get('roomId');
@@ -108,7 +108,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       }
     };
 
-    this.wsChatService.getRoom(this.roomId).loadHistory()
+    this.wsChatMethodsService.getRoom(this.roomId).loadHistory()
 
   }
 
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 27a64fa3a..1e42b2737 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -10,8 +10,7 @@ import { AlertController } from '@ionic/angular';
 import { SessionStore } from '../store/session.service';
 import { AESEncrypt } from '../services/aesencrypt.service';
 import { CookieService } from 'ngx-cookie-service';
-import { RocketChatClientService } from '../services/socket/rocket-chat-client.service';
-
+import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 @Injectable({
   providedIn: 'root'
 })
@@ -30,7 +29,7 @@ export class AuthService {
     public alertController: AlertController,
     private aesencrypt: AESEncrypt,
     private cookieService: CookieService,
-    private RocketChatClientService: RocketChatClientService) {
+    private WsChatService: WsChatService) {
 
       this.headers = new HttpHeaders();
 
@@ -38,9 +37,9 @@ export class AuthService {
         this.ValidatedUser = SessionStore.user
 
         console.log('login', SessionStore.user.RochetChatUser, SessionStore.user.Password)
-        this.RocketChatClientService.connect(()=>{
+        this.WsChatService.connect(()=>{
           
-          this.RocketChatClientService.login({
+          this.WsChatService.login({
             username: SessionStore.user.RochetChatUser,
             password: SessionStore.user.Password
           }).then((message) => {
@@ -117,9 +116,9 @@ export class AuthService {
       }
 
 
-      this.RocketChatClientService.connect(()=>{
+      this.WsChatService.connect(()=>{
 
-        this.RocketChatClientService.login({
+        this.WsChatService.login({
           username: SessionStore.user.RochetChatUser,
           password: user.password
         }).then((message) => {
diff --git a/src/app/services/chat/chat.service.spec.ts b/src/app/services/chat/chat.service.spec.ts
index 8cb3b6ba3..760f446a5 100644
--- a/src/app/services/chat/chat.service.spec.ts
+++ b/src/app/services/chat/chat.service.spec.ts
@@ -1,13 +1,13 @@
 import { TestBed } from '@angular/core/testing';
 
-import { wsChatService } from './chat.service';
+import { wsChatMethodsService } from './chat.service';
 
 describe('ChatService', () => {
-  let service: wsChatService;
+  let service: wsChatMethodsService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({});
-    service = TestBed.inject(wsChatService);
+    service = TestBed.inject(wsChatMethodsService);
   });
 
   it('should be created', () => {
diff --git a/src/app/services/chat/chat.service.ts b/src/app/services/chat/chat.service.ts
index 4b87fa4d7..521906bda 100644
--- a/src/app/services/chat/chat.service.ts
+++ b/src/app/services/chat/chat.service.ts
@@ -1,25 +1,25 @@
 import { Injectable } from '@angular/core';
 import { RoomService } from './room.service';
-import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service';
+import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 import { MessageService } from 'src/app/services/chat/message.service'
 import { SessionStore } from 'src/app/store/session.service';
 
 @Injectable({
   providedIn: 'root'
 })
-export class wsChatService {
+export class wsChatMethodsService {
 
 
-  individual: {[key: string]:  RoomService} = {}
+  dm: {[key: string]:  RoomService} = {}
   group: {[key: string]:  RoomService} = {}
 
   loadingWholeList = false
 
-  individualCount = 0;
+  dmCount = 0;
   groupCount = 0;
   
   constructor(
-    private RocketChatClientService: RocketChatClientService
+    private WsChatService: WsChatService
   ) {
 
     (async()=>{
@@ -32,17 +32,17 @@ export class wsChatService {
   async getAllRooms () {
     this.loadingWholeList = true
 
-    const rooms: any = await this.RocketChatClientService.getRooms();
+    const rooms: any = await this.WsChatService.getRooms();
 
     console.log(rooms)
 
     rooms.result.update.forEach((roomData:any) => {
       let room:RoomService;
       
-      room = new RoomService(this.RocketChatClientService, new MessageService())
+      room = new RoomService(this.WsChatService, new MessageService())
       room.setData({
         id: this.getRoomId(roomData),
-        name: this.getChatName(roomData),
+        name: this.getRoomName(roomData),
         lastMessage: this.getRoomLastMessage(roomData),
         _updatedAt: roomData._updatedAt['$date']
       })
@@ -52,8 +52,8 @@ export class wsChatService {
       let roomId = roomData.lastMessage.rid
 
       if(this.isIndividual(roomData)) {
-        this.individual[roomId] = room
-        this.individualCount++
+        this.dm[roomId] = room
+        this.dmCount++
       } else {
         this.group[roomId] = room
         this.groupCount++
@@ -65,14 +65,14 @@ export class wsChatService {
   }
 
   subscribeToRoom() {
-    for (const id in this.individual) {
-      this.RocketChatClientService.subscribe(id).then((subscription)=>{
+    for (const id in this.dm) {
+      this.WsChatService.subscribeNotifyRoom(id).then((subscription)=>{
         console.log('subscription', subscription)
       })
     }
 
     for (const id in this.group) {
-      this.RocketChatClientService.subscribe(id).then((subscription)=>{
+      this.WsChatService.subscribeNotifyRoom(id).then((subscription)=>{
         console.log('subscription', subscription)
       })
     }
@@ -80,13 +80,13 @@ export class wsChatService {
 
   getRoom(id): RoomService {
     try {
-      return this.individual[id]
+      return this.dm[id]
     } catch(e) {
       return this.group[id]
     }
   }
 
-  getChatName(roomData) {
+  getRoomName(roomData) {
     if(this.isIndividual(roomData)) {
       const names: String[] = roomData.usernames
       const roomName = names.filter((name)=>{
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 2ce1f27b4..54fc6222d 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service';
+import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 import { MessageService } from 'src/app/services/chat/message.service'
 import { ChatUserService } from 'src/app/services/chat/chat-user.service'
 import { showDateDuration } from 'src/plugin/showDateDuration'
@@ -20,7 +20,7 @@ export class RoomService {
   
 
   constructor(
-    public RocketChatClientService: RocketChatClientService,
+    public WsChatService: WsChatService,
     private MessageService: MessageService,
   ) {}
 
@@ -35,7 +35,7 @@ export class RoomService {
   }
 
   receiveMessage() {
-    this.RocketChatClientService.receiveLiveMessageFromRoom(
+    this.WsChatService.receiveLiveMessageFromRoom(
       this.id,
       this.constructor.name+this.id,
       (Chatmessage) => {
@@ -51,7 +51,7 @@ export class RoomService {
   }
 
   send(msg) {
-    this.RocketChatClientService.send(this.id, msg)
+    this.WsChatService.send(this.id, msg)
   }
 
   // runs onces only
@@ -59,7 +59,7 @@ export class RoomService {
 
     if(this.hasLoadHistory){ return false}
 
-    this.RocketChatClientService.loadHistory(this.id, limit).then((message:any) => {
+    this.WsChatService.loadHistory(this.id, limit).then((message:any) => {
       console.log('loadHistory', message)
       
       message.result.messages.reverse().forEach(element => {
diff --git a/src/app/services/chat/ws-chat-methods.service.spec.ts b/src/app/services/chat/ws-chat-methods.service.spec.ts
new file mode 100644
index 000000000..c10e87b7b
--- /dev/null
+++ b/src/app/services/chat/ws-chat-methods.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { WsChatMethodsService } from './ws-chat-methods.service';
+
+describe('WsChatMethodsService', () => {
+  let service: WsChatMethodsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(WsChatMethodsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
new file mode 100644
index 000000000..670e78983
--- /dev/null
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -0,0 +1,116 @@
+import { Injectable } from '@angular/core';
+import { RoomService } from './room.service';
+import { WsChatService } from 'src/app/services/chat/ws-chat.service';
+import { MessageService } from 'src/app/services/chat/message.service'
+import { SessionStore } from 'src/app/store/session.service';
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class WsChatMethodsService {
+
+
+
+  dm: {[key: string]:  RoomService} = {}
+  group: {[key: string]:  RoomService} = {}
+
+  loadingWholeList = false
+
+  dmCount = 0;
+  groupCount = 0;
+  
+  constructor(
+    private WsChatService: WsChatService
+  ) {
+
+    (async()=>{
+      await this.getAllRooms();
+      this.subscribeToRoom()
+    })()
+    
+  }
+
+  async getAllRooms () {
+    this.loadingWholeList = true
+
+    const rooms: any = await this.WsChatService.getRooms();
+
+    console.log(rooms)
+
+    rooms.result.update.forEach((roomData:any) => {
+      let room:RoomService;
+      
+      room = new RoomService(this.WsChatService, new MessageService())
+      room.setData({
+        id: this.getRoomId(roomData),
+        name: this.getRoomName(roomData),
+        lastMessage: this.getRoomLastMessage(roomData),
+        _updatedAt: roomData._updatedAt['$date']
+      })
+
+      room.receiveMessage()
+
+      let roomId = roomData.lastMessage.rid
+
+      if(this.isIndividual(roomData)) {
+        this.dm[roomId] = room
+        this.dmCount++
+      } else {
+        this.group[roomId] = room
+        this.groupCount++
+      }
+      
+    });
+
+    this.loadingWholeList = false
+  }
+
+  subscribeToRoom() {
+    for (const id in this.dm) {
+      this.WsChatService.subscribeNotifyRoom(id).then((subscription)=>{
+        console.log('subscription', subscription)
+      })
+    }
+
+    for (const id in this.group) {
+      this.WsChatService.subscribeNotifyRoom(id).then((subscription)=>{
+        console.log('subscription', subscription)
+      })
+    }
+  }
+
+  getRoom(id): RoomService {
+    try {
+      return this.dm[id]
+    } catch(e) {
+      return this.group[id]
+    }
+  }
+
+  getRoomName(roomData) {
+    if(this.isIndividual(roomData)) {
+      const names: String[] = roomData.usernames
+      const roomName = names.filter((name)=>{
+        return name != SessionStore.user.RochetChatUser
+      })[0]
+
+      return roomName
+    } else {
+      return roomData.fName
+    }
+  }
+
+  getRoomId(roomData) {
+    return roomData.lastMessage.rid
+  }
+
+  getRoomLastMessage(roomData) {
+    return roomData.lastMessage
+  }
+
+  private isIndividual(roomData) {
+    return !roomData.fname
+  }
+
+}
diff --git a/src/app/services/socket/synchro.service.spec.ts b/src/app/services/chat/ws-chat.service.spec.ts
similarity index 54%
rename from src/app/services/socket/synchro.service.spec.ts
rename to src/app/services/chat/ws-chat.service.spec.ts
index 61f099398..c909a0da0 100644
--- a/src/app/services/socket/synchro.service.spec.ts
+++ b/src/app/services/chat/ws-chat.service.spec.ts
@@ -1,13 +1,13 @@
 import { TestBed } from '@angular/core/testing';
 
-import { SynchroService } from './synchro.service';
+import { WsChatService } from './ws-chat.service';
 
-describe('SynchroService', () => {
-  let service: SynchroService;
+describe('WsChatService', () => {
+  let service: WsChatService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({});
-    service = TestBed.inject(SynchroService);
+    service = TestBed.inject(WsChatService);
   });
 
   it('should be created', () => {
diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/chat/ws-chat.service.ts
similarity index 98%
rename from src/app/services/socket/rocket-chat-client.service.ts
rename to src/app/services/chat/ws-chat.service.ts
index 1e19fcba0..237862fe6 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -3,13 +3,11 @@ import { v4 as uuidv4 } from 'uuid'
 import { wsCallbacksParams, msgQueue } from 'src/app/models/rochet-chat-cliente-service'
 import { deepFind } from 'src/plugin/deep'
 import { environment } from 'src/environments/environment';
-/**
- * Use this class to interact with rocketChat realtime API
- */
- @Injectable({
+@Injectable({
   providedIn: 'root'
 })
- export class RocketChatClientService {
+export class WsChatService {
+
 
   private firstPingFunx: Function
   isLogin = false;
@@ -164,7 +162,7 @@ import { environment } from 'src/environments/environment';
     });
   }
 
-  subscribe(roomId : string) {
+  subscribeNotifyRoom(roomId : string) {
 
     const requestId =  uuidv4()
     
@@ -362,6 +360,4 @@ import { environment } from 'src/environments/environment';
       console.log(`[error] ${event.message}`);
     }
 
-  }
-
-}
\ No newline at end of file
+  }}
diff --git a/src/app/services/socket/rocket-chat-client.service.spec.ts b/src/app/services/socket/rocket-chat-client.service.spec.ts
deleted file mode 100644
index 474d7913d..000000000
--- a/src/app/services/socket/rocket-chat-client.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { RocketChatClientService } from './rocket-chat-client.service';
-
-describe('RocketChatClientService', () => {
-  let service: RocketChatClientService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(RocketChatClientService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/services/socket/synchro.service.ts b/src/app/services/socket/synchro.service.ts
deleted file mode 100644
index 7f5cd2994..000000000
--- a/src/app/services/socket/synchro.service.ts
+++ /dev/null
@@ -1,215 +0,0 @@
-import { Injectable } from '@angular/core';
-import { SessionStore } from 'src/app/store/session.service';
-import { v4 as uuidv4 } from 'uuid'
-import { BackgroundService } from '../background.service';
-import { environment } from 'src/environments/environment';
-import { EventTrigger } from '../eventTrigger.service'
-
-export interface wss {
-
-  url: string,
-  type: 'reflect' | 'emit'
-  header: {
-    id: string
-    bluePrint: string,
-    jwt: string
-  }
-
-}
-
-@Injectable({
-  providedIn: 'root'
-})
-class SynchroService {
- /*  [x: string]: any;
-
-  private connection!: WebSocket;
-  private id: string = uuidv4();
-  public conected = false
-  private url: string = ''
-  callback = function () { }
-  private _connected = false;
-  private eventtrigger: EventTrigger;
-  private BackgroundService = new BackgroundService()
-  callBacks: {
-    type: 'Offline' | 'Online' | 'Onmessage' | 'Chat' | 'Notification' | 'Notifications' | '',
-    object?: string
-    funx: Function
-  }[] = []
-  private msgQueue = []
-
-  constructor() {
-    // alert(SessionStore.user.FullName)
-  }
-
-  get connected() {
-    return this._connected
-  }
-
-  setUrl() {
-
-    let header = {
-      id: '1234',
-      bluePrint: '12312123',
-      jwt: uuidv4()
-    }
-
-    let wss: wss = {
-      header,
-      url: 'wss://sychro-offline.herokuapp.com/ws/some_url/',
-      type: 'reflect'
-    }
-
-    this.url = `${wss.url}${wss.header.id}/${wss.header.jwt}/${wss.header.bluePrint}/${this.id}/`
-  }
-
-  registerCallback(type: 'Offline' | 'Online' | 'Onmessage' | 'Chat' | 'Notifications' | 'Notification', funx: Function, object = '') {
-    this.callBacks.push({
-      type,
-      funx,
-      object
-    })
-  }
-
-  connect() {
-
-    this.connection = new WebSocket(this.url);
-    // bind function
-    this.connection.onopen = this.onopen;
-    this.connection.onmessage = this.onmessage;
-    this.connection.onclose = this.onclose;
-    this.connection.onerror = this.onerror;
-  }
-
-  private onopen = () => {
-
-
-
-    //if (this._connected === true) {
-      //this.BackgroundService.online()
-      console.log('Online', this._connected)
-      this.callBacks.forEach((e) => {
-        if (e.type == 'Online') {
-          e.funx()
-        }
-      })
-    //}
-
-    console.log('open ======================= welcome to socket server')
-
-    this._connected = true
-
-    // send all saved data due to internet connection
-    this.msgQueue.forEach((item, index, object) => {
-      this.$send(item);
-      object.splice(index, 1);
-    })
-
-  }
-
-  public $send(object: any) {
-
-    if (!this._connected) { // save data to send when back online
-      this.msgQueue.push(object)
-    }
-
-    let payload = {
-      message: JSON.stringify(object) || '{"person.adress.country":"1Angola"}',
-      username: SessionStore.user.FullName,
-      idConnection: this.id
-    }
-
-
-    let sendData = JSON.stringify(payload);
-    console.log(sendData)
-
-    this.connection.send(sendData);
-  }
-
-  private onmessage = async (event: any) => {
-
-
-    let data = JSON.parse(event.data)
-    let payload = JSON.parse(data.message)
-    payload.message = JSON.parse(payload.message)
-    const idConnection = payload.idConnection
-    const username = payload.username
-
-    if (idConnection != this.id) {
-
-      if (window['platform'].is('desktop') || this.platform.is('mobileweb')) { }
-      else return false
-
-      if (environment.production) return false
-
-      this.callBacks.forEach((e) => {
-
-        if (payload.message[0]) {
-          if (payload.message[0].Service && payload.message[0].Object && payload.message[0].IdObject) {
-            if (e.type == '' && !e.object) {
-              if (username == SessionStore.user.FullName) {
-                e.funx(payload.message, data)
-              }
-            }
-
-            if (e.type == 'Notifications') {
-              e.funx(payload.message, data)
-            }
-
-          }
-        } else if (payload.message.Service && payload.message.Object && payload.message.IdObject) {
-          if (e.type == 'Notification' && e.object == payload.message.Object || e.type == 'Notification' && e.object == 'any') {
-            e.funx(payload.message, data)
-          }
-        }
-
-      })
-
-    }
-    this.callback()
-  }
-
-  private onclose = (event: any) => {
-    console.log('Websocket close')
-    setTimeout(() => {
-      if (event.wasClean) {
-        console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
-      } else {
-        // e.g. server process killed or network down
-        // event.code is usually 1006 in this case
-        console.log('[close] Connection died');
-        console.log('Reconnect')
-
-
-
-       // if (this._connected === false) {
-         // this.BackgroundService.offline();
-          console.log('Offline', this._connected)
-          this.callBacks.forEach((e) => {
-            if (e.type == 'Offline') {
-              e.funx()
-            }
-          })
-        //}
-
-
-        // status
-        this._connected = false
-        // reconnect
-        this.connect()
-
-      }
-    }, 100);
-  }
-
-  private onerror = (event: any) => {
-    console.log(`[error] ${event.message}`);
-  } */
-}
-
-
-/* export const synchro = new SynchroService()
-synchro.setUrl()
-synchro.connect()
-
-window['synchro'] = synchro */
\ No newline at end of file
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index d48e1075b..df633ae84 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="header-top">
         <div class="middle" *ngFor="let users of dmUsers">
-          <ion-label class="title">{{ wsChatService.getRoom(roomId).name }}</ion-label>
+          <ion-label class="title">{{ wsChatMethodsService.getRoom(roomId).name }}</ion-label>
           <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
         </div>
         <div hidden class="right">
@@ -37,7 +37,7 @@
     </ion-refresher-content>
   </ion-refresher>
   <div class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatService.getRoom(roomId).massages; let last = last">
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getRoom(roomId).massages; let last = last">
       <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg !=''">
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index bfae00cb9..cc9bcc4e9 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -19,7 +19,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
-import { wsChatService as wsChatService} from 'src/app/services/chat/chat.service'
+import { wsChatMethodsService as wsChatMethodsService} from 'src/app/services/chat/chat.service'
 
 @Component({
   selector: 'app-messages',
@@ -78,13 +78,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     public ThemeService: ThemeService,
     private changeDetectorRef: ChangeDetectorRef,
     private router: Router,
-    public wsChatService: wsChatService
+    public wsChatMethodsService: wsChatMethodsService
   ) {
     
     this.loggedUser = authService.ValidatedUserChat['data'];
   }
   ngOnChanges(changes: SimpleChanges): void {
-    this.wsChatService.getRoom(this.roomId).loadHistory()
+    this.wsChatMethodsService.getRoom(this.roomId).loadHistory()
   }
 
   ngOnInit() {
@@ -214,7 +214,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   sendMessage() {
-    this.wsChatService.getRoom(this.roomId).send(this.message)
+    this.wsChatMethodsService.getRoom(this.roomId).send(this.message)
     this.message = "";
   }
 

From 8aec66bcaf8edbb3b05eb4e5be71b459860a5ff5 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 13:47:17 +0100
Subject: [PATCH 046/112] reconnect

---
 src/app/services/auth.service.ts         | 33 +++++++-----------------
 src/app/services/chat/ws-chat.service.ts | 31 ++++++++++------------
 2 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 1e42b2737..84982676f 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -37,17 +37,11 @@ export class AuthService {
         this.ValidatedUser = SessionStore.user
 
         console.log('login', SessionStore.user.RochetChatUser, SessionStore.user.Password)
-        this.WsChatService.connect(()=>{
-          
-          this.WsChatService.login({
-            username: SessionStore.user.RochetChatUser,
-            password: SessionStore.user.Password
-          }).then((message) => {
-            console.log('rocket chat login successfully', message)
-          }).catch((message)=>{
-            console.log('rocket chat login failed', message)
-          })
-
+        this.WsChatService.connect();
+        this.WsChatService.login().then((message) => {
+          console.log('rocket chat login successfully', message)
+        }).catch((message)=>{
+          console.log('rocket chat login failed', message)
         })
 
       }
@@ -116,18 +110,11 @@ export class AuthService {
       }
 
 
-      this.WsChatService.connect(()=>{
-
-        this.WsChatService.login({
-          username: SessionStore.user.RochetChatUser,
-          password: user.password
-        }).then((message) => {
-          console.log('rocket chat login successfully', message)
-        }).catch((message)=>{
-          console.log('rocket chat login failed', message)
-        }).finally(()=>{
-        })  
-  
+      this.WsChatService.connect();
+      this.WsChatService.login().then((message) => {
+        console.log('rocket chat login successfully', message)
+      }).catch((message)=>{
+        console.log('rocket chat login failed', message)
       })
 
 
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 237862fe6..76639409a 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -3,21 +3,20 @@ import { v4 as uuidv4 } from 'uuid'
 import { wsCallbacksParams, msgQueue } from 'src/app/models/rochet-chat-cliente-service'
 import { deepFind } from 'src/plugin/deep'
 import { environment } from 'src/environments/environment';
+import { SessionStore } from 'src/app/store/session.service';
+
 @Injectable({
   providedIn: 'root'
 })
 export class WsChatService {
 
-
-  private firstPingFunx: Function
   isLogin = false;
   
   constructor() {}
 
-  connect(firstPingFunx: Function) {
-    this.firstPingFunx = firstPingFunx // 
+  connect() {
 
-    this.ws.connect(environment.apiWsChatUrl);
+    this.ws.connect();
 
     const connectMessage = {
       msg: "connect",
@@ -27,14 +26,10 @@ export class WsChatService {
 
     this.ws.send(connectMessage, 'connect', false)
     this.ws.send({msg:"pong"},'recoonect', false)
-    firstPingFunx()
-
   }
 
-  login(user) {
-
+  login() {
     const requestId =  uuidv4()
-    this.isLogin = false
 
     const loginRequest = {
       msg: "method",
@@ -42,8 +37,8 @@ export class WsChatService {
       id: requestId,
       params: [
         {
-          user: { username: user.username },
-          password: user.password
+          user: { username: SessionStore.user.RochetChatUser },
+          password: SessionStore.user.Password
         }
       ]
     }
@@ -52,6 +47,7 @@ export class WsChatService {
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
         if(message.id == requestId ) { // same request send
+          console.log('message login', message)
           
           if(message.result.token) {
             this.isLogin = true
@@ -290,9 +286,8 @@ export class WsChatService {
       }
 
     },
-    connect:(url)=> {
-      this.wsUrl = url
-      this.socket = new WebSocket(this.wsUrl);
+    connect:()=> {
+      this.socket = new WebSocket(environment.apiWsChatUrl);
       // bind function
       this.socket.onopen = this.ws.onopen;
       this.socket.onmessage = this.ws.onmessage;
@@ -302,6 +297,7 @@ export class WsChatService {
     onopen:()=> {
       this.ws.connected = true
       console.log('================== welcome to socket server =====================')
+      
       this.ws.wsMsgQueue()
     },
     wsMsgQueue:()=> {
@@ -350,8 +346,9 @@ export class WsChatService {
     
     onclose:(event: any)=> {
 
-      this.connect(this.firstPingFunx())
-
+      this.connect()
+      this.login()
+      
       this.ws.connected = false
       console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
     },

From 7f8c7c636064fe3c30255b0ebf3e98e1d15e5957 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 14:02:43 +0100
Subject: [PATCH 047/112] improve

---
 src/app/services/chat/ws-chat.service.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 76639409a..166e58b5a 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -46,10 +46,12 @@ export class WsChatService {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
+        console.log('message login', message)
         if(message.id == requestId ) { // same request send
           console.log('message login', message)
           
           if(message.result.token) {
+            console.log('this.isLogin = true')
             this.isLogin = true
 
             this.ws.wsMsgQueue()

From e2e3067bf5f17fb699606a297c3db658306dd6c9 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 12 Jan 2022 14:48:17 +0100
Subject: [PATCH 048/112] save

---
 src/app/pages/chat/chat.page.html             |  45 ++++---
 src/app/pages/chat/chat.page.ts               |   4 +-
 src/app/pages/chat/messages/messages.page.ts  |   4 +-
 src/app/services/chat.service.ts              |   4 +-
 src/app/services/chat/chat.service.spec.ts    |  16 ---
 src/app/services/chat/chat.service.ts         | 114 ------------------
 .../services/chat/ws-chat-methods.service.ts  |  15 ++-
 src/app/shared/chat/messages/messages.page.ts |   6 +-
 8 files changed, 39 insertions(+), 169 deletions(-)
 delete mode 100644 src/app/services/chat/chat.service.spec.ts
 delete mode 100644 src/app/services/chat/chat.service.ts

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index bb3500570..d39bd652d 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -17,9 +17,6 @@
               <ion-label class="title">Chat</ion-label>
             </div>
             <div class="div-icon">
-              <button class="btn-no-color" (click)="sendMsg()">
-                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-conversation.svg"></ion-icon>
-              </button>
               <button class="btn-no-color" (click)="openContactsPage()">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-conversation.svg"></ion-icon>
@@ -84,7 +81,7 @@
                           <fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="room.value.id == idSelected"></fa-icon>
                           <span> Fotografia</span>
                         </div>
-                      </ion-label> 
+                      </ion-label>
                     </div>
                   </div>
                 </div>
@@ -106,36 +103,36 @@
             </ion-item-sliding>
           </ion-list>
           <ion-list *ngSwitchCase="'Grupos'">
-              <ion-item-sliding *ngIf="!showLoader">
-                  <div *ngFor="let group of allGroups"
-                  [class.item-active]="group._id ==idSelected"
+              <ion-item-sliding *ngIf="!wsChatMethodsService.loadingWholeList">
+                  <div *ngFor="let group of wsChatMethodsService.group | keyvalue"
+                  [class.item-active]="group.value.id ==idSelected"
                   class="item item-hover d-flex">
                     <div class="item-icon">
                       <!-- <ion-icon class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon> -->
 
                       <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group._id != idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40.svg"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group._id == idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40-hover.svg"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group.value.id != idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40.svg"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group.value.id == idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40-hover.svg"></ion-icon>
                     </div>
                     <div
-                     (click)="openGroupMessagesPage(group._id)" class="item-content flex-grow-1 cursor-pointer">
+                     (click)="openGroupMessagesPage(group.value.id)" class="item-content flex-grow-1 cursor-pointer">
                       <div class="item-title-time">
-                        <div class="item-title" [class.item-title-active]="group._id ==idSelected">
-                          <ion-label>{{group.name.split('-').join(' ')}}</ion-label>
+                        <div class="item-title" [class.item-title-active]="group.value.id ==idSelected">
+                          <ion-label>{{group.value.name.split('-').join(' ')}}</ion-label>
                         </div>
-                        <div class="item-date" [class.item-date-active]="group._id ==idSelected" *ngIf="group.lastMessage && !group.customFields.countDownDate">{{showDateDuration(group._updatedAt)}}</div>
-                        <div class="item-date" [class.item-date-active]="group._id ==idSelected" *ngIf="group.customFields.countDownDate">{{countDownDate(group.customFields.countDownDate, group._id)}}</div>
+                        <div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.lastMessage && !group.customFields.countDownDate">{{showDateDuration(group._updatedAt)}}</div>
+                        <div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.customFields.countDownDate">{{countDownDate(group.value.customFields.countDownDate, group.value.id)}}</div>
                       </div>
-                      <div *ngIf="group.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group._id ==idSelected">
-                        <div class="item-message">{{group.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
-                        <div class="item-files add-ellipsis" *ngIf="group.lastMessage.file">
-                          <fa-icon *ngIf="group.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
-                          <fa-icon *ngIf="group.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
-                          <span class="item-files-title"> {{group.lastMessage.file.name || group.lastMessage.file.subject}}</span>
+                      <div *ngIf="group.value.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.value.id ==idSelected">
+                        <div class="item-message">{{group.value.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
+                        <div class="item-files add-ellipsis" *ngIf="group.value.lastMessage.file">
+                          <fa-icon *ngIf="group.value.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group.value.id == idSelected"></fa-icon>
+                          <fa-icon *ngIf="group.value.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="group.value.id == idSelected"></fa-icon>
+                          <span class="item-files-title"> {{group.value.lastMessage.file.name || group.value.lastMessage.file.subject}}</span>
                         </div>
-                        <div  class="item-files" *ngIf="group.lastMessage.attachments">
-                          <div *ngIf="group.lastMessage.attachments[0].image_url">
-                            <fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
+                        <div  class="item-files" *ngIf="group.value.lastMessage.attachments">
+                          <div *ngIf="group.value.value.lastMessage.attachments[0].image_url">
+                            <fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="group.value.id == idSelected"></fa-icon>
                             <span> Fotografia</span>
                           </div>
                         </div>
@@ -143,7 +140,7 @@
                     </div>
                   </div>
               </ion-item-sliding>
-              <ion-item-sliding *ngIf="showLoader || allGroups.length < 1">
+              <ion-item-sliding *ngIf="wsChatMethodsService.loadingWholeList || wsChatMethodsService.groupCount">
                 <div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
                   <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-group-chat-grey.svg"></ion-icon></div>
                   <div class="item-content flex-grow-1 cursor-pointer">
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 7756d8409..17c9799fa 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -12,7 +12,7 @@ import {
 import { ModalController, Platform } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
-import { wsChatMethodsService as wsChatMethodsService} from 'src/app/services/chat/chat.service'
+import { WsChatMethodsService} from 'src/app/services/chat/ws-chat-methods.service'
 import { GroupMessagesPage } from './group-messages/group-messages.page';
 import { ContactsPage } from './messages/contacts/contacts.page';
 import { MessagesPage } from './messages/messages.page';
@@ -127,7 +127,7 @@ export class ChatPage implements OnInit {
     private sqlservice: SqliteService,
     private platform: Platform,
     private storageservice: StorageService,
-    public wsChatMethodsService: wsChatMethodsService
+    public wsChatMethodsService: WsChatMethodsService,
   ) {
 
     this.loggedUserChat = authService.ValidatedUserChat['data'];
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 34bf21e39..aff6d21fa 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -28,7 +28,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { elementAt } from 'rxjs-compat/operator/elementAt';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
-import { wsChatMethodsService } from 'src/app/services/chat/chat.service'
+import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service'
 
 const IMAGE_DIR = 'stored-images';
 
@@ -96,7 +96,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private changeDetectorRef: ChangeDetectorRef,
     private platform: Platform,
     private sqlservice: SqliteService,
-    public wsChatMethodsService: wsChatMethodsService
+    public wsChatMethodsService: WsChatMethodsService
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
     this.roomId = this.navParams.get('roomId');
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 4385a72a5..b5c8616b7 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -42,7 +42,7 @@ export class ChatService {
         headers: this.headers,
       };
 
-      console.log("CHAT SERVICE");
+      /* console.log("CHAT SERVICE");
 
       wsService.messages = <Subject<any>>this.wsService
       .connect(environment.apiWsChatUrl)
@@ -79,7 +79,7 @@ export class ChatService {
           return (JSON.stringify(data));
         });
 
-        console.log(wsService.messages);
+        console.log(wsService.messages) */;
 
     }
 
diff --git a/src/app/services/chat/chat.service.spec.ts b/src/app/services/chat/chat.service.spec.ts
deleted file mode 100644
index 760f446a5..000000000
--- a/src/app/services/chat/chat.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { wsChatMethodsService } from './chat.service';
-
-describe('ChatService', () => {
-  let service: wsChatMethodsService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(wsChatMethodsService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/services/chat/chat.service.ts b/src/app/services/chat/chat.service.ts
deleted file mode 100644
index 521906bda..000000000
--- a/src/app/services/chat/chat.service.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { Injectable } from '@angular/core';
-import { RoomService } from './room.service';
-import { WsChatService } from 'src/app/services/chat/ws-chat.service';
-import { MessageService } from 'src/app/services/chat/message.service'
-import { SessionStore } from 'src/app/store/session.service';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class wsChatMethodsService {
-
-
-  dm: {[key: string]:  RoomService} = {}
-  group: {[key: string]:  RoomService} = {}
-
-  loadingWholeList = false
-
-  dmCount = 0;
-  groupCount = 0;
-  
-  constructor(
-    private WsChatService: WsChatService
-  ) {
-
-    (async()=>{
-      await this.getAllRooms();
-      this.subscribeToRoom()
-    })()
-    
-  }
-
-  async getAllRooms () {
-    this.loadingWholeList = true
-
-    const rooms: any = await this.WsChatService.getRooms();
-
-    console.log(rooms)
-
-    rooms.result.update.forEach((roomData:any) => {
-      let room:RoomService;
-      
-      room = new RoomService(this.WsChatService, new MessageService())
-      room.setData({
-        id: this.getRoomId(roomData),
-        name: this.getRoomName(roomData),
-        lastMessage: this.getRoomLastMessage(roomData),
-        _updatedAt: roomData._updatedAt['$date']
-      })
-
-      room.receiveMessage()
-
-      let roomId = roomData.lastMessage.rid
-
-      if(this.isIndividual(roomData)) {
-        this.dm[roomId] = room
-        this.dmCount++
-      } else {
-        this.group[roomId] = room
-        this.groupCount++
-      }
-      
-    });
-
-    this.loadingWholeList = false
-  }
-
-  subscribeToRoom() {
-    for (const id in this.dm) {
-      this.WsChatService.subscribeNotifyRoom(id).then((subscription)=>{
-        console.log('subscription', subscription)
-      })
-    }
-
-    for (const id in this.group) {
-      this.WsChatService.subscribeNotifyRoom(id).then((subscription)=>{
-        console.log('subscription', subscription)
-      })
-    }
-  }
-
-  getRoom(id): RoomService {
-    try {
-      return this.dm[id]
-    } catch(e) {
-      return this.group[id]
-    }
-  }
-
-  getRoomName(roomData) {
-    if(this.isIndividual(roomData)) {
-      const names: String[] = roomData.usernames
-      const roomName = names.filter((name)=>{
-        return name != SessionStore.user.RochetChatUser
-      })[0]
-
-      return roomName
-    } else {
-      return roomData.fName
-    }
-  }
-
-  getRoomId(roomData) {
-    return roomData.lastMessage.rid
-  }
-
-  getRoomLastMessage(roomData) {
-    return roomData.lastMessage
-  }
-
-  private isIndividual(roomData) {
-    return !roomData.fname
-  }
-
-}
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 670e78983..7b8ab1509 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -19,7 +19,7 @@ export class WsChatMethodsService {
 
   dmCount = 0;
   groupCount = 0;
-  
+
   constructor(
     private WsChatService: WsChatService
   ) {
@@ -28,7 +28,7 @@ export class WsChatMethodsService {
       await this.getAllRooms();
       this.subscribeToRoom()
     })()
-    
+
   }
 
   async getAllRooms () {
@@ -36,11 +36,14 @@ export class WsChatMethodsService {
 
     const rooms: any = await this.WsChatService.getRooms();
 
-    console.log(rooms)
+    console.log("ROOMS" + rooms)
 
     rooms.result.update.forEach((roomData:any) => {
       let room:RoomService;
-      
+
+      console.log(roomData);
+
+
       room = new RoomService(this.WsChatService, new MessageService())
       room.setData({
         id: this.getRoomId(roomData),
@@ -60,7 +63,7 @@ export class WsChatMethodsService {
         this.group[roomId] = room
         this.groupCount++
       }
-      
+
     });
 
     this.loadingWholeList = false
@@ -97,7 +100,7 @@ export class WsChatMethodsService {
 
       return roomName
     } else {
-      return roomData.fName
+      return roomData.fname
     }
   }
 
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index cc9bcc4e9..218e648ec 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -19,7 +19,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
-import { wsChatMethodsService as wsChatMethodsService} from 'src/app/services/chat/chat.service'
+import { WsChatMethodsService} from 'src/app/services/chat/ws-chat-methods.service'
 
 @Component({
   selector: 'app-messages',
@@ -78,9 +78,9 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     public ThemeService: ThemeService,
     private changeDetectorRef: ChangeDetectorRef,
     private router: Router,
-    public wsChatMethodsService: wsChatMethodsService
+    public wsChatMethodsService: WsChatMethodsService
   ) {
-    
+
     this.loggedUser = authService.ValidatedUserChat['data'];
   }
   ngOnChanges(changes: SimpleChanges): void {

From bf6211229cb68d39a43b269612ff87947cde713c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 15:22:24 +0100
Subject: [PATCH 049/112] fix

---
 src/app/pages/chat/chat.page.html                | 8 ++++----
 src/app/services/chat/room.service.ts            | 2 +-
 src/app/services/chat/ws-chat-methods.service.ts | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index d39bd652d..71a30bd9c 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -120,10 +120,10 @@
                         <div class="item-title" [class.item-title-active]="group.value.id ==idSelected">
                           <ion-label>{{group.value.name.split('-').join(' ')}}</ion-label>
                         </div>
-                        <div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.lastMessage && !group.customFields.countDownDate">{{showDateDuration(group._updatedAt)}}</div>
-                        <div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.customFields.countDownDate">{{countDownDate(group.value.customFields.countDownDate, group.value.id)}}</div>
+                        <!-- <div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.lastMessage && !group.customFields.countDownDate">{{group.value.duration}}</div>
+                        <div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.customFields.countDownDate">{{countDownDate(group.value.customFields.countDownDate, group.value.id)}}</div> -->
                       </div>
-                      <div *ngIf="group.value.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.value.id ==idSelected">
+                      <!-- <div *ngIf="group.value.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.value.id ==idSelected">
                         <div class="item-message">{{group.value.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
                         <div class="item-files add-ellipsis" *ngIf="group.value.lastMessage.file">
                           <fa-icon *ngIf="group.value.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group.value.id == idSelected"></fa-icon>
@@ -136,7 +136,7 @@
                             <span> Fotografia</span>
                           </div>
                         </div>
-                      </div>
+                      </div> -->
                     </div>
                   </div>
               </ion-item-sliding>
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 54fc6222d..f486a4fd2 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -63,7 +63,7 @@ export class RoomService {
       console.log('loadHistory', message)
       
       message.result.messages.reverse().forEach(element => {
-        console.log('element', element)
+        
         element = this.fix_updatedAt(element)
         const message = new MessageService()
         message.setData(element)
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 7b8ab1509..39ea53622 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -64,8 +64,11 @@ export class WsChatMethodsService {
         this.groupCount++
       }
 
-    });
+      
 
+    });
+    
+    console.log('this.group', this.group)
     this.loadingWholeList = false
   }
 

From b40b7c93602c8d699ad202593a3857cb945086c2 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 16:10:59 +0100
Subject: [PATCH 050/112] improve

---
 src/app/services/chat/room.service.ts    |  5 ++++-
 src/app/services/chat/ws-chat.service.ts | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index f486a4fd2..c595ead01 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -25,7 +25,6 @@ export class RoomService {
   ) {}
 
   setData({id, name, lastMessage, _updatedAt}) {
-
     this.id = id
     this.name = name
     this.lastMessage = lastMessage
@@ -93,4 +92,8 @@ export class RoomService {
     return message
   }
 
+
+  // to add
+  countDownDate(){}
+
 }
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 9d57d974f..6c018790b 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -46,7 +46,6 @@ export class WsChatService {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
-        console.log('message login', message)
         if(message.id == requestId ) { // same request send
           console.log('message login', message)
 
@@ -303,18 +302,26 @@ export class WsChatService {
       this.ws.wsMsgQueue()
     },
     wsMsgQueue:()=> {
+      let RunsQueue = []
+
       this.wsMsgQueue.forEach((item, index, object) => {
         if(item.loginRequired == true && this.isLogin == true) {
           console.log('run msgQueue ',index)
           this.ws.send(item.message, item.requestId, item.loginRequired);
-          delete this.wsMsgQueue[item.requestId]
+          RunsQueue.push(item.requestId)
         } else if(item.loginRequired == false) {
           console.log('run msgQueue ',index)
           this.ws.send(item.message, item.requestId, item.loginRequired);
-          delete this.wsMsgQueue[item.requestId]
+          RunsQueue.push(item.requestId)
         }
 
       })
+
+      RunsQueue.forEach((requestId)=>{
+        this.wsMsgQueue = this.wsMsgQueue.filter(e=> e.requestId != requestId)
+        console.log('wsMsgQueue', this.wsMsgQueue)
+      })
+
     },
     send: (message: object, requestId = uuidv4(), loginRequired) => {
 
@@ -347,11 +354,12 @@ export class WsChatService {
     },
 
     onclose:(event: any)=> {
-
+      this.ws.connected = false
+      this.isLogin = false
+  
       this.connect()
       this.login()
 
-      this.ws.connected = false
       console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
     },
 

From 5ef112461da03adc730e8508534dad6030b070ff Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 16:14:33 +0100
Subject: [PATCH 051/112] improve reconnect

---
 src/app/services/chat/ws-chat.service.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 6c018790b..e876e1cde 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -47,10 +47,8 @@ export class WsChatService {
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
         if(message.id == requestId ) { // same request send
-          console.log('message login', message)
 
           if(message.result.token) {
-            console.log('this.isLogin = true')
             this.isLogin = true
 
             this.ws.wsMsgQueue()
@@ -317,9 +315,9 @@ export class WsChatService {
 
       })
 
+      // remove wsMsgQueue
       RunsQueue.forEach((requestId)=>{
         this.wsMsgQueue = this.wsMsgQueue.filter(e=> e.requestId != requestId)
-        console.log('wsMsgQueue', this.wsMsgQueue)
       })
 
     },
@@ -337,7 +335,6 @@ export class WsChatService {
 
     onmessage:(event: any)=> {
       const data = JSON.parse(event.data)
-      // console.log('event.data', data)
 
       for (const [key, value] of Object.entries(this.wsCallbacks)) {
         if(value.type== 'Onmessage') {

From 4b4b62a71eef714a0425748d9533aab6e6bb5e16 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 16:17:40 +0100
Subject: [PATCH 052/112] remove console.logs

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

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index e876e1cde..3a71da5a0 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -304,11 +304,11 @@ export class WsChatService {
 
       this.wsMsgQueue.forEach((item, index, object) => {
         if(item.loginRequired == true && this.isLogin == true) {
-          console.log('run msgQueue ',index)
+          // console.log('run msgQueue ',index)
           this.ws.send(item.message, item.requestId, item.loginRequired);
           RunsQueue.push(item.requestId)
         } else if(item.loginRequired == false) {
-          console.log('run msgQueue ',index)
+          // console.log('run msgQueue ',index)
           this.ws.send(item.message, item.requestId, item.loginRequired);
           RunsQueue.push(item.requestId)
         }
@@ -324,7 +324,7 @@ export class WsChatService {
     send: (message: object, requestId = uuidv4(), loginRequired) => {
 
       if (this.ws.connected == false || loginRequired == true && this.isLogin == false) { // save data to send when back online
-        console.log('save msgQueue this.ws.connected == false || loginRequired == true && this.isLogin == false',this.ws.connected, loginRequired, this.isLogin)
+        // console.log('save msgQueue this.ws.connected == false || loginRequired == true && this.isLogin == false',this.ws.connected, loginRequired, this.isLogin)
         this.wsMsgQueue.push({message, requestId, loginRequired})
       } else {
         let messageStr = JSON.stringify(message)

From ddcd3f3e58eb42b77f1b8496ff05d2eeef0c087f Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 20:21:44 +0100
Subject: [PATCH 053/112] improve WsChatService

---
 src/app/models/rochet-chat-cliente-service.ts |  1 +
 src/app/services/chat/ws-chat.service.ts      | 45 ++++++++++---------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/app/models/rochet-chat-cliente-service.ts b/src/app/models/rochet-chat-cliente-service.ts
index 7cf5e2949..147ee54cb 100644
--- a/src/app/models/rochet-chat-cliente-service.ts
+++ b/src/app/models/rochet-chat-cliente-service.ts
@@ -3,6 +3,7 @@ export interface wsCallbacksParams {
     funx: Function
     runOnces?: boolean
     requestId?: string
+    key?: string
 }
 
 
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 3a71da5a0..48918ce1e 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -24,8 +24,18 @@ export class WsChatService {
       support: ["1"]
     }
 
-    this.ws.send(connectMessage, 'connect', false)
-    this.ws.send({msg:"pong"},'recoonect', false)
+    this.ws.send(connectMessage, 'connectMessage', false)
+    this.ws.send({msg:"pong"}, 'pong', false)
+
+    this.ws.registerCallback({
+      type:'Onmessage',
+      key: this.constructor.name+'ping/pong',
+       funx:(message: any) => {
+        if(message.msg == "ping") {
+          this.ws.send({msg:"pong"},'reconnect', false)
+        }
+    }})
+
   }
 
   login() {
@@ -266,20 +276,21 @@ export class WsChatService {
   }
 
   // socket class ==================================================================
-  private socket!: WebSocket;
-  private wsUrl = ''
-  private wsMsgQueue : msgQueue[] = []
+  private socket!: WebSocket; 
+  private wsMsgQueue : {[key: string]:  msgQueue} = {}
   private wsCallbacks: {[key: string]:  wsCallbacksParams} = {}
 
   private ws = {
     connected: false,
     registerCallback:(params: wsCallbacksParams) => {
 
-      if(!params.requestId) {
-        params.requestId = uuidv4()
+      let id = params.requestId || params.key
+
+      if(id) {
+        id = uuidv4()
       }
 
-      this.wsCallbacks[params.requestId] = {
+      this.wsCallbacks[id] = {
         type: params.type,
         funx: params.funx
       }
@@ -302,30 +313,24 @@ export class WsChatService {
     wsMsgQueue:()=> {
       let RunsQueue = []
 
-      this.wsMsgQueue.forEach((item, index, object) => {
+      for (const [key, item] of Object.entries(this.wsMsgQueue)) {
+        
         if(item.loginRequired == true && this.isLogin == true) {
           // console.log('run msgQueue ',index)
           this.ws.send(item.message, item.requestId, item.loginRequired);
-          RunsQueue.push(item.requestId)
+          delete this.wsMsgQueue[key]
         } else if(item.loginRequired == false) {
           // console.log('run msgQueue ',index)
           this.ws.send(item.message, item.requestId, item.loginRequired);
-          RunsQueue.push(item.requestId)
+          delete this.wsMsgQueue[key]
         }
-
-      })
-
-      // remove wsMsgQueue
-      RunsQueue.forEach((requestId)=>{
-        this.wsMsgQueue = this.wsMsgQueue.filter(e=> e.requestId != requestId)
-      })
-
+      }
     },
     send: (message: object, requestId = uuidv4(), loginRequired) => {
 
       if (this.ws.connected == false || loginRequired == true && this.isLogin == false) { // save data to send when back online
         // console.log('save msgQueue this.ws.connected == false || loginRequired == true && this.isLogin == false',this.ws.connected, loginRequired, this.isLogin)
-        this.wsMsgQueue.push({message, requestId, loginRequired})
+        this.wsMsgQueue[requestId] = {message, requestId, loginRequired}
       } else {
         let messageStr = JSON.stringify(message)
         this.socket.send(messageStr)

From 4793328ff3a526bca4c6cfd7910966c340191690 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 21:12:39 +0100
Subject: [PATCH 054/112] make code cleaner

---
 src/app/services/chat/room.service.ts    | 1 -
 src/app/services/chat/ws-chat.service.ts | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index c595ead01..5a1d6c6d2 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -36,7 +36,6 @@ export class RoomService {
   receiveMessage() {
     this.WsChatService.receiveLiveMessageFromRoom(
       this.id,
-      this.constructor.name+this.id,
       (Chatmessage) => {
 
         Chatmessage = this.fix_updatedAt(Chatmessage)
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 48918ce1e..2149ebb8b 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -196,14 +196,13 @@ export class WsChatService {
 
   /**
    * @param roomId
-   * @param key
    * @param funx
    */
-  receiveLiveMessageFromRoom(roomId =')(', key, funx: Function) {
+  receiveLiveMessageFromRoom(roomId,  funx: Function) {
 
     this.ws.registerCallback({
       type:'Onmessage',
-      requestId: key,
+      key: this.constructor.name+roomId,
       funx:(message)=>{
         if(message.msg =='result') {
           if(message.result.msg) {

From 2bd0cbf26f1592dabfdd6e4d542526172387515e Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 21:25:23 +0100
Subject: [PATCH 055/112] make code cleaner

---
 src/app/services/chat/ws-chat.service.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 2149ebb8b..31a6c8cf9 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -196,13 +196,14 @@ export class WsChatService {
 
   /**
    * @param roomId
+   * @param key
    * @param funx
    */
-  receiveLiveMessageFromRoom(roomId,  funx: Function) {
+  receiveLiveMessageFromRoom(roomId, funx: Function) {
 
     this.ws.registerCallback({
       type:'Onmessage',
-      key: this.constructor.name+roomId,
+      key: this.constructor.name+'receiveLiveMessageFromRoom'+roomId,
       funx:(message)=>{
         if(message.msg =='result') {
           if(message.result.msg) {

From 4a80a9fd8c069a571a00b1fc3e947cfcd98f3551 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 21:29:06 +0100
Subject: [PATCH 056/112] make code cleaner

---
 src/app/services/chat/ws-chat.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 31a6c8cf9..6ece14506 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -203,7 +203,6 @@ export class WsChatService {
 
     this.ws.registerCallback({
       type:'Onmessage',
-      key: this.constructor.name+'receiveLiveMessageFromRoom'+roomId,
       funx:(message)=>{
         if(message.msg =='result') {
           if(message.result.msg) {

From 8fbd4f0a259911a28ec42a72b7ba74dfacc05915 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 21:30:32 +0100
Subject: [PATCH 057/112] make code cleaner

---
 src/app/services/chat/ws-chat.service.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 6ece14506..09e68002f 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -294,6 +294,7 @@ export class WsChatService {
         funx: params.funx
       }
 
+      return id
     },
     connect:()=> {
       this.socket = new WebSocket(environment.apiWsChatUrl);

From 84be1d7e7723979b590ae33fa70d77c844137036 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 21:31:10 +0100
Subject: [PATCH 058/112] make code cleaner

---
 src/app/services/chat/ws-chat.service.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 09e68002f..3d1e10c2d 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -283,11 +283,7 @@ export class WsChatService {
     connected: false,
     registerCallback:(params: wsCallbacksParams) => {
 
-      let id = params.requestId || params.key
-
-      if(id) {
-        id = uuidv4()
-      }
+      let id = params.requestId || params.key || uuidv4()
 
       this.wsCallbacks[id] = {
         type: params.type,

From 5e8b0603ffc1475c90a140b3f1fe481b24ef32a7 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 21:42:45 +0100
Subject: [PATCH 059/112] make code cleaner

---
 src/app/services/chat/ws-chat.service.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 3d1e10c2d..f75987aeb 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -92,7 +92,7 @@ export class WsChatService {
     this.ws.send(request, requestId, true)
 
     return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
+      this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         if(message.id == requestId) { // same request send
           resolve(message)
           return true
@@ -157,7 +157,7 @@ export class WsChatService {
     this.ws.send(request, requestId, true)
 
     return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
+      this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         // console.log(message)
         if(message.id == requestId ) { // same request send
           resolve(message)
@@ -184,7 +184,7 @@ export class WsChatService {
     this.ws.send(subscribeRequest, requestId, true);
 
     return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
+      this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         if(message.msg == 'ready' || deepFind(message, 'subs.0') == requestId) { // same request send
           resolve(message)
           return true
@@ -233,7 +233,7 @@ export class WsChatService {
     this.ws.send(request, requestId, true);
 
     return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
+      this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         if(message.msg == 'ready' || deepFind(message, 'subs.0') == requestId) { // same request send
           resolve(message)
           return true
@@ -260,7 +260,7 @@ export class WsChatService {
     this.ws.send(streamNotifyObj, requestId, true)
 
     return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
+      this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
           resolve('')
           return true

From ebe312d17b9a70d61f453ffebda5df6287bab012 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 21:43:53 +0100
Subject: [PATCH 060/112] make code cleaner

---
 src/app/services/chat/ws-chat.service.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index f75987aeb..b141a7d0c 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -34,7 +34,8 @@ export class WsChatService {
         if(message.msg == "ping") {
           this.ws.send({msg:"pong"},'reconnect', false)
         }
-    }})
+      }
+    })
 
   }
 

From 87b03e3b4bcc00cc1c03f6b02a59e385eab8018c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 21:46:08 +0100
Subject: [PATCH 061/112] make code cleaner

---
 src/app/services/chat/ws-chat.service.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index b141a7d0c..8e387912d 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -285,11 +285,7 @@ export class WsChatService {
     registerCallback:(params: wsCallbacksParams) => {
 
       let id = params.requestId || params.key || uuidv4()
-
-      this.wsCallbacks[id] = {
-        type: params.type,
-        funx: params.funx
-      }
+      this.wsCallbacks[id] = params
 
       return id
     },

From 8287580a13fe6ed47a66ae3320b0d54fff3f7deb Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 22:07:55 +0100
Subject: [PATCH 062/112] make code cleaner

---
 src/app/models/rochet-chat-cliente-service.ts |  6 +++
 src/app/services/chat/ws-chat.service.ts      | 51 ++++++++++---------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/app/models/rochet-chat-cliente-service.ts b/src/app/models/rochet-chat-cliente-service.ts
index 147ee54cb..697ab312f 100644
--- a/src/app/models/rochet-chat-cliente-service.ts
+++ b/src/app/models/rochet-chat-cliente-service.ts
@@ -11,4 +11,10 @@ export interface msgQueue {
     message: object,
     requestId: string,
     loginRequired: boolean
+}
+
+export interface send  {
+    message: object
+    requestId?: string
+    loginRequired: boolean
 }
\ No newline at end of file
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 8e387912d..6d534afad 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { v4 as uuidv4 } from 'uuid'
-import { wsCallbacksParams, msgQueue } from 'src/app/models/rochet-chat-cliente-service'
+import { wsCallbacksParams, msgQueue, send } from 'src/app/models/rochet-chat-cliente-service'
 import { deepFind } from 'src/plugin/deep'
 import { environment } from 'src/environments/environment';
 import { SessionStore } from 'src/app/store/session.service';
@@ -15,24 +15,24 @@ export class WsChatService {
   constructor() {}
 
   connect() {
-
+    
     this.ws.connect();
 
-    const connectMessage = {
+    const message = {
       msg: "connect",
       version: "1",
       support: ["1"]
     }
 
-    this.ws.send(connectMessage, 'connectMessage', false)
-    this.ws.send({msg:"pong"}, 'pong', false)
+    this.ws.send({message, loginRequired: false})
+    this.ws.send({message:{msg:"pong"}, loginRequired: false})
 
     this.ws.registerCallback({
       type:'Onmessage',
       key: this.constructor.name+'ping/pong',
        funx:(message: any) => {
         if(message.msg == "ping") {
-          this.ws.send({msg:"pong"},'reconnect', false)
+          this.ws.send({message:{msg:"pong"}, loginRequired: false})
         }
       }
     })
@@ -42,7 +42,7 @@ export class WsChatService {
   login() {
     const requestId =  uuidv4()
 
-    const loginRequest = {
+    const message = {
       msg: "method",
       method: "login",
       id: requestId,
@@ -53,7 +53,8 @@ export class WsChatService {
         }
       ]
     }
-    this.ws.send(loginRequest, requestId, false)
+    this.ws.send({message, requestId, loginRequired: false})
+    
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
@@ -83,14 +84,14 @@ export class WsChatService {
 
     const requestId =  uuidv4()
 
-    const request = {
+    const message = {
       "msg": "method",
       "method": "rooms/get",
       "id": requestId,
       "params": [ { "$date": 1480377601 } ]
     }
 
-    this.ws.send(request, requestId, true)
+    this.ws.send({message, requestId, loginRequired: true})
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
@@ -104,22 +105,22 @@ export class WsChatService {
 
   logout() {}
 
-  send(roomId, message) {
+  send(roomId, msg) {
 
     const requestId =  uuidv4()
 
-    var request = {
+    var message = {
       msg: "method",
       method: "sendMessage",
       id: requestId,
       params: [{
         _id: uuidv4(),
         rid: roomId,
-        msg: message
+        msg: msg
       }]
     }
 
-    this.ws.send(request, requestId, true);
+    this.ws.send({message, requestId, loginRequired: true});
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
@@ -141,7 +142,7 @@ export class WsChatService {
 
     const requestId =  uuidv4()
 
-    const request = {
+    const message = {
       msg: "method",
       method: "loadHistory",
       id: requestId,
@@ -155,7 +156,7 @@ export class WsChatService {
       ]
     }
 
-    this.ws.send(request, requestId, true)
+    this.ws.send({message, requestId, loginRequired: true})
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
@@ -172,7 +173,7 @@ export class WsChatService {
 
     const requestId =  uuidv4()
 
-    var subscribeRequest = {
+    var message = {
       "msg": "sub",
       "id": requestId,
       "name": "stream-notify-room",
@@ -182,7 +183,7 @@ export class WsChatService {
       ]
     }
 
-    this.ws.send(subscribeRequest, requestId, true);
+    this.ws.send({message, requestId, loginRequired: true});
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
@@ -221,7 +222,7 @@ export class WsChatService {
 
     const requestId =  uuidv4()
 
-    const request = {
+    const message = {
       "msg": "sub",
       "id": requestId,
       "name": "stream-room-messages",
@@ -231,7 +232,7 @@ export class WsChatService {
       ]
     }
 
-    this.ws.send(request, requestId, true);
+    this.ws.send({message, requestId, loginRequired: true});
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
@@ -247,7 +248,7 @@ export class WsChatService {
 
     const requestId =  uuidv4()
 
-    let streamNotifyObj = {
+    let message = {
       "msg": "method",
       "method": "stream-notify-room",
       "id": requestId,
@@ -258,7 +259,7 @@ export class WsChatService {
       ]
     };
 
-    this.ws.send(streamNotifyObj, requestId, true)
+    this.ws.send({message, requestId, loginRequired: true})
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
@@ -310,16 +311,16 @@ export class WsChatService {
         
         if(item.loginRequired == true && this.isLogin == true) {
           // console.log('run msgQueue ',index)
-          this.ws.send(item.message, item.requestId, item.loginRequired);
+          this.ws.send(item);
           delete this.wsMsgQueue[key]
         } else if(item.loginRequired == false) {
           // console.log('run msgQueue ',index)
-          this.ws.send(item.message, item.requestId, item.loginRequired);
+          this.ws.send(item);
           delete this.wsMsgQueue[key]
         }
       }
     },
-    send: (message: object, requestId = uuidv4(), loginRequired) => {
+    send: ({message, requestId = uuidv4(), loginRequired = false}:send) => {
 
       if (this.ws.connected == false || loginRequired == true && this.isLogin == false) { // save data to send when back online
         // console.log('save msgQueue this.ws.connected == false || loginRequired == true && this.isLogin == false',this.ws.connected, loginRequired, this.isLogin)

From f0e9125e4dbd9aa551596ed2ba73f56f9c79eb17 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 22:10:42 +0100
Subject: [PATCH 063/112] make code cleaner

---
 src/app/models/rochet-chat-cliente-service.ts |  2 +-
 src/app/services/chat/ws-chat.service.ts      | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/models/rochet-chat-cliente-service.ts b/src/app/models/rochet-chat-cliente-service.ts
index 697ab312f..36b10321b 100644
--- a/src/app/models/rochet-chat-cliente-service.ts
+++ b/src/app/models/rochet-chat-cliente-service.ts
@@ -16,5 +16,5 @@ export interface msgQueue {
 export interface send  {
     message: object
     requestId?: string
-    loginRequired: boolean
+    loginRequired?: boolean
 }
\ No newline at end of file
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 6d534afad..3606e1f60 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -91,7 +91,7 @@ export class WsChatService {
       "params": [ { "$date": 1480377601 } ]
     }
 
-    this.ws.send({message, requestId, loginRequired: true})
+    this.ws.send({message, requestId})
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
@@ -120,7 +120,7 @@ export class WsChatService {
       }]
     }
 
-    this.ws.send({message, requestId, loginRequired: true});
+    this.ws.send({message, requestId});
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
@@ -156,7 +156,7 @@ export class WsChatService {
       ]
     }
 
-    this.ws.send({message, requestId, loginRequired: true})
+    this.ws.send({message, requestId})
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
@@ -183,7 +183,7 @@ export class WsChatService {
       ]
     }
 
-    this.ws.send({message, requestId, loginRequired: true});
+    this.ws.send({message, requestId});
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
@@ -232,7 +232,7 @@ export class WsChatService {
       ]
     }
 
-    this.ws.send({message, requestId, loginRequired: true});
+    this.ws.send({message, requestId});
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
@@ -259,7 +259,7 @@ export class WsChatService {
       ]
     };
 
-    this.ws.send({message, requestId, loginRequired: true})
+    this.ws.send({message, requestId})
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
@@ -320,7 +320,7 @@ export class WsChatService {
         }
       }
     },
-    send: ({message, requestId = uuidv4(), loginRequired = false}:send) => {
+    send: ({message, requestId = uuidv4(), loginRequired = true}:send) => {
 
       if (this.ws.connected == false || loginRequired == true && this.isLogin == false) { // save data to send when back online
         // console.log('save msgQueue this.ws.connected == false || loginRequired == true && this.isLogin == false',this.ws.connected, loginRequired, this.isLogin)

From 7a09fb5a92dccdca13c8882f0020f20ef00387b9 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Jan 2022 22:11:54 +0100
Subject: [PATCH 064/112] make code cleaner

---
 src/app/services/chat/ws-chat.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 3606e1f60..5434a5a5e 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -305,7 +305,6 @@ export class WsChatService {
       this.ws.wsMsgQueue()
     },
     wsMsgQueue:()=> {
-      let RunsQueue = []
 
       for (const [key, item] of Object.entries(this.wsMsgQueue)) {
         

From 5c18d20afb61d9ed6f86b26ac267e566924196fb Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 07:29:28 +0100
Subject: [PATCH 065/112] remove requestId

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

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 5434a5a5e..0c6d3b516 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -57,7 +57,7 @@ export class WsChatService {
     
 
     return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
+      this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         if(message.id == requestId ) { // same request send
 
           if(message.result.token) {
@@ -123,7 +123,7 @@ export class WsChatService {
     this.ws.send({message, requestId});
 
     return new Promise((resolve, reject) => {
-      this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
+      this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
           resolve(message)
           return true

From 361e60a79721f6af5af5dc91be87d32a32e4fc5d Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 07:57:50 +0100
Subject: [PATCH 066/112] add commnet

---
 src/app/services/chat/ws-chat.service.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 0c6d3b516..ef0f5b2cc 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -104,7 +104,8 @@ export class WsChatService {
   }
 
   logout() {}
-
+  
+  // send message to room
   send(roomId, msg) {
 
     const requestId =  uuidv4()

From 9bb95164917e4bc90e756a4dc867d55eb0b5b633 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 10:19:14 +0100
Subject: [PATCH 067/112] add message notification

---
 src/app/services/chat/room.service.ts | 5 ++++-
 src/app/services/toast.service.ts     | 7 ++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 5a1d6c6d2..4460386f4 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -3,6 +3,8 @@ import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 import { MessageService } from 'src/app/services/chat/message.service'
 import { ChatUserService } from 'src/app/services/chat/chat-user.service'
 import { showDateDuration } from 'src/plugin/showDateDuration'
+import { ToastsService } from '../toast.service';
+
 @Injectable({
   providedIn: 'root'
 })
@@ -18,6 +20,7 @@ export class RoomService {
   private hasLoadHistory = false
   duration  = ''
   
+  ToastService = ToastsService
 
   constructor(
     public WsChatService: WsChatService,
@@ -43,7 +46,7 @@ export class RoomService {
         message.setData(Chatmessage.result)
         this.massages.push(message)
         this.calDateDuration(Chatmessage.result._updatedAt)
-
+        this.ToastService.presentToast('nova mensagem')
       }
     )
   }
diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts
index 840678e37..352bd86a3 100644
--- a/src/app/services/toast.service.ts
+++ b/src/app/services/toast.service.ts
@@ -10,9 +10,7 @@ export class ToastService {
 
   constructor(
     public toastController: ToastController,
-    private animationController: AnimationController,
-    private modalController: ModalController,
-    ) { }
+  ) { }
 
   ngOnInit() {}
 
@@ -230,3 +228,6 @@ export class ToastService {
   }
 
 }
+
+
+export const ToastsService = new ToastService(new ToastController())
\ No newline at end of file

From 8386781f77db95cd1aaa5591f9a2bf1e9d60cc43 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 10:26:40 +0100
Subject: [PATCH 068/112] add private atribuite

---
 src/app/services/chat/room.service.ts         | 2 +-
 src/app/shared/chat/messages/messages.page.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 4460386f4..210147e20 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -20,7 +20,7 @@ export class RoomService {
   private hasLoadHistory = false
   duration  = ''
   
-  ToastService = ToastsService
+  private ToastService = ToastsService
 
   constructor(
     public WsChatService: WsChatService,
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 218e648ec..7079eb39e 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -133,7 +133,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     ev.target.complete();
   }
 
-  scrollToBottom(): void {
+  scrollToBottom = () => {
     try {
       if(this.scrollingOnce){
         this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;

From 3565d5ceb2ebc856a0337e324867686127cb8e46 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 10:52:03 +0100
Subject: [PATCH 069/112] improve message service

---
 src/app/models/chatMethod.ts             | 101 +++++++++++++++++++++++
 src/app/services/chat/message.service.ts |  11 ++-
 src/app/services/chat/room.service.ts    |  24 +++---
 3 files changed, 120 insertions(+), 16 deletions(-)
 create mode 100644 src/app/models/chatMethod.ts

diff --git a/src/app/models/chatMethod.ts b/src/app/models/chatMethod.ts
new file mode 100644
index 000000000..122e3ff01
--- /dev/null
+++ b/src/app/models/chatMethod.ts
@@ -0,0 +1,101 @@
+export interface Ts {
+    $date: any;
+}
+
+export interface U {
+    _id: string;
+    username: string;
+    name: string;
+}
+
+interface UpdatedAt {
+    $date: any;
+}
+
+interface Attachment {
+    ts: Date;
+    title_link_download: boolean;
+}
+
+export interface File {
+    type: string;
+    guid: string;
+    image_url: string;
+    subject: string;
+    start_date?: Date;
+    end_date?: Date;
+    venue: string;
+    id: string;
+}
+
+interface EditedAt {
+    $date: number;
+}
+
+interface EditedBy {
+    _id: string;
+    username: string;
+}
+
+
+
+interface Ts2 {
+    $date: number;
+}
+
+interface U2 {
+    _id: string;
+    username: string;
+    name: string;
+}
+
+interface UpdatedAt2 {
+    $date: number;
+}
+
+interface FirstUnread {
+    _id: string;
+    rid: string;
+    msg: string;
+    ts: Ts2;
+    u: U2;
+    _updatedAt: UpdatedAt2;
+    mentions: any[];
+    channels: any[];
+}
+
+export interface Message {
+    _id: string;
+    rid: string;
+    msg: string;
+    ts: Ts;
+    u: U;
+    _updatedAt: UpdatedAt;
+    mentions: any[];
+    channels: any[];
+    attachments: Attachment[];
+    file: File;
+    editedAt: EditedAt;
+    editedBy: EditedBy;
+    urls: any[];
+}
+
+export interface ChatMessage {
+    msg: string;
+    id: string;
+    result: Message
+}
+
+
+
+
+
+export interface chatHistory {
+    msg: string;
+    id: string;
+    result: {
+        messages: Message[];
+        firstUnread: FirstUnread;
+        unreadNotLoaded: number;
+    };
+}
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index cf1b39a98..ffdf4c9cf 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -1,4 +1,6 @@
 import { Injectable } from '@angular/core';
+import { Message } from 'src/app/models/chatMethod';
+import { chatHistory, ChatMessage, File } from 'src/app/models/chatMethod'
 
 @Injectable({
   providedIn: 'root'
@@ -13,10 +15,12 @@ export class MessageService {
   u = {}
   _id  =''
   _updatedAt = {}
+  file
+  attachments
 
   constructor() { }
 
-  setData({channels, mentions, msg ,rid ,ts, u, _id, _updatedAt}) {
+  setData({channels, mentions, msg ,rid ,ts, u, _id, _updatedAt, file, attachments}:Message) {
     this.channels = channels
     this.mentions = mentions
     this.msg = msg
@@ -25,13 +29,12 @@ export class MessageService {
     this.u = u
     this._id = _id
     this._updatedAt = _updatedAt
+    this.file = file
+    this.attachments = attachments
   }
 
   delete() {}
 
   showDateDuration() {}
 
-
-  
-
 }
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 210147e20..7c5299e45 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -4,7 +4,7 @@ import { MessageService } from 'src/app/services/chat/message.service'
 import { ChatUserService } from 'src/app/services/chat/chat-user.service'
 import { showDateDuration } from 'src/plugin/showDateDuration'
 import { ToastsService } from '../toast.service';
-
+import { chatHistory, ChatMessage } from 'src/app/models/chatMethod'
 @Injectable({
   providedIn: 'root'
 })
@@ -39,13 +39,13 @@ export class RoomService {
   receiveMessage() {
     this.WsChatService.receiveLiveMessageFromRoom(
       this.id,
-      (Chatmessage) => {
+      (ChatMessage:ChatMessage) => {
 
-        Chatmessage = this.fix_updatedAt(Chatmessage)
+        ChatMessage = this.fix_updatedAt(ChatMessage)
         const message = new MessageService()
-        message.setData(Chatmessage.result)
+        message.setData(ChatMessage.result)
         this.massages.push(message)
-        this.calDateDuration(Chatmessage.result._updatedAt)
+        this.calDateDuration(ChatMessage.result._updatedAt)
         this.ToastService.presentToast('nova mensagem')
       }
     )
@@ -60,15 +60,15 @@ export class RoomService {
 
     if(this.hasLoadHistory){ return false}
 
-    this.WsChatService.loadHistory(this.id, limit).then((message:any) => {
-      console.log('loadHistory', message)
+    this.WsChatService.loadHistory(this.id, limit).then((chatHistory:chatHistory) => {
+      console.log('loadHistory', chatHistory)
       
-      message.result.messages.reverse().forEach(element => {
+      chatHistory.result.messages.reverse().forEach(message => {
         
-        element = this.fix_updatedAt(element)
-        const message = new MessageService()
-        message.setData(element)
-        this.massages.push(message)
+        message = this.fix_updatedAt(message)
+        const wewMessage = new MessageService()
+        wewMessage.setData(message)
+        this.massages.push(wewMessage)
       });
 
     })

From 0f3f0e60df980ee6db28234ac114f71e5581757e Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 10:55:40 +0100
Subject: [PATCH 070/112] remove delete useless methods

---
 src/app/models/chatMethod.ts          | 4 ++--
 src/app/services/chat/room.service.ts | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/app/models/chatMethod.ts b/src/app/models/chatMethod.ts
index 122e3ff01..0cd7ea347 100644
--- a/src/app/models/chatMethod.ts
+++ b/src/app/models/chatMethod.ts
@@ -1,8 +1,8 @@
-export interface Ts {
+interface Ts {
     $date: any;
 }
 
-export interface U {
+interface U {
     _id: string;
     username: string;
     name: string;
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 7c5299e45..b33b0d36c 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -76,8 +76,6 @@ export class RoomService {
     this.hasLoadHistory = true
   }
 
-  create() {}
-  deleteMessage(msgId) {}
   ReactToMessage() {}
 
   private calDateDuration(date = null) {

From 63c7ff027cdf1bc5863618799da8b0f7a3686a05 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 11:24:14 +0100
Subject: [PATCH 071/112] set user status

---
 src/app/services/auth.service.ts         |  2 ++
 src/app/services/chat/ws-chat.service.ts | 26 +++++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index df4d6b36e..e4b0d96da 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -42,6 +42,7 @@ export class AuthService {
         this.WsChatService.connect();
         this.WsChatService.login().then((message) => {
           console.log('rocket chat login successfully', message)
+          this.WsChatService.temporaryStatus('online')
         }).catch((message)=>{
           console.log('rocket chat login failed', message)
         })
@@ -115,6 +116,7 @@ export class AuthService {
       this.WsChatService.connect();
       this.WsChatService.login().then((message) => {
         console.log('rocket chat login successfully', message)
+        this.WsChatService.temporaryStatus('online')
       }).catch((message)=>{
         console.log('rocket chat login failed', message)
       })
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index ef0f5b2cc..32b43e55e 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -170,6 +170,23 @@ export class WsChatService {
     });
   }
 
+  temporaryStatus(status: 'online' | 'busy' | 'away' | 'offline') {
+    
+    const requestId =  uuidv4()
+
+    const message = {
+      
+      msg: "method",
+      method: `UserPresence:setDefaultStatus`,
+      id: requestId,
+      params: [ status ]
+    
+    }
+
+    this.ws.send({message, requestId})
+
+  }
+
   subscribeNotifyRoom(roomId : string) {
 
     const requestId =  uuidv4()
@@ -208,9 +225,12 @@ export class WsChatService {
       type:'Onmessage',
       funx:(message)=>{
         if(message.msg =='result') {
-          if(message.result.msg) {
-            if(message.result.rid == roomId) {
-              funx(message)
+          console.log(message)
+          if(message.result) {
+            if(message.result.msg) {
+              if(message.result.rid == roomId) {
+                funx(message)
+              }
             }
           }
         }

From ffcde989676b2c704ec71a80cbcde451a5cdae9c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 11:32:32 +0100
Subject: [PATCH 072/112] improve login

---
 src/app/services/chat/ws-chat.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 32b43e55e..b177ad975 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -225,7 +225,6 @@ export class WsChatService {
       type:'Onmessage',
       funx:(message)=>{
         if(message.msg =='result') {
-          console.log(message)
           if(message.result) {
             if(message.result.msg) {
               if(message.result.rid == roomId) {

From cf98e99531bd5fd670aff03d02d42cdeb6baf575 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 11:43:36 +0100
Subject: [PATCH 073/112] fix dm room name

---
 src/app/services/chat/ws-chat-methods.service.ts | 4 ++--
 src/index.html                                   | 9 +++++++++
 src/plugin/deep.js                               | 2 +-
 src/plugin/text.js                               | 7 +++++++
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 src/plugin/text.js

diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 39ea53622..02ddbdb9a 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -3,7 +3,7 @@ import { RoomService } from './room.service';
 import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 import { MessageService } from 'src/app/services/chat/message.service'
 import { SessionStore } from 'src/app/store/session.service';
-
+import { capitalizeTxt } from 'src/plugin/text'
 
 @Injectable({
   providedIn: 'root'
@@ -101,7 +101,7 @@ export class WsChatMethodsService {
         return name != SessionStore.user.RochetChatUser
       })[0]
 
-      return roomName
+      return capitalizeTxt(roomName.split('.')[0]) + ' ' + capitalizeTxt(roomName.split('.')[1])
     } else {
       return roomData.fname
     }
diff --git a/src/index.html b/src/index.html
index 2d125ea04..63e7662dc 100644
--- a/src/index.html
+++ b/src/index.html
@@ -66,6 +66,15 @@
   <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
   <script type="module" src="./assets/js/index.js"></script>
+
+  <script>
+    Object.defineProperty(String.prototype, 'capitalize', {
+        value: function() {
+          return this.charAt(0).toUpperCase() + this.slice(1);
+        },
+        enumerable: false
+    });
+  </script>
 </head>
 
 <body class='gov'>
diff --git a/src/plugin/deep.js b/src/plugin/deep.js
index 586c8077c..312724756 100644
--- a/src/plugin/deep.js
+++ b/src/plugin/deep.js
@@ -14,5 +14,5 @@ function deepFind(obj, path) {
 }
   
 module.exports = {
-    deepFind: deepFind,
+  deepFind: deepFind,
 };
\ No newline at end of file
diff --git a/src/plugin/text.js b/src/plugin/text.js
new file mode 100644
index 000000000..c453d310b
--- /dev/null
+++ b/src/plugin/text.js
@@ -0,0 +1,7 @@
+function capitalizeTxt(txt) {
+    return txt.charAt(0).toUpperCase() + txt.slice(1); //or if you want lowercase the rest txt.slice(1).toLowerCase();
+}
+
+module.exports = {
+    capitalizeTxt: capitalizeTxt
+}
\ No newline at end of file

From 364108ab44dbdb3e898637766003291b2cc84769 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 11:55:21 +0100
Subject: [PATCH 074/112] fix room name and add interface

---
 src/app/models/chatMethod.ts                  | 66 +++++++++++++++++++
 .../services/chat/ws-chat-methods.service.ts  |  7 +-
 src/plugin/text.js                            |  2 +-
 3 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/src/app/models/chatMethod.ts b/src/app/models/chatMethod.ts
index 0cd7ea347..c813eb88d 100644
--- a/src/app/models/chatMethod.ts
+++ b/src/app/models/chatMethod.ts
@@ -80,6 +80,72 @@ export interface Message {
     urls: any[];
 }
 
+
+
+
+export interface Lm {
+    $date: any;
+}
+
+
+
+
+export interface LastMessage {
+    _id: string;
+    rid: string;
+    msg: string;
+    ts: Ts;
+    u: U;
+    _updatedAt: UpdatedAt2;
+    mentions: any[];
+    channels: any[];
+    file: File;
+    attachments: Attachment[];
+}
+
+export interface CustomFields {
+}
+
+export interface Update {
+    _id: string;
+    t: string;
+    usernames: string[];
+    usersCount: number;
+    uids: string[];
+    default: boolean;
+    ro: boolean;
+    sysMes: boolean;
+    _updatedAt: UpdatedAt;
+    lm: Lm;
+    lastMessage: LastMessage;
+    name: string;
+    fname: string;
+    u: U2;
+    customFields: CustomFields;
+}
+
+export interface DeletedAt {
+    $date: any;
+}
+
+export interface Remove {
+    _id: string;
+    _deletedAt: DeletedAt;
+}
+
+export interface Result {
+    update: Update[];
+    remove: Remove[];
+}
+
+export interface Rooms {
+    msg: string;
+    id: string;
+    result: Result;
+}
+
+
+
 export interface ChatMessage {
     msg: string;
     id: string;
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 02ddbdb9a..70c5faf51 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -4,6 +4,7 @@ import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 import { MessageService } from 'src/app/services/chat/message.service'
 import { SessionStore } from 'src/app/store/session.service';
 import { capitalizeTxt } from 'src/plugin/text'
+import { Rooms, Update } from 'src/app/models/chatMethod';
 
 @Injectable({
   providedIn: 'root'
@@ -35,10 +36,10 @@ export class WsChatMethodsService {
     this.loadingWholeList = true
 
     const rooms: any = await this.WsChatService.getRooms();
+    
+    console.log("ROOMS" + JSON.stringify(rooms))
 
-    console.log("ROOMS" + rooms)
-
-    rooms.result.update.forEach((roomData:any) => {
+    rooms.result.update.forEach((roomData:Update) => {
       let room:RoomService;
 
       console.log(roomData);
diff --git a/src/plugin/text.js b/src/plugin/text.js
index c453d310b..4d25cc846 100644
--- a/src/plugin/text.js
+++ b/src/plugin/text.js
@@ -3,5 +3,5 @@ function capitalizeTxt(txt) {
 }
 
 module.exports = {
-    capitalizeTxt: capitalizeTxt
+  capitalizeTxt: capitalizeTxt
 }
\ No newline at end of file

From e67175ac6fca4c71114372e687899b9eb9768ba3 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 12:01:56 +0100
Subject: [PATCH 075/112] make code cleaner

---
 src/app/services/chat/ws-chat-methods.service.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 70c5faf51..8e61b9065 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -102,7 +102,9 @@ export class WsChatMethodsService {
         return name != SessionStore.user.RochetChatUser
       })[0]
 
-      return capitalizeTxt(roomName.split('.')[0]) + ' ' + capitalizeTxt(roomName.split('.')[1])
+      const firstName = capitalizeTxt(roomName.split('.')[0])
+      const lastName =  capitalizeTxt(roomName.split('.')[1])
+      return firstName + ' ' + lastName
     } else {
       return roomData.fname
     }

From ca2c5abe519ad13fae95f5cebdc3d38bc374b5ba Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 12:04:33 +0100
Subject: [PATCH 076/112] add room interface

---
 src/app/services/chat/ws-chat-methods.service.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 8e61b9065..0b2305848 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -4,7 +4,7 @@ import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 import { MessageService } from 'src/app/services/chat/message.service'
 import { SessionStore } from 'src/app/store/session.service';
 import { capitalizeTxt } from 'src/plugin/text'
-import { Rooms, Update } from 'src/app/models/chatMethod';
+import { Rooms, Update as room } from 'src/app/models/chatMethod';
 
 @Injectable({
   providedIn: 'root'
@@ -39,7 +39,7 @@ export class WsChatMethodsService {
     
     console.log("ROOMS" + JSON.stringify(rooms))
 
-    rooms.result.update.forEach((roomData:Update) => {
+    rooms.result.update.forEach((roomData: room) => {
       let room:RoomService;
 
       console.log(roomData);
@@ -95,7 +95,7 @@ export class WsChatMethodsService {
     }
   }
 
-  getRoomName(roomData) {
+  getRoomName(roomData: room) {
     if(this.isIndividual(roomData)) {
       const names: String[] = roomData.usernames
       const roomName = names.filter((name)=>{
@@ -110,15 +110,15 @@ export class WsChatMethodsService {
     }
   }
 
-  getRoomId(roomData) {
+  getRoomId(roomData:room) {
     return roomData.lastMessage.rid
   }
 
-  getRoomLastMessage(roomData) {
+  getRoomLastMessage(roomData: room) {
     return roomData.lastMessage
   }
 
-  private isIndividual(roomData) {
+  private isIndividual(roomData: room) {
     return !roomData.fname
   }
 

From 0b1add3fb7f5206c332130d37363394c724c88ea Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 12:52:05 +0100
Subject: [PATCH 077/112] remove console.log

---
 src/app/services/chat/ws-chat-methods.service.ts |  4 ++--
 src/app/services/chat/ws-chat.service.ts         | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 0b2305848..89591ea77 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -35,9 +35,9 @@ export class WsChatMethodsService {
   async getAllRooms () {
     this.loadingWholeList = true
 
-    const rooms: any = await this.WsChatService.getRooms();
+    const rooms = await this.WsChatService.getRooms();
     
-    console.log("ROOMS" + JSON.stringify(rooms))
+    // console.log("ROOMS" + JSON.stringify(rooms))
 
     rooms.result.update.forEach((roomData: room) => {
       let room:RoomService;
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index b177ad975..8b9a7c881 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -4,6 +4,7 @@ import { wsCallbacksParams, msgQueue, send } from 'src/app/models/rochet-chat-cl
 import { deepFind } from 'src/plugin/deep'
 import { environment } from 'src/environments/environment';
 import { SessionStore } from 'src/app/store/session.service';
+import { chatHistory, Rooms } from 'src/app/models/chatMethod';
 
 @Injectable({
   providedIn: 'root'
@@ -93,7 +94,7 @@ export class WsChatService {
 
     this.ws.send({message, requestId})
 
-    return new Promise((resolve, reject) => {
+    return new Promise<Rooms>((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         if(message.id == requestId) { // same request send
           resolve(message)
@@ -103,7 +104,10 @@ export class WsChatService {
     });
   }
 
-  logout() {}
+  logout() {
+    this.isLogin = false
+    this.ws.connected = false
+  }
   
   // send message to room
   send(roomId, msg) {
@@ -159,7 +163,7 @@ export class WsChatService {
 
     this.ws.send({message, requestId})
 
-    return new Promise((resolve, reject) => {
+    return new Promise<chatHistory>((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         // console.log(message)
         if(message.id == requestId ) { // same request send
@@ -352,6 +356,7 @@ export class WsChatService {
     },
 
     onmessage:(event: any)=> {
+      if(this.ws.connected == false) { return true } 
       const data = JSON.parse(event.data)
 
       for (const [key, value] of Object.entries(this.wsCallbacks)) {

From 6d3b972e7541842e28a48da70f8e7d010cc3c88c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 12:52:49 +0100
Subject: [PATCH 078/112] fix

---
 src/app/services/chat/ws-chat.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 8b9a7c881..22b7ea55e 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -356,7 +356,7 @@ export class WsChatService {
     },
 
     onmessage:(event: any)=> {
-      if(this.ws.connected == false) { return true } 
+      // if(this.ws.connected == false) { return true } 
       const data = JSON.parse(event.data)
 
       for (const [key, value] of Object.entries(this.wsCallbacks)) {

From f54beff851447587ff1aea3ad3a293873692325e Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 13 Jan 2022 13:45:04 +0100
Subject: [PATCH 079/112] save

---
 src/app/pages/chat/chat.page.html                | 3 ++-
 src/app/pages/chat/chat.page.ts                  | 2 --
 src/app/services/chat.service.ts                 | 2 --
 src/app/services/chat/room.service.ts            | 6 +++---
 src/app/services/chat/ws-chat-methods.service.ts | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index d39bd652d..7a11f5720 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -118,7 +118,8 @@
                      (click)="openGroupMessagesPage(group.value.id)" class="item-content flex-grow-1 cursor-pointer">
                       <div class="item-title-time">
                         <div class="item-title" [class.item-title-active]="group.value.id ==idSelected">
-                          <ion-label>{{group.value.name.split('-').join(' ')}}</ion-label>
+                          {{group.value.name.split('-').join(' ')}}
+                          <ion-label>{{group.value.name.split('-').join(' ')}}</ion-label>TT
                         </div>
                         <div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.lastMessage && !group.customFields.countDownDate">{{showDateDuration(group._updatedAt)}}</div>
                         <div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.customFields.countDownDate">{{countDownDate(group.value.customFields.countDownDate, group.value.id)}}</div>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 17c9799fa..102a8c7c2 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -32,7 +32,6 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { DataService } from 'src/app/services/data.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { StorageService } from 'src/app/services/storage.service';
-import { WebsocketService } from 'src/app/services/websocket.service';
 
 
 
@@ -40,7 +39,6 @@ import { WebsocketService } from 'src/app/services/websocket.service';
   selector: 'app-chat',
   templateUrl: './chat.page.html',
   styleUrls: ['./chat.page.scss'],
-  providers: [WebsocketService, ChatService]
 })
 export class ChatPage implements OnInit {
 
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index b5c8616b7..0407c336a 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -8,7 +8,6 @@ import { environment } from 'src/environments/environment';
 import { Storage } from '@ionic/storage';
 import { Message } from 'src/app/models/message.model';
 import { Observable, Subject } from "rxjs/Rx";
-import { WebsocketService } from './websocket.service';
 
 @Injectable({
   providedIn: 'root'
@@ -31,7 +30,6 @@ export class ChatService {
     private authService: AuthService,
     private storage: Storage,
     private storageService:StorageService,
-    private wsService: WebsocketService,
     )
     {
       this.loggedUserChat = authService.ValidatedUserChat;
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 54fc6222d..7af0271c0 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -13,11 +13,11 @@ export class RoomService {
 
   chatUser: ChatUserService[] = []
   id = ''
-  name = ''
+  name = 'teste'
   _updatedAt = {}
   private hasLoadHistory = false
   duration  = ''
-  
+
 
   constructor(
     public WsChatService: WsChatService,
@@ -61,7 +61,7 @@ export class RoomService {
 
     this.WsChatService.loadHistory(this.id, limit).then((message:any) => {
       console.log('loadHistory', message)
-      
+
       message.result.messages.reverse().forEach(element => {
         console.log('element', element)
         element = this.fix_updatedAt(element)
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 7b8ab1509..e78524a15 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -113,7 +113,7 @@ export class WsChatMethodsService {
   }
 
   private isIndividual(roomData) {
-    return !roomData.fname
+    return roomData.t == "d";
   }
 
 }

From 9fb974c3686ac4749b839c62d0ad7deb1d18cf80 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 14:34:19 +0100
Subject: [PATCH 080/112] fix login

---
 src/app/pages/login/login.page.ts |  3 +-
 src/app/services/auth.service.ts  | 53 ++++++++++++++++---------------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 5792e916b..a17cc9c11 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -119,7 +119,8 @@ export class LoginPage implements OnInit {
             this.changeProfileService.run()
             await this.authService.loginChat(this.userattempt);
             this.getToken();
-            this.router.navigate(['/pin']);
+            alert('redirect')
+            this.router.navigateByUrl('/ping', { replaceUrl: true });
           }
 
         }
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index e4b0d96da..cd039328f 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -106,40 +106,41 @@ export class AuthService {
     }
 
     //Login to rocketChat server
-    async loginChat(user: UserForm): Promise<boolean> {
+    async loginChat(user: UserForm) {
       let postData = {
         "user": user.username,
         "password": user.password,
       }
 
 
-      this.WsChatService.connect();
-      this.WsChatService.login().then((message) => {
-        console.log('rocket chat login successfully', message)
-        this.WsChatService.temporaryStatus('online')
-      }).catch((message)=>{
-        console.log('rocket chat login failed', message)
-      })
+      setTimeout(()=>{
+        this.WsChatService.connect();
+        this.WsChatService.login().then((message) => {
+          console.log('rocket chat login successfully', message)
+          this.WsChatService.temporaryStatus('online')
+        }).catch((message)=>{
+          console.log('rocket chat login failed', message)
+        })
+      }, 1)
 
+      // let responseChat = await this.httpService.post('login', postData).toPromise();
 
-      let responseChat = await this.httpService.post('login', postData).toPromise();
-
-      if(responseChat) {
-        console.log('Login to Rocket chat OK');
-        this.ValidatedUserChat = responseChat;
-        localStorage.setItem('userChat', JSON.stringify(responseChat));
-        localStorage.setItem('Meteor.loginToken', responseChat['data'].authToken);
-        localStorage.setItem('Meteor.userId',responseChat['data'].userId);
-        this.cookieService.set('rc_token', responseChat['data'].authToken);
-        this.cookieService.set('rc_uid', responseChat['data'].userId);
-        this.storageService.store(AuthConnstants.AUTH, responseChat);
-        return true;
-      }
-      else{
-        console.log('Network error');
-        this.presentAlert('Network error');
-        return false;
-      }
+      // if(responseChat) {
+      //   console.log('Login to Rocket chat OK');
+      //   this.ValidatedUserChat = responseChat;
+      //   localStorage.setItem('userChat', JSON.stringify(responseChat));
+      //   localStorage.setItem('Meteor.loginToken', responseChat['data'].authToken);
+      //   localStorage.setItem('Meteor.userId',responseChat['data'].userId);
+      //   this.cookieService.set('rc_token', responseChat['data'].authToken);
+      //   this.cookieService.set('rc_uid', responseChat['data'].userId);
+      //   this.storageService.store(AuthConnstants.AUTH, responseChat);
+      //   return true;
+      // }
+      // else{
+      //   console.log('Network error');
+      //   this.presentAlert('Network error');
+      //   return false;
+      // }
     }
 
     //Get user data from RocketChat | global object

From 8349f0f390037daa2af0ec4291c1ddeb1358c0be Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 14:37:42 +0100
Subject: [PATCH 081/112] remove alert

---
 src/app/pages/login/login.page.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index a17cc9c11..160397e3b 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -119,7 +119,6 @@ export class LoginPage implements OnInit {
             this.changeProfileService.run()
             await this.authService.loginChat(this.userattempt);
             this.getToken();
-            alert('redirect')
             this.router.navigateByUrl('/ping', { replaceUrl: true });
           }
 

From 05294d304f6293182a42cadcf72e14cd781dcff1 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 14:51:44 +0100
Subject: [PATCH 082/112] rename function

---
 src/app/services/auth.service.ts         | 4 ++--
 src/app/services/chat/ws-chat.service.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index cd039328f..ce70a4da4 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -42,7 +42,7 @@ export class AuthService {
         this.WsChatService.connect();
         this.WsChatService.login().then((message) => {
           console.log('rocket chat login successfully', message)
-          this.WsChatService.temporaryStatus('online')
+          this.WsChatService.setStatus('online')
         }).catch((message)=>{
           console.log('rocket chat login failed', message)
         })
@@ -117,7 +117,7 @@ export class AuthService {
         this.WsChatService.connect();
         this.WsChatService.login().then((message) => {
           console.log('rocket chat login successfully', message)
-          this.WsChatService.temporaryStatus('online')
+          this.WsChatService.setStatus('online')
         }).catch((message)=>{
           console.log('rocket chat login failed', message)
         })
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 22b7ea55e..2871fee3d 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -174,7 +174,7 @@ export class WsChatService {
     });
   }
 
-  temporaryStatus(status: 'online' | 'busy' | 'away' | 'offline') {
+  setStatus(status: 'online' | 'busy' | 'away' | 'offline') {
     
     const requestId =  uuidv4()
 

From cdc46f43f0e74bca0823a7194fea3b540e7fc096 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 17:08:25 +0100
Subject: [PATCH 083/112] fix

---
 src/app/services/chat/ws-chat.service.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 2871fee3d..710c960b3 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -61,12 +61,15 @@ export class WsChatService {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         if(message.id == requestId ) { // same request send
 
-          if(message.result.token) {
-            this.isLogin = true
+          if(message.result) {
+            if(message.result.token) {
+              
+              this.isLogin = true
 
-            this.ws.wsMsgQueue()
+              this.ws.wsMsgQueue()
 
-            resolve(message)
+              resolve(message)
+            }
           } else {
             this.isLogin = false
             reject(message)

From c5ac6831b0388c8b5ab63761c74ccd14f76f511a Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 13 Jan 2022 21:24:43 +0100
Subject: [PATCH 084/112] save

---
 src/app/models/chatMethod.ts                  |  1 +
 src/app/pages/chat/chat.page.html             | 21 +++++++++----------
 src/app/services/chat/message.service.ts      |  4 +++-
 src/app/services/chat/room.service.ts         |  6 ++++--
 .../services/chat/ws-chat-methods.service.ts  |  3 ++-
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/app/models/chatMethod.ts b/src/app/models/chatMethod.ts
index c813eb88d..2c47f0f4e 100644
--- a/src/app/models/chatMethod.ts
+++ b/src/app/models/chatMethod.ts
@@ -65,6 +65,7 @@ interface FirstUnread {
 }
 
 export interface Message {
+    customFields:any;
     _id: string;
     rid: string;
     msg: string;
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index d49c752c5..0ce60a14c 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -118,30 +118,29 @@
                      (click)="openGroupMessagesPage(group.value.id)" class="item-content flex-grow-1 cursor-pointer">
                       <div class="item-title-time">
                         <div class="item-title" [class.item-title-active]="group.value.id ==idSelected">
-                          {{group.value.name.split('-').join(' ')}}
-                          <ion-label>{{group.value.name.split('-').join(' ')}}</ion-label>TT
+                          <ion-label>{{group.value.name.split('-').join(' ')}}</ion-label>
                         </div>
-                        <!-- <div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.lastMessage && !group.customFields.countDownDate">{{group.value.duration}}</div>
-                        <div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.customFields.countDownDate">{{countDownDate(group.value.customFields.countDownDate, group.value.id)}}</div> -->
+                        <div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.lastMessage && !group.value.customFields.countDownDate">{{group.value.duration}}</div>
+                        <div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.customFields.countDownDate">{{countDownDate(group.value.customFields.countDownDate, group.value.id)}}</div>
                       </div>
-                      <!-- <div *ngIf="group.value.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.value.id ==idSelected">
-                        <div class="item-message">{{group.value.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
-                        <div class="item-files add-ellipsis" *ngIf="group.value.lastMessage.file">
+                      <div *ngIf="group.value.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.value.id ==idSelected">
+                        <div class="item-message">{{group.value.lastMessage.u.name}}: {{group.value.lastMessage.msg}} </div>
+                        <div class="item-files add-ellipsis" *ngIf="group.value.file">
                           <fa-icon *ngIf="group.value.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group.value.id == idSelected"></fa-icon>
                           <fa-icon *ngIf="group.value.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="group.value.id == idSelected"></fa-icon>
-                          <span class="item-files-title"> {{group.value.lastMessage.file.name || group.value.lastMessage.file.subject}}</span>
+                          <span class="item-files-title"> {{group.value.lastMessage.file.name || group.value.file.subject}}</span>
                         </div>
-                        <div  class="item-files" *ngIf="group.value.lastMessage.attachments">
+                        <div  class="item-files" *ngIf="group.value.attachments">
                           <div *ngIf="group.value.value.lastMessage.attachments[0].image_url">
                             <fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="group.value.id == idSelected"></fa-icon>
                             <span> Fotografia</span>
                           </div>
                         </div>
-                      </div> -->
+                      </div>
                     </div>
                   </div>
               </ion-item-sliding>
-              <ion-item-sliding *ngIf="wsChatMethodsService.loadingWholeList || wsChatMethodsService.groupCount">
+              <ion-item-sliding *ngIf="wsChatMethodsService.loadingWholeList || wsChatMethodsService.groupCount < 1">
                 <div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
                   <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-group-chat-grey.svg"></ion-icon></div>
                   <div class="item-content flex-grow-1 cursor-pointer">
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index ffdf4c9cf..9ef101d5d 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -7,6 +7,7 @@ import { chatHistory, ChatMessage, File } from 'src/app/models/chatMethod'
 })
 export class MessageService {
 
+  customFields
   channels = []
   mentions = []
   msg = ''
@@ -20,7 +21,8 @@ export class MessageService {
 
   constructor() { }
 
-  setData({channels, mentions, msg ,rid ,ts, u, _id, _updatedAt, file, attachments}:Message) {
+  setData({customFields, channels, mentions, msg ,rid ,ts, u, _id, _updatedAt, file, attachments}:Message) {
+    this.customFields = customFields
     this.channels = channels
     this.mentions = mentions
     this.msg = msg
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 55b0206b9..af1114b56 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -14,8 +14,9 @@ export class RoomService {
   lastMessage: MessageService;
 
   chatUser: ChatUserService[] = []
+  customFields:any;
   id = ''
-  name = 'teste'
+  name = ''
   _updatedAt = {}
   private hasLoadHistory = false
   duration  = ''
@@ -27,7 +28,8 @@ export class RoomService {
     private MessageService: MessageService,
   ) {}
 
-  setData({id, name, lastMessage, _updatedAt}) {
+  setData({customFields, id, name, lastMessage, _updatedAt}) {
+    this.customFields = customFields
     this.id = id
     this.name = name
     this.lastMessage = lastMessage
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 8547f9384..aa7a30a8c 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -47,10 +47,11 @@ export class WsChatMethodsService {
 
       room = new RoomService(this.WsChatService, new MessageService())
       room.setData({
+        customFields: roomData.customFields,
         id: this.getRoomId(roomData),
         name: this.getRoomName(roomData),
         lastMessage: this.getRoomLastMessage(roomData),
-        _updatedAt: roomData._updatedAt['$date']
+        _updatedAt: new Date(roomData._updatedAt['$date'])
       })
 
       room.receiveMessage()

From a9b510ab9224e3b2ebc3b3841d9658a22909c211 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 13 Jan 2022 23:20:36 +0100
Subject: [PATCH 085/112] save

---
 src/app/services/chat.service.ts              | 39 -------------------
 .../group-messages/group-messages.page.html   |  4 +-
 .../group-messages/group-messages.page.ts     |  8 +++-
 3 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 0407c336a..a0001bff1 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -40,45 +40,6 @@ export class ChatService {
         headers: this.headers,
       };
 
-      /* console.log("CHAT SERVICE");
-
-      wsService.messages = <Subject<any>>this.wsService
-      .connect(environment.apiWsChatUrl)
-      .map((response: MessageEvent): any => {
-          let data = JSON.parse(response.data);
-          console.log(data);
-
-          if(data.msg == 'ping'){
-            wsService.messages.next({msg:'pong'});
-            if(!this.authService.isWsAuthenticated){
-              //this.authService.loginWsChat();
-
-              let msg = {
-                "msg": "method",
-                "method": "login",
-                "id":"1",
-                "params":[
-                  {
-                    "user": { "username": "paulo.pinto" },
-                    "password": "tabteste@006"
-                    }
-                ]
-              }
-              wsService.messages.next(msg);
-              console.log('Authenticate');
-              this.authService.isWsAuthenticated = true;
-
-            }
-            //this.authService.loginWsChat();
-          }
-          if(data.id == '1'){
-            this.authService.wsValidatedUserChat = data;
-          }
-          return (JSON.stringify(data));
-        });
-
-        console.log(wsService.messages) */;
-
     }
 
     getDocumentDetails(url:string){
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index c09032572..ae59a74df 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -23,10 +23,10 @@
           </ion-label>
         </div>
       </div>
-      <div *ngIf="room.customFields.countDownDate" class="d-flex align-items-center yellow-orange pl-10">
+      <!-- <div *ngIf="room.customFields.countDownDate" class="d-flex align-items-center yellow-orange pl-10">
         <i class="far fa-clock font-15" ></i>
         <ion-label class="font-15 pl-10" color="warning">{{countDownDate()}}</ion-label>
-      </div>
+      </div> -->
     </div>
   </ion-toolbar>
 </ion-header>
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 12c5a69bc..73a71cdd8 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -22,6 +22,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
+import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service';
 
 /*
 import * as pdfjsLib from 'pdfjs-dist';
@@ -90,7 +91,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     private processesService: ProcessesService,
     private fileService: FileService,
     public ThemeService: ThemeService,
-    private changeDetectorRef: ChangeDetectorRef
+    private changeDetectorRef: ChangeDetectorRef,
+    public wsChatMethodsService: WsChatMethodsService
   ) {
     this.loggedUserChat = authService.ValidatedUserChat['data'];
     this.isGroupCreated = true;
@@ -101,9 +103,13 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   ngOnChanges(changes: SimpleChanges): void {
     this.getRoomInfo();
     //this.scrollToBottom();
+    //this.wsChatMethodsService.getRoom(this.roomId).loadHistory();
   }
 
   ngOnInit() {
+    alert('Here')
+    //console.log(this.wsChatMethodsService.getRoom(this.roomId).massages);
+
     this.loggedUser=this.loggedUserChat;
     this.getRoomInfo();
     this.serverLongPull();

From 38cd405ead1be365b3a82afc67188e1a7e1fdd7f Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 08:57:11 +0100
Subject: [PATCH 086/112] go to page pin

---
 src/app/pages/login/login.page.ts        | 2 +-
 src/app/services/chat/ws-chat.service.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 160397e3b..7e807d7e6 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -119,7 +119,7 @@ export class LoginPage implements OnInit {
             this.changeProfileService.run()
             await this.authService.loginChat(this.userattempt);
             this.getToken();
-            this.router.navigateByUrl('/ping', { replaceUrl: true });
+            this.router.navigateByUrl('/pin', { replaceUrl: true });
           }
 
         }
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 710c960b3..8bc08b74d 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -62,6 +62,7 @@ export class WsChatService {
         if(message.id == requestId ) { // same request send
 
           if(message.result) {
+            console.log(message)
             if(message.result.token) {
               
               this.isLogin = true

From 8b4be091cb6b9643fa2281f8d1ea7372f263545c Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 14 Jan 2022 09:00:42 +0100
Subject: [PATCH 087/112] save

---
 src/app/pages/chat/chat.page.ts                           | 6 +++---
 src/app/shared/chat/group-messages/group-messages.page.ts | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 102a8c7c2..61508a0c6 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -144,7 +144,7 @@ export class ChatPage implements OnInit {
       console.log("Response from Websocket server: "+msg);
     }); */
 
-    this.load()
+    //this.load()
   }
 
   ngOnInit() {
@@ -156,9 +156,9 @@ export class ChatPage implements OnInit {
     this.authService.userData$.subscribe((res: any) => {
       this.loggedUser = res;
       //console.log(this.loggedUser);
-      this.load();
+      //this.load();
 
-      this.getDirectMessagesDB();
+      //this.getDirectMessagesDB();
     });
 
     /* websocket functions */
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 73a71cdd8..793134b59 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -73,8 +73,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
   @ViewChild('scrollMe') private myScrollContainer: ElementRef;
 
-  pdfurl = "http://www.africau.edu/images/default/sample.pdf";
-
   constructor(
     private menu: MenuController,
     private modalController: ModalController,
@@ -92,7 +90,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     private fileService: FileService,
     public ThemeService: ThemeService,
     private changeDetectorRef: ChangeDetectorRef,
-    public wsChatMethodsService: WsChatMethodsService
+    //public wsChatMethodsService: WsChatMethodsService
   ) {
     this.loggedUserChat = authService.ValidatedUserChat['data'];
     this.isGroupCreated = true;

From 350358d9c0df92161a8da08ca79b08ef80933212 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 09:03:31 +0100
Subject: [PATCH 088/112] remove comments

---
 src/app/pages/login/login.page.ts        |  3 +-
 src/app/services/auth.service.ts         | 36 +++++++++++++-----------
 src/app/services/chat/ws-chat.service.ts |  1 +
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 7e807d7e6..a98ef4b43 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -99,9 +99,10 @@ export class LoginPage implements OnInit {
 
         loader.remove()
 
+        // login to API successfully
         if (attempt) {
 
-          if (attempt.UserId == SessionStore.user.UserId) {
+          if (attempt.UserId == SessionStore.user.UserId) { 
             await this.authService.SetSession(attempt, this.userattempt);
             await this.authService.loginChat(this.userattempt);
             this.getToken();
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index ce70a4da4..1911bc6de 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -114,6 +114,8 @@ export class AuthService {
 
 
       setTimeout(()=>{
+        console.log('login', SessionStore.user.RochetChatUser, SessionStore.user.Password)
+
         this.WsChatService.connect();
         this.WsChatService.login().then((message) => {
           console.log('rocket chat login successfully', message)
@@ -123,24 +125,24 @@ export class AuthService {
         })
       }, 1)
 
-      // let responseChat = await this.httpService.post('login', postData).toPromise();
+      let responseChat = await this.httpService.post('login', postData).toPromise();
 
-      // if(responseChat) {
-      //   console.log('Login to Rocket chat OK');
-      //   this.ValidatedUserChat = responseChat;
-      //   localStorage.setItem('userChat', JSON.stringify(responseChat));
-      //   localStorage.setItem('Meteor.loginToken', responseChat['data'].authToken);
-      //   localStorage.setItem('Meteor.userId',responseChat['data'].userId);
-      //   this.cookieService.set('rc_token', responseChat['data'].authToken);
-      //   this.cookieService.set('rc_uid', responseChat['data'].userId);
-      //   this.storageService.store(AuthConnstants.AUTH, responseChat);
-      //   return true;
-      // }
-      // else{
-      //   console.log('Network error');
-      //   this.presentAlert('Network error');
-      //   return false;
-      // }
+      if(responseChat) {
+        console.log('Login to Rocket chat OK');
+        this.ValidatedUserChat = responseChat;
+        localStorage.setItem('userChat', JSON.stringify(responseChat));
+        localStorage.setItem('Meteor.loginToken', responseChat['data'].authToken);
+        localStorage.setItem('Meteor.userId',responseChat['data'].userId);
+        this.cookieService.set('rc_token', responseChat['data'].authToken);
+        this.cookieService.set('rc_uid', responseChat['data'].userId);
+        this.storageService.store(AuthConnstants.AUTH, responseChat);
+        return true;
+      }
+      else{
+        console.log('Network error');
+        this.presentAlert('Network error');
+        return false;
+      }
     }
 
     //Get user data from RocketChat | global object
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 8bc08b74d..b949d2435 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -67,6 +67,7 @@ export class WsChatService {
               
               this.isLogin = true
 
+              console.log('wsMsgQueue', this.wsMsgQueue)
               this.ws.wsMsgQueue()
 
               resolve(message)

From 96ed821022d863a759976c24c6a6723e6db5a217 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 09:12:27 +0100
Subject: [PATCH 089/112] improve

---
 src/app/services/chat/ws-chat.service.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index b949d2435..6de1931b8 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -12,10 +12,12 @@ import { chatHistory, Rooms } from 'src/app/models/chatMethod';
 export class WsChatService {
 
   isLogin = false;
+  loginResponse = {}
 
   constructor() {}
 
   connect() {
+    if(this.ws.connected == true) { return false }
     
     this.ws.connect();
 
@@ -41,6 +43,9 @@ export class WsChatService {
   }
 
   login() {
+
+    if(this.isLogin == true) { return new Promise((resolve, reject)=>{ resolve(this.loginResponse) }) }
+    
     const requestId =  uuidv4()
 
     const message = {
@@ -66,6 +71,7 @@ export class WsChatService {
             if(message.result.token) {
               
               this.isLogin = true
+              this.loginResponse = message
 
               console.log('wsMsgQueue', this.wsMsgQueue)
               this.ws.wsMsgQueue()

From de0d81dbd7e8f046d53319cc035fae7212d67f54 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 09:20:54 +0100
Subject: [PATCH 090/112] add comments

---
 src/app/services/chat/ws-chat.service.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 6de1931b8..d5bf890ab 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -17,6 +17,7 @@ export class WsChatService {
   constructor() {}
 
   connect() {
+    // dont connect if is already connected
     if(this.ws.connected == true) { return false }
     
     this.ws.connect();
@@ -43,7 +44,7 @@ export class WsChatService {
   }
 
   login() {
-
+    // dont login if is already login
     if(this.isLogin == true) { return new Promise((resolve, reject)=>{ resolve(this.loginResponse) }) }
     
     const requestId =  uuidv4()

From 56d1886f767f5d0d51cecf4e744fd513b71925d0 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 09:33:01 +0100
Subject: [PATCH 091/112] rewrite cod

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

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index d5bf890ab..bfcf3fa86 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -18,7 +18,9 @@ export class WsChatService {
 
   connect() {
     // dont connect if is already connected
-    if(this.ws.connected == true) { return false }
+    if(this.ws.connected == true) { 
+      return false 
+    }
     
     this.ws.connect();
 
@@ -45,7 +47,11 @@ export class WsChatService {
 
   login() {
     // dont login if is already login
-    if(this.isLogin == true) { return new Promise((resolve, reject)=>{ resolve(this.loginResponse) }) }
+    if(this.isLogin == true) { 
+      return new Promise((resolve, reject)=>{ 
+        resolve(this.loginResponse) 
+      }) 
+    }
     
     const requestId =  uuidv4()
 

From 158bfaa4323cbbb248adea827b5035d8492a9e0b Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 09:58:18 +0100
Subject: [PATCH 092/112] remove chat service from login

---
 src/app/pages/login/login.page.ts | 3 +--
 src/app/services/auth.service.ts  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index a98ef4b43..1e4180e07 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -40,8 +40,7 @@ export class LoginPage implements OnInit {
     private clearStoreService: ClearStoreService,
     private changeProfileService: ChangeProfileService,
     public ThemeService: ThemeService,
-    private storageservice: StorageService,
-    private chatService: ChatService,
+    private storageservice: StorageService
   ) {}
 
   ngOnInit() {
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 1911bc6de..797d25a9a 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -20,7 +20,7 @@ export class AuthService {
   headers: HttpHeaders;
   public ValidatedUser: UserSession;
   public wsValidatedUserChat:any;
-  public ValidatedUserChat:any;
+  public ValidatedUserChat:any = {}
   public isWsAuthenticated: boolean = false;
   opts:any;
 

From 896af7fc49eb3cd0b72a7d52b88bd5c5c5050d85 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 14 Jan 2022 10:35:54 +0100
Subject: [PATCH 093/112] multiple changes

---
 src/app/pages/chat/messages/messages.page.html         |  2 +-
 src/app/pages/chat/messages/messages.page.ts           |  2 +-
 src/app/pages/login/login.page.ts                      |  3 +--
 src/app/services/chat/room.service.ts                  |  2 +-
 src/app/services/chat/ws-chat-methods.service.ts       | 10 +++++++---
 .../chat/group-messages/group-messages.page.html       |  2 +-
 .../shared/chat/group-messages/group-messages.page.ts  |  6 +++---
 src/app/shared/chat/messages/messages.page.html        |  2 +-
 src/app/shared/chat/messages/messages.page.ts          |  4 ++--
 9 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index f589e9f12..9b97b2244 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -49,7 +49,7 @@
     </ion-refresher-content>
   </ion-refresher> -->
   <div (click)="handleClick()" class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getRoom(this.roomId).massages; let last = last"
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getDmRoom(this.roomId).massages; let last = last"
     [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId"  >
       <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)" *ngIf="msg.msg !=''">
         <div class="title">
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index aff6d21fa..bad98da93 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -108,7 +108,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       }
     };
 
-    this.wsChatMethodsService.getRoom(this.roomId).loadHistory()
+    this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory()
 
   }
 
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index a98ef4b43..587d052f0 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -41,7 +41,6 @@ export class LoginPage implements OnInit {
     private changeProfileService: ChangeProfileService,
     public ThemeService: ThemeService,
     private storageservice: StorageService,
-    private chatService: ChatService,
   ) {}
 
   ngOnInit() {
@@ -102,7 +101,7 @@ export class LoginPage implements OnInit {
         // login to API successfully
         if (attempt) {
 
-          if (attempt.UserId == SessionStore.user.UserId) { 
+          if (attempt.UserId == SessionStore.user.UserId) {
             await this.authService.SetSession(attempt, this.userattempt);
             await this.authService.loginChat(this.userattempt);
             this.getToken();
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index af1114b56..897d610bf 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -73,8 +73,8 @@ export class RoomService {
         this.massages.push(wewMessage)
       });
 
-    })
 
+    })
     this.hasLoadHistory = true
   }
 
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index aa7a30a8c..99d67d1a9 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -88,12 +88,16 @@ export class WsChatMethodsService {
     }
   }
 
-  getRoom(id): RoomService {
+  getDmRoom(id): RoomService {
     try {
       return this.dm[id]
-    } catch(e) {
+    } catch(e) {}
+  }
+
+  getGroupRoom(id): RoomService {
+    try {
       return this.group[id]
-    }
+    } catch(e) {}
   }
 
   getRoomName(roomData: room) {
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index ae59a74df..5c4a8fa22 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -44,7 +44,7 @@
       <ion-label>A conversa original mantêm-se como chat individual</ion-label>
     </div>
 
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of messages; let last = last">
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getGroupRoom(roomId).massages; let last = last">
       <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.msg !=''" >
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
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 793134b59..fc13c348c 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -90,7 +90,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     private fileService: FileService,
     public ThemeService: ThemeService,
     private changeDetectorRef: ChangeDetectorRef,
-    //public wsChatMethodsService: WsChatMethodsService
+    public wsChatMethodsService: WsChatMethodsService
   ) {
     this.loggedUserChat = authService.ValidatedUserChat['data'];
     this.isGroupCreated = true;
@@ -101,11 +101,11 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   ngOnChanges(changes: SimpleChanges): void {
     this.getRoomInfo();
     //this.scrollToBottom();
-    //this.wsChatMethodsService.getRoom(this.roomId).loadHistory();
+    this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory();
+    console.log('MESSAGES'+this.wsChatMethodsService.getGroupRoom(this.roomId).massages);
   }
 
   ngOnInit() {
-    alert('Here')
     //console.log(this.wsChatMethodsService.getRoom(this.roomId).massages);
 
     this.loggedUser=this.loggedUserChat;
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index df633ae84..053c88603 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -37,7 +37,7 @@
     </ion-refresher-content>
   </ion-refresher>
   <div class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getRoom(roomId).massages; let last = last">
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getDmRoom(roomId).massages; let last = last">
       <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg !=''">
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 7079eb39e..51577d937 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -84,7 +84,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     this.loggedUser = authService.ValidatedUserChat['data'];
   }
   ngOnChanges(changes: SimpleChanges): void {
-    this.wsChatMethodsService.getRoom(this.roomId).loadHistory()
+    this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory()
   }
 
   ngOnInit() {
@@ -214,7 +214,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   sendMessage() {
-    this.wsChatMethodsService.getRoom(this.roomId).send(this.message)
+    this.wsChatMethodsService.getDmRoom(this.roomId).send(this.message)
     this.message = "";
   }
 

From 74cf9c9fd12f994978497a24bffb97136cdee6cf Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 10:37:47 +0100
Subject: [PATCH 094/112] comment test and remove console.logs

---
 .../services/chat/ws-chat-methods.service.ts  |   6 +-
 test/Agenda.spec.ts                           | 136 +++++++++---------
 2 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 89591ea77..bb5788967 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -42,7 +42,7 @@ export class WsChatMethodsService {
     rooms.result.update.forEach((roomData: room) => {
       let room:RoomService;
 
-      console.log(roomData);
+      // console.log(roomData);
 
 
       room = new RoomService(this.WsChatService, new MessageService())
@@ -76,13 +76,13 @@ export class WsChatMethodsService {
   subscribeToRoom() {
     for (const id in this.dm) {
       this.WsChatService.subscribeNotifyRoom(id).then((subscription)=>{
-        console.log('subscription', subscription)
+        // console.log('subscription', subscription)
       })
     }
 
     for (const id in this.group) {
       this.WsChatService.subscribeNotifyRoom(id).then((subscription)=>{
-        console.log('subscription', subscription)
+        // console.log('subscription', subscription)
       })
     }
   }
diff --git a/test/Agenda.spec.ts b/test/Agenda.spec.ts
index 14debd250..55bf52d1a 100644
--- a/test/Agenda.spec.ts
+++ b/test/Agenda.spec.ts
@@ -19,91 +19,91 @@ describe('Puppeteer tests', () => {
         // await page.goto(process.env.PUPPETEER_HOST)
     })
 
-    test('Login', async()=> {
-        await loginTest(page)
-	},30000)
+    // test('Login', async()=> {
+    //     await loginTest(page)
+	// },30000)
 
-    test('[table] Open create event component', async () => {
+    // test('[table] Open create event component', async () => {
 
-        await page.setViewport({width: 1200, height: 720});
-        await page.goto(process.env.PUPPETEER_HOST); // wait until page load
-        await page.waitForSelector('ion-app')
+    //     await page.setViewport({width: 1200, height: 720});
+    //     await page.goto(process.env.PUPPETEER_HOST); // wait until page load
+    //     await page.waitForSelector('ion-app')
 
-        // wait for footer button
-        await page.click('ion-tab-bar ion-tab-button:nth-child(2)')
-        await page.waitForSelector('app-agenda')
+    //     // wait for footer button
+    //     await page.click('ion-tab-bar ion-tab-button:nth-child(2)')
+    //     await page.waitForSelector('app-agenda')
         
-        // click add event
-        await page.click('ion-content  ion-row .cy-add-event')
-        // wait for component
-        await page.waitForSelector('app-new-event')
+    //     // click add event
+    //     await page.click('ion-content  ion-row .cy-add-event')
+    //     // wait for component
+    //     await page.waitForSelector('app-new-event')
         
-        expect(3 + 2).toBe(5);
-    },30000);
+    //     expect(3 + 2).toBe(5);
+    // },30000);
 
 
-    test('[table] Create Event', async () => {
+    // test('[table] Create Event', async () => {
 
-        await page.setViewport({width: 1200, height: 720});
-        await page.goto(process.env.PUPPETEER_HOST); // wait until page load
-        await page.waitForSelector('ion-app')
+    //     await page.setViewport({width: 1200, height: 720});
+    //     await page.goto(process.env.PUPPETEER_HOST); // wait until page load
+    //     await page.waitForSelector('ion-app')
 
-        // wait for footer button
-        await page.click('ion-tab-bar ion-tab-button:nth-child(2)')
-        await page.waitForSelector('app-agenda')
-        // click add event
-        await page.click('ion-content  ion-row .cy-add-event')
-        // wait for component
-        await page.waitForSelector('app-new-event')
+    //     // wait for footer button
+    //     await page.click('ion-tab-bar ion-tab-button:nth-child(2)')
+    //     await page.waitForSelector('app-agenda')
+    //     // click add event
+    //     await page.click('ion-content  ion-row .cy-add-event')
+    //     // wait for component
+    //     await page.waitForSelector('app-new-event')
 
-        // subject
-        await page.type('app-new-event .ion-item-container input', faker.commerce.productDescription() )
-        // Location
-        await page.type('app-new-event .container-div:nth-child(2) input', faker.address.state()+" "+faker.address.city() )
-        // Select Calendar
-        // await page.click('app-new-event .container-div:nth-child(3) .mat-form-field-flex')
-        // await page.waitForSelector('.cdk-overlay-connected-position-bounding-box')
-        // await page.click('.cdk-overlay-connected-position-bounding-box mat-option')
-        // select event type
-        // await page.click('app-new-event .container-div:nth-child(4) .mat-form-field-flex')
-        // await page.waitForSelector('.cdk-overlay-connected-position-bounding-box')
-        // await page.click('.cdk-overlay-connected-position-bounding-box mat-option')
+    //     // subject
+    //     await page.type('app-new-event .ion-item-container input', faker.commerce.productDescription() )
+    //     // Location
+    //     await page.type('app-new-event .container-div:nth-child(2) input', faker.address.state()+" "+faker.address.city() )
+    //     // Select Calendar
+    //     // await page.click('app-new-event .container-div:nth-child(3) .mat-form-field-flex')
+    //     // await page.waitForSelector('.cdk-overlay-connected-position-bounding-box')
+    //     // await page.click('.cdk-overlay-connected-position-bounding-box mat-option')
+    //     // select event type
+    //     // await page.click('app-new-event .container-div:nth-child(4) .mat-form-field-flex')
+    //     // await page.waitForSelector('.cdk-overlay-connected-position-bounding-box')
+    //     // await page.click('.cdk-overlay-connected-position-bounding-box mat-option')
 
-        // select start day
-        // await page.click('app-new-event .container-div:nth-child(5) button')
-        // await page.waitForSelector('.cdk-overlay-connected-position-bounding-box')
-        // await page.click('.mat-calendar-next-button')
-        // let selectedFDay = Math.floor(Math.random()*(25-1+1)+1);
-        // let days = await page.$$(` .mat-calendar-body-cell `)
-        // await days[selectedFDay].click()
-        // await page.click('.cdk-overlay-connected-position-bounding-box .actions  button')
+    //     // select start day
+    //     // await page.click('app-new-event .container-div:nth-child(5) button')
+    //     // await page.waitForSelector('.cdk-overlay-connected-position-bounding-box')
+    //     // await page.click('.mat-calendar-next-button')
+    //     // let selectedFDay = Math.floor(Math.random()*(25-1+1)+1);
+    //     // let days = await page.$$(` .mat-calendar-body-cell `)
+    //     // await days[selectedFDay].click()
+    //     // await page.click('.cdk-overlay-connected-position-bounding-box .actions  button')
 
-        // select end day
-        // await page.click('app-new-event .container-div:nth-child(6) button')
-        // await page.waitForSelector('.cdk-overlay-connected-position-bounding-box')
-        // await page.click('.mat-calendar-next-button')
-        // days = await page.$$(` .mat-calendar-body-cell `)
-        // await days[selectedFDay+1].click()
-        // await page.click('.cdk-overlay-connected-position-bounding-box .actions  button')
+    //     // select end day
+    //     // await page.click('app-new-event .container-div:nth-child(6) button')
+    //     // await page.waitForSelector('.cdk-overlay-connected-position-bounding-box')
+    //     // await page.click('.mat-calendar-next-button')
+    //     // days = await page.$$(` .mat-calendar-body-cell `)
+    //     // await days[selectedFDay+1].click()
+    //     // await page.click('.cdk-overlay-connected-position-bounding-box .actions  button')
 
-        // await page.click('app-new-event .container-div:nth-child(7) .mat-form-field-flex')
-        // await page.waitForSelector('.cdk-overlay-connected-position-bounding-box')
-        // await page.click('.cdk-overlay-connected-position-bounding-box mat-option')
+    //     // await page.click('app-new-event .container-div:nth-child(7) .mat-form-field-flex')
+    //     // await page.waitForSelector('.cdk-overlay-connected-position-bounding-box')
+    //     // await page.click('.cdk-overlay-connected-position-bounding-box mat-option')
 
-        await page.click('app-new-event .container-div:nth-child(8) .add-people')
-        await page.waitForSelector('app-attendee-modal .ng-star-inserted:nth-child(2)')
-        await page.click('app-attendee-modal .ng-star-inserted:nth-child(2)')
-        // save
-        await page.click('app-attendee-modal ion-footer ion-buttons:nth-child(2)')
-        // save
-        let buttons = await page.$$('app-new-event ion-footer ion-buttons')
-        buttons[1].click()
+    //     await page.click('app-new-event .container-div:nth-child(8) .add-people')
+    //     await page.waitForSelector('app-attendee-modal .ng-star-inserted:nth-child(2)')
+    //     await page.click('app-attendee-modal .ng-star-inserted:nth-child(2)')
+    //     // save
+    //     await page.click('app-attendee-modal ion-footer ion-buttons:nth-child(2)')
+    //     // save
+    //     let buttons = await page.$$('app-new-event ion-footer ion-buttons')
+    //     buttons[1].click()
 
-        await page.waitForSelector('.notification .success')
+    //     await page.waitForSelector('.notification .success')
 
 
-        expect(3 + 2).toBe(5);
-    },60000);
+    //     expect(3 + 2).toBe(5);
+    // },60000);
 
 });
 

From 04bc2f8a1a376186c21f63be4e488c6ca629ddff Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 10:46:44 +0100
Subject: [PATCH 095/112] improve get room id

---
 src/app/services/chat/ws-chat-methods.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index b0609edd6..a9d5b05b8 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -56,7 +56,7 @@ export class WsChatMethodsService {
 
       room.receiveMessage()
 
-      let roomId = roomData.lastMessage.rid
+      let roomId = this.getRoomId(roomData)
 
       if(this.isIndividual(roomData)) {
         this.dm[roomId] = room
@@ -116,7 +116,7 @@ export class WsChatMethodsService {
   }
 
   getRoomId(roomData:room) {
-    return roomData.lastMessage.rid
+    return roomData._id
   }
 
   getRoomLastMessage(roomData: room) {

From c4b6abe094e3f210214d0ff61487a368b3632919 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 10:53:05 +0100
Subject: [PATCH 096/112] change method to streamRoomMessages

---
 src/app/services/chat/ws-chat-methods.service.ts | 4 ++--
 src/app/services/chat/ws-chat.service.ts         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index a9d5b05b8..b45220338 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -76,13 +76,13 @@ export class WsChatMethodsService {
 
   subscribeToRoom() {
     for (const id in this.dm) {
-      this.WsChatService.subscribeNotifyRoom(id).then((subscription)=>{
+      this.WsChatService.streamRoomMessages(id).then((subscription)=>{
         // console.log('subscription', subscription)
       })
     }
 
     for (const id in this.group) {
-      this.WsChatService.subscribeNotifyRoom(id).then((subscription)=>{
+      this.WsChatService.streamRoomMessages(id).then((subscription)=>{
         // console.log('subscription', subscription)
       })
     }
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index bfcf3fa86..33e460866 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -236,6 +236,7 @@ export class WsChatService {
 
   }
 
+
   /**
    * @param roomId
    * @param key

From 0a72b14f2aabdeef2642abcd77093222f7a3ad83 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 11:47:55 +0100
Subject: [PATCH 097/112] improve

---
 src/app/services/chat/room.service.ts         | 16 ++++++++++++-
 .../services/chat/ws-chat-methods.service.ts  |  7 +++---
 src/app/services/chat/ws-chat.service.ts      | 24 ++++++++++++++-----
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 897d610bf..4d067250b 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -39,7 +39,7 @@ export class RoomService {
   }
 
   receiveMessage() {
-    this.WsChatService.receiveLiveMessageFromRoom(
+    this.WsChatService.receiveMyMessageConfirmation(
       this.id,
       (ChatMessage:ChatMessage) => {
 
@@ -51,6 +51,20 @@ export class RoomService {
         this.ToastService.presentToast('nova mensagem')
       }
     )
+
+    this.WsChatService.receiveLiveMessageFromRoom(
+      this.id,
+      (ChatMessage) => {
+        ChatMessage = ChatMessage.fields.args[0]
+        ChatMessage = this.fix_updatedAt(ChatMessage)
+        const message = new MessageService()
+        this.ToastService.presentToast('nova mensagem')
+        message.setData(ChatMessage)
+        this.massages.push(message)
+        this.calDateDuration(ChatMessage.result._updatedAt)
+        
+      }
+    )
   }
 
   send(msg) {
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index b45220338..c13c7303a 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -28,6 +28,7 @@ export class WsChatMethodsService {
     (async()=>{
       await this.getAllRooms();
       this.subscribeToRoom()
+      
     })()
 
   }
@@ -70,20 +71,20 @@ export class WsChatMethodsService {
 
     });
 
-    console.log('this.group', this.group)
     this.loadingWholeList = false
   }
 
   subscribeToRoom() {
+
     for (const id in this.dm) {
       this.WsChatService.streamRoomMessages(id).then((subscription)=>{
-        // console.log('subscription', subscription)
+        console.log('streamRoomMessages', subscription)
       })
     }
 
     for (const id in this.group) {
       this.WsChatService.streamRoomMessages(id).then((subscription)=>{
-        // console.log('subscription', subscription)
+        console.log('streamRoomMessages', subscription)
       })
     }
   }
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 33e460866..9dcad106b 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -74,13 +74,11 @@ export class WsChatService {
         if(message.id == requestId ) { // same request send
 
           if(message.result) {
-            console.log(message)
             if(message.result.token) {
               
               this.isLogin = true
               this.loginResponse = message
 
-              console.log('wsMsgQueue', this.wsMsgQueue)
               this.ws.wsMsgQueue()
 
               resolve(message)
@@ -242,7 +240,7 @@ export class WsChatService {
    * @param key
    * @param funx
    */
-  receiveLiveMessageFromRoom(roomId, funx: Function) {
+  receiveMyMessageConfirmation(roomId, funx: Function) {
 
     this.ws.registerCallback({
       type:'Onmessage',
@@ -261,6 +259,21 @@ export class WsChatService {
 
   }
 
+  receiveLiveMessageFromRoom(roomId, funx: Function) {
+
+    this.ws.registerCallback({
+      type:'Onmessage',
+      funx:(message)=>{
+        if(message.msg =='changed' && message.collection == 'stream-room-messages') {
+          if(message.fields.args[0].rid == roomId) {
+            funx(message)
+          }
+        }
+      }
+    })
+  }
+
+
   streamRoomMessages(roomId : string) {
 
     const requestId =  uuidv4()
@@ -270,7 +283,7 @@ export class WsChatService {
       "id": requestId,
       "name": "stream-room-messages",
       "params":[
-        `${roomId}/event`,
+        `${roomId}`,
           false
       ]
     }
@@ -279,7 +292,7 @@ export class WsChatService {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
-        if(message.msg == 'ready' || deepFind(message, 'subs.0') == requestId) { // same request send
+        if(message.id == requestId) { // same request send
           resolve(message)
           return true
         }
@@ -375,7 +388,6 @@ export class WsChatService {
     },
 
     onmessage:(event: any)=> {
-      // if(this.ws.connected == false) { return true } 
       const data = JSON.parse(event.data)
 
       for (const [key, value] of Object.entries(this.wsCallbacks)) {

From a8e2b48c33f5def140997306193a114450709799 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 14 Jan 2022 11:53:14 +0100
Subject: [PATCH 098/112] save

---
 src/app/pages/chat/chat.page.ts               | 100 +-----------------
 .../group-messages/group-messages.page.html   |   2 +-
 .../group-messages/group-messages.page.ts     |   5 +-
 .../services/chat/ws-chat-methods.service.ts  |   1 -
 .../group-messages/group-messages.page.ts     |  42 --------
 5 files changed, 8 insertions(+), 142 deletions(-)

diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 61508a0c6..086cf839b 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -138,39 +138,21 @@ export class ChatPage implements OnInit {
 
     this.showLoader = true;
 
-    console.log("CHAT PAGE");
-
-    /* wsService.messages.subscribe(msg => {
-      console.log("Response from Websocket server: "+msg);
-    }); */
-
     //this.load()
   }
 
   ngOnInit() {
 
-    console.log(this.loggedUserChat);
-
     this.segment = "Contactos";
 
     this.authService.userData$.subscribe((res: any) => {
       this.loggedUser = res;
-      //console.log(this.loggedUser);
-      //this.load();
-
-      //this.getDirectMessagesDB();
     });
 
-    /* websocket functions */
-    //this.sendMsg();
-
-    /* Fim websocket functions */
     this.hideRefreshButton();
     this.getChatMembers();
 
-    //Teste
     let t = this.showDateDuration(new Date());
-    //console.log(t);
 
     this.setStatus('away');
     /* if(this.dataService.get("newGroup")){
@@ -232,28 +214,6 @@ export class ChatPage implements OnInit {
     }
   }
 
-  /* loadWsChatMessages(){
-    this.chatService.messages.subscribe(msg => {
-      console.log("Response from Websocket server: "+msg);
-    });
-  } */
-
-
-/*   loadMessage(){
-    this.wsService.messages.subscribe(msg => {
-      console.log("Response from websocket: " + msg);
-    });
-  }
-  sendMsg() {
-    console.log("new message from client to websocket: ", this.message);
-    this.wsService.messages.next(this.message);
-    this.message.msg = "";
-    this.loadMessage();
-  } */
-
-
-  /* Fim websockets functions */
-
   closeAllDesktopComponents() {
     this.showMessages = false;
     this.showContacts = false;
@@ -396,33 +356,20 @@ export class ChatPage implements OnInit {
   }
 
   onSegmentChange() {
-    this.load();
+    //this.load();
   }
 
   doRefresh(event) {
     setTimeout(() => {
-      this.load();
+      //this.load();
       event.target.complete();
     }, 1000);
   }
 
   refreshing() {
-    this.load();
+    //this.load();
   }
 
-  load() {
-    switch (this.segment) {
-      case "Contactos":
-        this.showLoader = true;
-        this.getDirectMessages();
-        break;
-
-      case "Grupos":
-        this.showLoader = true;
-        this.getGroups();
-        break;
-    }
-  }
   customRoom() {
     let params = new HttpParams();
     params = params.set("types", "c");
@@ -558,47 +505,6 @@ export class ChatPage implements OnInit {
     }
   }
 
-  async getDirectMessages(event?) {
-    this.chatService.getAllDirectMessages().subscribe(async (res: any) => {
-      this.showLoader = false;
-      this.transformDataRoomList(res.ims)
-      this.getDirectMessagesDB()
-      //console.log('Chat list', res);
-
-      if (res != 200) {
-        /* if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-          this.userDirectMessages = res.ims.sort((a, b) => {
-          var dateA = new Date(a._updatedAt).getTime();
-          var dateB = new Date(b._updatedAt).getTime();
-          return dateB - dateA;
-        });
-        }  */
-        //console.log(res.ims);
-
-        //console.log(this.userDirectMessages);
-
-        if (this.route.url != "/home/chat") {
-          //console.log("Timer message stop")
-        }
-        else {
-          //console.log('TIMER');
-          //Check if modal is opened
-          if (this.segment == "Contactos" && this.showMessages != true) {
-            await new Promise(resolve => setTimeout(resolve, 1000));
-            //await this.getDirectMessages();
-            //console.log('Timer contactos list running')
-          }
-          else {
-            //console.log('No timer!');
-          }
-        }
-      }
-      else {
-        //await this.getDirectMessages();
-      }
-    });
-  }
-
   showDateDuration(start: any) {
     return this.timeService.showDateDuration(start);
   }
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index 0d50edaa1..b7e81e026 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -56,7 +56,7 @@
       <ion-label>Esta conversa passou a grupo TIAGO</ion-label><br />
       <ion-label>A conversa original mantêm-se como chat individual</ion-label>
     </div>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of messages; let last = last" [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId">
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getGroupRoom(roomId).massages; let last = last" [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId">
       <div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.msg !=''" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
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 927576899..99df699bc 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -23,6 +23,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
+import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service';
 
 @Component({
   selector: 'app-group-messages',
@@ -82,7 +83,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private fileService: FileService,
     private toastService: ToastService,
     public ThemeService: ThemeService,
-    private changeDetectorRef: ChangeDetectorRef
+    private changeDetectorRef: ChangeDetectorRef,
+    public wsChatMethodsService: WsChatMethodsService
   ) {
     this.loggedUserChat = authService.ValidatedUserChat['data'];
     this.isGroupCreated = true;
@@ -92,6 +94,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
         this.modalController.dismiss();
       }
     };
+    this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory();
   }
 
   ngOnInit() {
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index b45220338..845fd0d80 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -24,7 +24,6 @@ export class WsChatMethodsService {
   constructor(
     private WsChatService: WsChatService
   ) {
-
     (async()=>{
       await this.getAllRooms();
       this.subscribeToRoom()
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 fc13c348c..e51c0e0a1 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -110,7 +110,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
     this.loggedUser=this.loggedUserChat;
     this.getRoomInfo();
-    this.serverLongPull();
     this.setStatus('online');
     this.getChatMembers();
   }
@@ -755,47 +754,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     });
   }
 
-  async serverLongPull(){
-
-    if(this.route.url != "/home/chat" && document.querySelector('app-group-messages')){
-      console.log("Timer message stop")
-    }
-    else
-    {
-
-      this.chatService.getPrivateGroupMessages(this.roomId).subscribe(async res =>
-      {
-        if(res['success'] == true) {
-          // Show Error
-          //showMessage(response.statusText);
-          //this.loadMessages()
-          let msgOnly = res['messages'].filter(data => data.t != 'au');
-          this.messages = msgOnly.reverse();
-          console.log(this.messages);
-          // Reconnect in one second
-
-          if(document.querySelector('app-group-messages')){
-              await new Promise(resolve => setTimeout(resolve,5000));
-              this.getGroups.emit();
-              console.log('Timer message running')
-              await this.serverLongPull();
-          }
-
-        }
-        else {
-          alert('HEY2')
-          // Got message
-          //let message = await response.text();
-          //this.loadMessages()
-          await this.serverLongPull();
-        }
-      }, (error)=>{
-        console.log(error);
-        this.serverLongPull();
-      });
-    }
-  }
-
 
   sliderOpts = {
     zoom: false,

From af191cc42ca525fea104e8ace163fcd25bed7b6e Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 14 Jan 2022 12:03:33 +0100
Subject: [PATCH 099/112] save

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

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 4d067250b..27dc6bd79 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -39,7 +39,7 @@ export class RoomService {
   }
 
   receiveMessage() {
-    this.WsChatService.receiveMyMessageConfirmation(
+    /* this.WsChatService.receiveMyMessageConfirmation(
       this.id,
       (ChatMessage:ChatMessage) => {
 
@@ -47,10 +47,11 @@ export class RoomService {
         const message = new MessageService()
         message.setData(ChatMessage.result)
         this.massages.push(message)
+        this.lastMessage.msg = message.msg;
         this.calDateDuration(ChatMessage.result._updatedAt)
         this.ToastService.presentToast('nova mensagem')
       }
-    )
+    ) */
 
     this.WsChatService.receiveLiveMessageFromRoom(
       this.id,
@@ -59,10 +60,11 @@ export class RoomService {
         ChatMessage = this.fix_updatedAt(ChatMessage)
         const message = new MessageService()
         this.ToastService.presentToast('nova mensagem')
+        this.lastMessage.msg = message.msg;
         message.setData(ChatMessage)
         this.massages.push(message)
         this.calDateDuration(ChatMessage.result._updatedAt)
-        
+
       }
     )
   }

From c1c06c7a48b1415a2a82daaba28a9c22cfb97c93 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 12:13:55 +0100
Subject: [PATCH 100/112] fix

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

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 4d067250b..f7e469f4f 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -46,9 +46,9 @@ export class RoomService {
         ChatMessage = this.fix_updatedAt(ChatMessage)
         const message = new MessageService()
         message.setData(ChatMessage.result)
-        this.massages.push(message)
+        // this.massages.push(message)
         this.calDateDuration(ChatMessage.result._updatedAt)
-        this.ToastService.presentToast('nova mensagem')
+        //this.ToastService.presentToast('nova mensagem')
       }
     )
 
@@ -57,12 +57,14 @@ export class RoomService {
       (ChatMessage) => {
         ChatMessage = ChatMessage.fields.args[0]
         ChatMessage = this.fix_updatedAt(ChatMessage)
-        const message = new MessageService()
-        this.ToastService.presentToast('nova mensagem')
-        message.setData(ChatMessage)
-        this.massages.push(message)
-        this.calDateDuration(ChatMessage.result._updatedAt)
         
+        this.ToastService.presentToast('nova mensagem')
+        const message = new MessageService()
+        message.setData(ChatMessage)
+        this.lastMessage.msg = message.msg
+        console.log('ChatMessage.result._updatedAt', ChatMessage._updatedAt)
+        this.calDateDuration(ChatMessage._updatedAt)
+        this.massages.push(message)
       }
     )
   }

From 6007e2cdf8a4d97def527a8275b6efe9f165b85e Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 14 Jan 2022 12:18:30 +0100
Subject: [PATCH 101/112] save

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

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 27dc6bd79..81b586f41 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -62,9 +62,8 @@ export class RoomService {
         this.ToastService.presentToast('nova mensagem')
         this.lastMessage.msg = message.msg;
         message.setData(ChatMessage)
-        this.massages.push(message)
         this.calDateDuration(ChatMessage.result._updatedAt)
-
+        this.massages.push(message)
       }
     )
   }

From 2bbe9e859c48eeba264cbc6e636e6c207a686e77 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 14 Jan 2022 12:29:44 +0100
Subject: [PATCH 102/112] add send with wsAPI

---
 .../group-messages/group-messages.page.ts     | 14 ++---------
 .../group-messages/group-messages.page.ts     | 25 +++----------------
 2 files changed, 5 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 99df699bc..b7a9dbcaf 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -306,18 +306,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
 
 
-  sendMessage(){
-    let body = {
-      "message": { "rid": this.roomId, "msg": this.message }
-    }
-
-    this.chatService.sendMessage(body).subscribe(res=> {
-      this.getRoomInfo();
-      this.scrollingOnce = true;
-
-    },(error) => {
-
-    });
+  sendMessage() {
+    this.wsChatMethodsService.getDmRoom(this.roomId).send(this.message)
     this.message = "";
   }
 
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 e51c0e0a1..34786d1ab 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -296,31 +296,12 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     } */
   }
 
-  sendMessage(){
-    let body = {
-      "message":
-      {
-        "rid": this.roomId,
-        "msg": this.message,
-        /* "attachments": [{
-          "color": "#ff0000",
-          "text": "Yay for gruggy!",
-          "title": "Attachment Example",
-          "title_link": "https://youtube.com",
-          "title_link_download": false,
-          "image_url": "https://upload.wikimedia.org/wikipedia/commons/e/ee/Chain_link_icon.png",
-        }] */
-      }
-    }
-
-    this.chatService.sendMessage(body).subscribe(res=> {
-     /*  this.loadGroupMessages(); */
-     //this.getRoomInfo();
-     this.scrollingOnce = true;
-    });
+  sendMessage() {
+    this.wsChatMethodsService.getDmRoom(this.roomId).send(this.message)
     this.message = "";
   }
 
+
   deleteMessage(msgId:string){
     let body = {
       "roomId": this.roomId,

From 3bf00c889f731164ecf7024ebb6698d5755c8fbb Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 14 Jan 2022 12:38:51 +0100
Subject: [PATCH 103/112] fix name in dm

---
 src/app/shared/chat/messages/messages.page.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 053c88603..34574e784 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -2,9 +2,9 @@
   <ion-toolbar class="header-toolbar">
     <div class="main-header">
       <div class="header-top">
-        <div class="middle" *ngFor="let users of dmUsers">
-          <ion-label class="title">{{ wsChatMethodsService.getRoom(roomId).name }}</ion-label>
-          <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
+        <div class="middle">
+          <ion-label class="title">{{ wsChatMethodsService.getDmRoom(roomId).name }}</ion-label>
+          <!-- <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span> -->
         </div>
         <div hidden class="right">
           <button class="btn-no-color" (click)="_openMessagesOptions()">

From d718d0e3a9c975b4286662166b29aec369332f9b Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 14 Jan 2022 14:22:31 +0100
Subject: [PATCH 104/112] save

---
 src/app/pages/chat/group-messages/group-messages.page.html  | 4 ++--
 src/app/pages/chat/messages/messages.page.html              | 6 +++---
 src/app/services/auth.service.ts                            | 2 +-
 src/app/shared/chat/group-messages/group-messages.page.html | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index b7e81e026..5221c7d99 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -11,7 +11,7 @@
         </div>
         <div class="middle-container" *ngIf="!showMessageOptions">
           <div class="middle add-ellipsis">
-            <ion-label class="title">{{roomName}}</ion-label>
+            <ion-label class="title">{{wsChatMethodsService.getGroupRoom(roomId).name}}</ion-label>
           </div>
         </div>
         <div class="middle-container-options" *ngIf="showMessageOptions">
@@ -53,7 +53,7 @@
 
   <div (click)="handleClick()" class="messages overflow-y-auto" #scrollMe>
     <div class="welcome-text">
-      <ion-label>Esta conversa passou a grupo TIAGO</ion-label><br />
+      <ion-label>Esta conversa passou a grupo</ion-label><br />
       <ion-label>A conversa original mantêm-se como chat individual</ion-label>
     </div>
     <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getGroupRoom(roomId).massages; let last = last" [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId">
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 9b97b2244..d430f7781 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -12,9 +12,9 @@
           </button>
         </div>
         <div class="middle-container" *ngIf="!showMessageOptions">
-          <div class="middle" *ngFor="let users of dmUsers">
-            <ion-label class="title">{{users.name}}</ion-label>
-            <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
+          <div class="middle">
+            <ion-label class="title">{{wsChatMethodsService.getDmRoom(roomId).name}}</ion-label>
+            <!-- <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span> -->
           </div>
         </div>
         <div class="middle-container-options" *ngIf="showMessageOptions">
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 797d25a9a..ebbd691df 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -42,7 +42,7 @@ export class AuthService {
         this.WsChatService.connect();
         this.WsChatService.login().then((message) => {
           console.log('rocket chat login successfully', message)
-          this.WsChatService.setStatus('online')
+          this.WsChatService.setStatus('busy')
         }).catch((message)=>{
           console.log('rocket chat login failed', message)
         })
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 5c4a8fa22..e4b1e4988 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="header-top">
         <div class="middle">
-          <ion-label class="title">{{roomName}}</ion-label>
+          <ion-label class="title">{{wsChatMethodsService.getGroupRoom(roomId).name}}</ion-label>
         </div>
         <div class="right">
           <button class="btn-no-color" (click)="openGroupMessagesOptions()">

From 9d028846bf7bb66fad12b1225841c4471953b185 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 14:50:47 +0100
Subject: [PATCH 105/112] fix scroll

---
 .../pages/chat/group-messages/group-messages.page.ts |  3 ++-
 src/app/pages/chat/messages/messages.page.ts         |  3 ++-
 src/app/services/chat/room.service.ts                |  7 +++++++
 src/app/services/chat/ws-chat.service.ts             |  3 +++
 .../chat/group-messages/group-messages.page.ts       |  3 ++-
 src/app/shared/chat/messages/messages.page.ts        | 12 ++++++++++--
 6 files changed, 26 insertions(+), 5 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 99df699bc..6233650f7 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -95,6 +95,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       }
     };
     this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory();
+    this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked
   }
 
   ngOnInit() {
@@ -204,7 +205,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     } catch(err) { }
   }
 
-  scrollToBottomClicked(): void {
+  scrollToBottomClicked = () => {
     try {
       this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
     } catch(err) { }
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index bad98da93..1baabf357 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -109,6 +109,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     };
 
     this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory()
+    this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked
 
   }
 
@@ -283,7 +284,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     } catch (err) { }
   }
 
-  scrollToBottomClicked(): void {
+  scrollToBottomClicked = () => {
     try {
       this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
     } catch (err) { }
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 23af0e68a..804fc5b1b 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -23,6 +23,8 @@ export class RoomService {
 
   private ToastService = ToastsService
 
+  scrollDown = () => {}
+
   constructor(
     public WsChatService: WsChatService,
     private MessageService: MessageService,
@@ -52,6 +54,11 @@ export class RoomService {
         this.lastMessage.msg = message.msg
         this.calDateDuration(ChatMessage._updatedAt)
         this.massages.push(message)
+
+        setTimeout(()=>{
+          this.scrollDown()
+        }, 100)
+        
       }
     )
   }
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 9dcad106b..ea9025388 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -261,8 +261,11 @@ export class WsChatService {
 
   receiveLiveMessageFromRoom(roomId, funx: Function) {
 
+    const key = roomId +  funx;
+
     this.ws.registerCallback({
       type:'Onmessage',
+      key: key,
       funx:(message)=>{
         if(message.msg =='changed' && message.collection == 'stream-room-messages') {
           if(message.fields.args[0].rid == roomId) {
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 e51c0e0a1..8bf024574 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -103,6 +103,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     //this.scrollToBottom();
     this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory();
     console.log('MESSAGES'+this.wsChatMethodsService.getGroupRoom(this.roomId).massages);
+    this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked
   }
 
   ngOnInit() {
@@ -141,7 +142,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     } catch(err) { }
   }
 
-  scrollToBottomClicked(): void {
+  scrollToBottomClicked = () => {
     try {
       this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
     } catch(err) { }
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 51577d937..373dfee28 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -20,6 +20,7 @@ import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
 import { WsChatMethodsService} from 'src/app/services/chat/ws-chat-methods.service'
+import { WsChatService } from 'src/app/services/chat/ws-chat.service'
 
 @Component({
   selector: 'app-messages',
@@ -78,13 +79,19 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     public ThemeService: ThemeService,
     private changeDetectorRef: ChangeDetectorRef,
     private router: Router,
-    public wsChatMethodsService: WsChatMethodsService
+    public wsChatMethodsService: WsChatMethodsService,
+    public WsChatService: WsChatService
   ) {
 
     this.loggedUser = authService.ValidatedUserChat['data'];
+
+
   }
   ngOnChanges(changes: SimpleChanges): void {
     this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory()
+
+    this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked
+    
   }
 
   ngOnInit() {
@@ -142,7 +149,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     } catch(err) { }
   }
 
-  scrollToBottomClicked(): void {
+  scrollToBottomClicked = () => {
+    console.log('scroll')
     try {
       this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
       //this.scrollingOnce = false;

From 46c6860625c32bed80f9cae4734aae6c161df45c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 14:53:27 +0100
Subject: [PATCH 106/112] fix

---
 src/app/services/chat/ws-chat.service.ts | 25 ------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index ea9025388..d42a923ab 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -234,31 +234,6 @@ export class WsChatService {
 
   }
 
-
-  /**
-   * @param roomId
-   * @param key
-   * @param funx
-   */
-  receiveMyMessageConfirmation(roomId, funx: Function) {
-
-    this.ws.registerCallback({
-      type:'Onmessage',
-      funx:(message)=>{
-        if(message.msg =='result') {
-          if(message.result) {
-            if(message.result.msg) {
-              if(message.result.rid == roomId) {
-                funx(message)
-              }
-            }
-          }
-        }
-      }
-    })
-
-  }
-
   receiveLiveMessageFromRoom(roomId, funx: Function) {
 
     const key = roomId +  funx;

From e8408bc1ff5cefbdd8628e6e5cf93711622f2d05 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 14:58:47 +0100
Subject: [PATCH 107/112] fix

---
 src/app/pages/chat/group-messages/group-messages.page.ts  | 8 +++++++-
 src/app/pages/chat/messages/messages.page.ts              | 4 ++++
 src/app/services/chat/room.service.ts                     | 5 +++++
 src/app/shared/chat/group-messages/group-messages.page.ts | 5 +++++
 src/app/shared/chat/messages/messages.page.ts             | 5 +++++
 5 files changed, 26 insertions(+), 1 deletion(-)

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 f345dfa9d..aa88c949d 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -94,8 +94,14 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
         this.modalController.dismiss();
       }
     };
+
     this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory();
-    this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked
+    this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked;
+    
+    setTimeout(()=>{
+      this.scrollToBottomClicked()
+    }, 50)
+
   }
 
   ngOnInit() {
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 1baabf357..95a3fb0a7 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -110,6 +110,10 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
     this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory()
     this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked
+    
+    setTimeout(()=>{
+      this.scrollToBottomClicked()
+    }, 50)
 
   }
 
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index e97e83779..24e4c683e 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -85,6 +85,11 @@ export class RoomService {
 
 
     })
+
+    setTimeout(()=>{
+      this.scrollDown()
+    }, 50)
+
     this.hasLoadHistory = true
   }
 
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 1da3d421f..d5e091b80 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -104,6 +104,11 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory();
     console.log('MESSAGES'+this.wsChatMethodsService.getGroupRoom(this.roomId).massages);
     this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked
+
+    setTimeout(()=>{
+      this.scrollToBottomClicked()
+    }, 50)
+
   }
 
   ngOnInit() {
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 373dfee28..aeef0b69b 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -91,6 +91,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory()
 
     this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked
+
+    setTimeout(()=>{
+      this.scrollToBottomClicked()
+    }, 50)
+    
     
   }
 

From 17330a3067f87849b082cbb6a850a7a7c6d32caf Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 14 Jan 2022 15:07:35 +0100
Subject: [PATCH 108/112] save

---
 src/app/shared/chat/group-messages/group-messages.page.ts | 1 -
 1 file changed, 1 deletion(-)

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 34786d1ab..c0dd9a8b1 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -301,7 +301,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     this.message = "";
   }
 
-
   deleteMessage(msgId:string){
     let body = {
       "roomId": this.roomId,

From 7cd76e9a6dcdd454d2210b0ca14f014ce3f227ef Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 15:10:01 +0100
Subject: [PATCH 109/112] remove key

---
 src/app/services/chat/ws-chat.service.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index d42a923ab..0ff4e8379 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -236,11 +236,8 @@ export class WsChatService {
 
   receiveLiveMessageFromRoom(roomId, funx: Function) {
 
-    const key = roomId +  funx;
-
     this.ws.registerCallback({
       type:'Onmessage',
-      key: key,
       funx:(message)=>{
         if(message.msg =='changed' && message.collection == 'stream-room-messages') {
           if(message.fields.args[0].rid == roomId) {

From 936351b7ec664b21194b3b458153ba7096ea9030 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Mon, 17 Jan 2022 11:27:25 +0100
Subject: [PATCH 110/112] added realtime to: - edit group name - adicionar
 membro - remover membro

---
 src/app/models/chatMethod.ts                  |  1 +
 src/app/pages/chat/chat.page.html             |  4 ---
 src/app/pages/chat/chat.page.ts               |  7 ++--
 .../group-messages/group-messages.page.html   | 13 +++++--
 src/app/services/auth.service.ts              | 34 +++++++++----------
 src/app/services/chat/message.service.ts      |  4 ++-
 src/app/services/chat/room.service.ts         |  7 ++--
 .../services/chat/ws-chat-methods.service.ts  |  3 +-
 .../group-messages/group-messages.page.html   | 12 +++++--
 9 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/src/app/models/chatMethod.ts b/src/app/models/chatMethod.ts
index 2c47f0f4e..3a090d813 100644
--- a/src/app/models/chatMethod.ts
+++ b/src/app/models/chatMethod.ts
@@ -71,6 +71,7 @@ export interface Message {
     msg: string;
     ts: Ts;
     u: U;
+    t: string;
     _updatedAt: UpdatedAt;
     mentions: any[];
     channels: any[];
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 0ce60a14c..24b903f75 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -25,9 +25,6 @@
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-group.svg" ></ion-icon>
               </button>
-              <button *ngIf="hideRefreshBtn" class="btn-no-color" (click)="refreshing()">
-                <ion-icon class="title-icon font-awesome" name="reload-circle"></ion-icon>
-              </button>
             </div>
           </div>
         <ion-toolbar>
@@ -178,7 +175,6 @@
           (showEmptyContainer)="showEmptyContainer()"
           (showEmptyContainer)="showEmptyContainer()"
           (openNewEventPage)="openNewEventPage($event)"
-          (getDirectMessages)="getDirectMessages($event)"
           [style.display]="showMessages ? 'flex' : 'none'"
           [roomId]="roomId"
           [showMessages]="showMessages"  #messagecontainer>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 086cf839b..d58541d94 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -143,6 +143,9 @@ export class ChatPage implements OnInit {
 
   ngOnInit() {
 
+    console.log(this.wsChatMethodsService.group);
+
+
     this.segment = "Contactos";
 
     this.authService.userData$.subscribe((res: any) => {
@@ -366,10 +369,6 @@ export class ChatPage implements OnInit {
     }, 1000);
   }
 
-  refreshing() {
-    //this.load();
-  }
-
   customRoom() {
     let params = new HttpParams();
     params = params.set("types", "c");
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index 5221c7d99..95720a3e3 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -57,7 +57,7 @@
       <ion-label>A conversa original mantêm-se como chat individual</ion-label>
     </div>
     <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getGroupRoom(roomId).massages; let last = last" [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId">
-      <div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.msg !=''" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
+      <div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'au' && msg.t != 'ru' && msg.msg !=''" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
@@ -98,7 +98,7 @@
         </div>
       </div>
 
-      <div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.alias =='documento'" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
+      <div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'au' && msg.t != 'ru' && msg.alias =='documento'" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
@@ -113,7 +113,6 @@
               <div>
                 <div>
                   <div class="file">
-                    <!-- <canvas id="pdf_canvas"></canvas> -->
                     <div (click)="viewDocument(msg.file, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
                       <span *ngIf="msg.file.type">
                         <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
@@ -160,6 +159,14 @@
         </div>
         {{last ? scrollToBottom() : ''}}
       </div>
+      <div *ngIf="msg.t == 'au'" class="info-text-leave">
+        <div *ngFor="let user of allUsers">
+          <div *ngIf="msg.msg == user.username">
+            <ion-label>Adicionou {{user.name}}</ion-label><br />
+          </div>
+        </div>
+        {{last ? scrollToBottom() : ''}}
+      </div>
       <div *ngIf="msg.file">
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index ebbd691df..4e87e26ed 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -112,30 +112,30 @@ export class AuthService {
         "password": user.password,
       }
 
-
-      setTimeout(()=>{
-        console.log('login', SessionStore.user.RochetChatUser, SessionStore.user.Password)
-
-        this.WsChatService.connect();
-        this.WsChatService.login().then((message) => {
-          console.log('rocket chat login successfully', message)
-          this.WsChatService.setStatus('online')
-        }).catch((message)=>{
-          console.log('rocket chat login failed', message)
-        })
-      }, 1)
-
       let responseChat = await this.httpService.post('login', postData).toPromise();
 
       if(responseChat) {
+
+        setTimeout(()=>{
+          console.log('login', SessionStore.user.RochetChatUser, SessionStore.user.Password)
+
+          this.WsChatService.connect();
+          this.WsChatService.login().then((message) => {
+            console.log('rocket chat login successfully', message)
+            this.WsChatService.setStatus('online')
+          }).catch((message)=>{
+            console.log('rocket chat login failed', message)
+          })
+        }, 1)
+
         console.log('Login to Rocket chat OK');
+
         this.ValidatedUserChat = responseChat;
+
         localStorage.setItem('userChat', JSON.stringify(responseChat));
-        localStorage.setItem('Meteor.loginToken', responseChat['data'].authToken);
-        localStorage.setItem('Meteor.userId',responseChat['data'].userId);
-        this.cookieService.set('rc_token', responseChat['data'].authToken);
-        this.cookieService.set('rc_uid', responseChat['data'].userId);
+
         this.storageService.store(AuthConnstants.AUTH, responseChat);
+
         return true;
       }
       else{
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 9ef101d5d..4c28ea287 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -14,6 +14,7 @@ export class MessageService {
   rid = ''
   ts = {}
   u = {}
+  t = ''
   _id  =''
   _updatedAt = {}
   file
@@ -21,7 +22,7 @@ export class MessageService {
 
   constructor() { }
 
-  setData({customFields, channels, mentions, msg ,rid ,ts, u, _id, _updatedAt, file, attachments}:Message) {
+  setData({customFields, channels, mentions, msg ,rid ,ts, u, t, _id, _updatedAt, file, attachments}:Message) {
     this.customFields = customFields
     this.channels = channels
     this.mentions = mentions
@@ -29,6 +30,7 @@ export class MessageService {
     this.rid = rid
     this.ts = ts
     this.u = u
+    this.t = t
     this._id = _id
     this._updatedAt = _updatedAt
     this.file = file
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 24e4c683e..e9dde9382 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -16,6 +16,7 @@ export class RoomService {
   chatUser: ChatUserService[] = []
   customFields:any;
   id = ''
+  t = ''
   name = ''
   _updatedAt = {}
   private hasLoadHistory = false
@@ -30,10 +31,11 @@ export class RoomService {
     private MessageService: MessageService,
   ) {}
 
-  setData({customFields, id, name, lastMessage, _updatedAt}) {
+  setData({customFields, id, name, t, lastMessage, _updatedAt}) {
     this.customFields = customFields
     this.id = id
     this.name = name
+    this.t = t
     this.lastMessage = lastMessage
     this._updatedAt = _updatedAt
 
@@ -52,13 +54,14 @@ export class RoomService {
         const message = new MessageService()
         message.setData(ChatMessage)
         this.lastMessage.msg = message.msg
+        if(message.t == 'r'){this.name = message.msg}
         this.calDateDuration(ChatMessage._updatedAt)
         this.massages.push(message)
 
         setTimeout(()=>{
           this.scrollDown()
         }, 100)
-        
+
       }
     )
   }
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index d1effbdce..a88de802e 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -27,7 +27,7 @@ export class WsChatMethodsService {
     (async()=>{
       await this.getAllRooms();
       this.subscribeToRoom()
-      
+
     })()
 
   }
@@ -50,6 +50,7 @@ export class WsChatMethodsService {
         customFields: roomData.customFields,
         id: this.getRoomId(roomData),
         name: this.getRoomName(roomData),
+        t: roomData.t,
         lastMessage: this.getRoomLastMessage(roomData),
         _updatedAt: new Date(roomData._updatedAt['$date'])
       })
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index e4b1e4988..c52b15317 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -45,7 +45,7 @@
     </div>
 
     <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getGroupRoom(roomId).massages; let last = last">
-      <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.msg !=''" >
+      <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'au' && msg.t != 'ru' && msg.msg !=''" >
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
           <mat-menu #beforeMenu="matMenu" xPosition="before">
@@ -93,7 +93,7 @@
       </div>
 
 
-      <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.alias =='documento'" >
+      <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'au' && msg.t != 'ru' && msg.alias =='documento'" >
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
           <mat-menu #beforeMenu="matMenu" xPosition="before">
@@ -162,6 +162,14 @@
         </div>
         {{last ? scrollToBottom() : ''}}
       </div>
+      <div *ngIf="msg.t == 'au'" class="info-text-leave">
+        <div *ngFor="let user of allUsers">
+          <div *ngIf="msg.msg == user.username">
+            <ion-label>Adicionou {{user.name}}</ion-label><br />
+          </div>
+        </div>
+        {{last ? scrollToBottom() : ''}}
+      </div>
       <div *ngIf="msg.file" >
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />

From cdecf4f5ccada05413f851d17f4707e4504f7513 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Mon, 17 Jan 2022 13:48:08 +0100
Subject: [PATCH 111/112] save

---
 src/app/services/chat/room.service.ts |  2 +-
 src/app/services/toast.service.ts     | 63 ++++++++++++++++++++-------
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index e9dde9382..d99a6a097 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -50,7 +50,7 @@ export class RoomService {
         ChatMessage = ChatMessage.fields.args[0]
         ChatMessage = this.fix_updatedAt(ChatMessage)
 
-        this.ToastService.presentToast('nova mensagem')
+        /* this.ToastService._chatMessage({message:'Nova mensagem', sender:'Gilson'}) */
         const message = new MessageService()
         message.setData(ChatMessage)
         this.lastMessage.msg = message.msg
diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts
index 352bd86a3..66bcbd760 100644
--- a/src/app/services/toast.service.ts
+++ b/src/app/services/toast.service.ts
@@ -24,7 +24,7 @@ export class ToastService {
 
 
   async _successMessage(message?: any, callback?) {
-    
+
     let notification = document.createElement('div')
     notification.className = 'notification'
     notification.innerHTML = `
@@ -34,7 +34,7 @@ export class ToastService {
         <ion-icon slot="end" class="title-icon pr-10" src="/assets/images/nofitication-success.svg"></ion-icon>
         <p class="text">{{ message }}</p>
       </p>
-      
+
     </div>
     `
 
@@ -52,7 +52,7 @@ export class ToastService {
       },1000)
 
     },6000)
-    
+
   }
 
   async _badRequest(message?: string, callback?) {
@@ -66,7 +66,7 @@ export class ToastService {
       <ion-icon slot="end" class="title-icon pr-10" src="/assets/images/notification-error.svg"></ion-icon>
         <p class="text">{{ message }}</p>
       </p>
-      
+
     </div>
     `
 
@@ -89,8 +89,41 @@ export class ToastService {
 
   }
 
+  async _chatMessage(message?: any, sender?:string) {
+
+    let notification = document.createElement('div')
+    notification.className = 'notification'
+    notification.innerHTML = `
+
+    <div class="main-content width-100 pa-20">
+      <p class="message d-flex align-bottom success">
+        <ion-icon slot="end" class="title-icon pr-10" src="/assets/images/nofitication-success.svg"></ion-icon>
+        <p class="text">{{ message.message }}</p>
+      </p>
+      <p class="text">{{ message.sender }} </p>
+
+    </div>
+    `
+
+    document.body.append(notification)
+    notification.querySelector('.text').innerHTML =  message || 'Processo efetuado'
+    setTimeout(()=>{
+      /* if (callback) {
+        callback()
+      } */
+
+      notification.style.right = "-100%"
+
+      setTimeout(()=>{
+        notification.remove()
+      },1000)
+
+    },6000)
+
+  }
+
   async successMessage(message?: any, callback?) {
-    
+
     let notification = document.createElement('div')
     notification.className = 'notification'
     notification.innerHTML = `
@@ -100,7 +133,7 @@ export class ToastService {
         <ion-icon slot="end" class="title-icon pr-10" src="/assets/images/nofitication-success.svg"></ion-icon>
         <p class="text">{{ message }}</p>
       </p>
-      
+
     </div>
     `
 
@@ -118,7 +151,7 @@ export class ToastService {
       },1000)
 
     },6000)
-    
+
   }
 
   async badRequest(message?: string, callback?) {
@@ -132,7 +165,7 @@ export class ToastService {
       <ion-icon slot="end" class="title-icon pr-10" src="/assets/images/notification-error.svg"></ion-icon>
         <p class="text">{{ message }}</p>
       </p>
-      
+
     </div>
     `
 
@@ -155,9 +188,9 @@ export class ToastService {
 
   }
 
-  
+
   async notificationMessage(message?: any, callback?: any,data?: any) {
-    
+
     let notification = document.createElement('div')
     notification.className = 'notificationPush'
     notification.innerHTML = `
@@ -166,7 +199,7 @@ export class ToastService {
       <p class="message d-flex align-left">
         <p class="text">{{ message }}</p>
       </p>
-      
+
     </div>
     `
 
@@ -189,7 +222,7 @@ export class ToastService {
       },1000)
 
     },6000)
-    
+
   }
 
 
@@ -216,7 +249,7 @@ export class ToastService {
         </div>
       </div>
     `;
-    
+
     // console.log(document.querySelector('body').classList)
     document.body.append(loader)
 
@@ -224,10 +257,10 @@ export class ToastService {
       // loader.remove()
     })
     return loader
-    
+
   }
 
 }
 
 
-export const ToastsService = new ToastService(new ToastController())
\ No newline at end of file
+export const ToastsService = new ToastService(new ToastController())

From 05a1b4a82a0d0daa92495a0bd8f15d7278021699 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Mon, 17 Jan 2022 14:39:12 +0100
Subject: [PATCH 112/112] add subscribe method to user logged

---
 .../services/chat/ws-chat-methods.service.ts  |  6 +-
 src/app/services/chat/ws-chat.service.ts      | 62 ++++++++++++++-----
 2 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index a88de802e..af40f6ecf 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -42,7 +42,7 @@ export class WsChatMethodsService {
     rooms.result.update.forEach((roomData: room) => {
       let room:RoomService;
 
-      // console.log(roomData);
+      //console.log(roomData);
 
 
       room = new RoomService(this.WsChatService, new MessageService())
@@ -87,6 +87,10 @@ export class WsChatMethodsService {
         console.log('streamRoomMessages', subscription)
       })
     }
+
+    this.WsChatService.streamNotifyLogged().then((subscription=>{
+      console.log('streamRoomMessages', subscription)
+    }))
   }
 
   getDmRoom(id): RoomService {
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 0ff4e8379..838209d56 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -18,10 +18,10 @@ export class WsChatService {
 
   connect() {
     // dont connect if is already connected
-    if(this.ws.connected == true) { 
-      return false 
+    if(this.ws.connected == true) {
+      return false
     }
-    
+
     this.ws.connect();
 
     const message = {
@@ -47,12 +47,12 @@ export class WsChatService {
 
   login() {
     // dont login if is already login
-    if(this.isLogin == true) { 
-      return new Promise((resolve, reject)=>{ 
-        resolve(this.loginResponse) 
-      }) 
+    if(this.isLogin == true) {
+      return new Promise((resolve, reject)=>{
+        resolve(this.loginResponse)
+      })
     }
-    
+
     const requestId =  uuidv4()
 
     const message = {
@@ -67,7 +67,7 @@ export class WsChatService {
       ]
     }
     this.ws.send({message, requestId, loginRequired: false})
-    
+
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
@@ -75,7 +75,7 @@ export class WsChatService {
 
           if(message.result) {
             if(message.result.token) {
-              
+
               this.isLogin = true
               this.loginResponse = message
 
@@ -124,7 +124,7 @@ export class WsChatService {
     this.isLogin = false
     this.ws.connected = false
   }
-  
+
   // send message to room
   send(roomId, msg) {
 
@@ -191,16 +191,16 @@ export class WsChatService {
   }
 
   setStatus(status: 'online' | 'busy' | 'away' | 'offline') {
-    
+
     const requestId =  uuidv4()
 
     const message = {
-      
+
       msg: "method",
       method: `UserPresence:setDefaultStatus`,
       id: requestId,
       params: [ status ]
-    
+
     }
 
     this.ws.send({message, requestId})
@@ -275,6 +275,34 @@ export class WsChatService {
     });
   }
 
+  streamNotifyLogged() {
+
+    alert('HERE')
+
+    const requestId =  uuidv4()
+
+    const message = {
+      "msg": "sub",
+      "id": requestId,
+      "name": "stream-notify-logged",
+      "params":[
+        "user-status",
+          false
+      ]
+    }
+
+    this.ws.send({message, requestId});
+
+    return new Promise((resolve, reject) => {
+      this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
+        if(message.id == requestId) { // same request send
+          resolve(message)
+          return true
+        }
+      }})
+    });
+  }
+
   streamNotifyRoom(roomId : string) {
 
     const requestId =  uuidv4()
@@ -308,7 +336,7 @@ export class WsChatService {
   }
 
   // socket class ==================================================================
-  private socket!: WebSocket; 
+  private socket!: WebSocket;
   private wsMsgQueue : {[key: string]:  msgQueue} = {}
   private wsCallbacks: {[key: string]:  wsCallbacksParams} = {}
 
@@ -338,7 +366,7 @@ export class WsChatService {
     wsMsgQueue:()=> {
 
       for (const [key, item] of Object.entries(this.wsMsgQueue)) {
-        
+
         if(item.loginRequired == true && this.isLogin == true) {
           // console.log('run msgQueue ',index)
           this.ws.send(item);
@@ -382,7 +410,7 @@ export class WsChatService {
     onclose:(event: any)=> {
       this.ws.connected = false
       this.isLogin = false
-  
+
       this.connect()
       this.login()