changes

src/app/services/chat/ws-chat-methods.service.ts

@@ -8,6 +8,7 @@ import { Rooms, Update as room } from 'src/app/models/chatMethod';
 import { Storage } from '@ionic/storage';
 import { Platform } from '@ionic/angular';
 import { SqliteService } from 'src/app/services/sqlite.service';
+import { NativeNotificationService } from 'src/app/services/native-notification.service';
 import { SortService } from '../functions/sort.service';
 
 @Injectable({
@@ -15,11 +16,13 @@ import { SortService } from '../functions/sort.service';
 })
 export class WsChatMethodsService {
 
-
-
   dm: {[key: string]:  RoomService} = {}
   group: {[key: string]:  RoomService} = {}
 
+
+  _dm = []
+  _group = []
+
   loadingWholeList = false
 
   dmCount = 0;
@@ -30,6 +33,7 @@ export class WsChatMethodsService {
     private storage: Storage,
     private platform: Platform,
     private sqlservice: SqliteService,
+    private NativeNotificationService: NativeNotificationService,
     private sortService: SortService
   ) {
     (async()=>{
@@ -56,20 +60,56 @@ export class WsChatMethodsService {
     this.storage.set('Rooms', rooms);
 
     // console.log("ROOMS" + JSON.stringify(rooms))
+    this.WsChatService.registerCallback({
+      type:'Onmessage',
+      funx:(message)=>{
 
-    rooms.result.update.forEach((roomData: room) => {
-      this.prepareRoom(roomData);
+        if(message.msg =='changed' && message.collection == "stream-room-messages") {
+          if(message.fields.args[0].rid) {
+
+            setTimeout(()=>{
+              console.log('sort this._dm', this._dm)
+              this._dm = this.sortService.sortDate(this._dm,'_updatedAt').reverse()
+              this._group = this.sortService.sortDate(this._group,'_updatedAt').reverse()
+            }, 100)
+
+          }
+
+        }
+
+        if(message.msg =='changed' && message.collection == "stream-notify-room") {
+          if(message.fields.eventName.includes('deleteMessage')){
+            setTimeout(()=>{
+              console.log('sort this._dm', this._dm)
+              this._dm = this.sortService.sortDate(this._dm,'_updatedAt').reverse()
+              this._group = this.sortService.sortDate(this._group,'_updatedAt').reverse()
+            }, 100)
+          }
+        }
+      }
+    })
+
+
+    await rooms.result.update.forEach( async (roomData: room) => {
+      await this.prepareRoom(roomData);
     });
 
+    this._dm = this.sortService.sortDate(this._dm,'_updatedAt').reverse()
+    this._group = this.sortService.sortDate(this._group,'_updatedAt').reverse()
+
     this.loadingWholeList = false
   }
 
+
+
   subscribeToRoom() {
 
     for (const id in this.dm) {
       this.WsChatService.streamRoomMessages(id).then((subscription)=>{
         console.log('streamRoomMessages', subscription)
       })
+
+      this.WsChatService.subStreamNotifyRoom(id, 'typing', false)
       this.WsChatService.streamNotifyRoomDeleteMessage(id).then((subscription)=>{
         console.log('streamNotifyRoomDeleteMessage', subscription);
       })
@@ -79,6 +119,8 @@ export class WsChatMethodsService {
       this.WsChatService.streamRoomMessages(id).then((subscription)=>{
         console.log('streamRoomMessages', subscription)
       })
+
+      this.WsChatService.subStreamNotifyRoom(id, 'typing', false)
       this.WsChatService.streamNotifyRoomDeleteMessage(id).then((subscription)=>{
         console.log('streamNotifyRoomDeleteMessage', subscription);
       })
@@ -90,13 +132,13 @@ export class WsChatMethodsService {
 
 
   subscribeToRoomUpdate(id, roomData) {
-    this.WsChatService.streamRoomMessages(id).then((subscription)=>{
+    this.WsChatService.streamRoomMessages(id).then((subscription)=> {
        console.log('streamRoomMessages', subscription)
     })
-    this.WsChatService.streamRoomMessages(id).then((subscription)=>{
+    this.WsChatService.streamRoomMessages(id).then((subscription) => {
       console.log('streamRoomMessages', subscription)
     })
-    this.WsChatService.streamNotifyLogged().then((subscription=>{
+    this.WsChatService.streamNotifyLogged().then((subscription=> {
       console.log('streamRoomMessages', subscription)
     }))
     this.WsChatService.streamNotifyRoomDeleteMessage(id).then((subscription)=>{
@@ -109,10 +151,11 @@ export class WsChatMethodsService {
 
   }
 
-  prepareRoom(roomData){
+  prepareRoom(roomData) {
     let room:RoomService;
 
-    room = new RoomService(this.WsChatService, new MessageService(this.storage), this.storage, this.platform, this.sqlservice, this.sortService)
+    room = new RoomService(this.WsChatService, new MessageService(this.storage), this.storage, this.platform, this.sqlservice, this.NativeNotificationService, this.sortService)
+
     room.setData({
       customFields: roomData.customFields,
       id: this.getRoomId(roomData),
@@ -128,12 +171,12 @@ export class WsChatMethodsService {
     let roomId = this.getRoomId(roomData)
 
     if(this.isIndividual(roomData)) {
-      console.log(room);
-
       this.dm[roomId] = room
+      this._dm.push(room)
       this.dmCount++
     } else {
       this.group[roomId] = room
+      this._group.push(room)
       this.groupCount++
     }
   }