merge

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

@@ -48,6 +48,7 @@ export class RoomService {
     private platform: Platform,
     private sqlservice: SqliteService,
     private NativeNotificationService: NativeNotificationService,
+    private sortService: SortService,
   ) {
     this.NativeNotificationService.askForPermission()
   }
@@ -111,8 +112,6 @@ export class RoomService {
 
     this.WsChatService.receiveStreamNotifyRoom((message) => {
 
-      console.log(message.fields)
-
       if(message.fields.eventName == this.id+'/'+'typing') {
 
         this.userThatIsTyping = this.usernameToDisplayName(message.fields.args[0])
@@ -193,7 +192,7 @@ export class RoomService {
           this.WsChatService.sendStreamNotifyRoom(this.id, SessionStore.user.RochetChatUser, 'typing', this.isTyping)
         }
       } else {
-        console.log(now - this.lastTimeType)
+        //console.log(now - this.lastTimeType)
       }
 
     }, 3000)
@@ -298,6 +297,7 @@ export class RoomService {
       console.log('loadHistory', chatHistory)
 
       let localMessages = []
+      //const sortedRoomList = this.sortService.sortDate(chatHistory.result.messages, "_updatedAt.$date")
       chatHistory.result.messages.reverse().forEach(message => {
 
         message = this.fix_updatedAt(message)
@@ -308,6 +308,9 @@ export class RoomService {
 
       this.messages = localMessages
 
+      console.log(chatHistory.result.messages);
+
+
       this.storage.set('chatmsg' + this.id, chatHistory.result.messages.reverse())
 
     })

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

@@ -89,6 +89,8 @@ export class WsChatMethodsService {
     this.loadingWholeList = false
   }
 
+
+
   subscribeToRoom() {
 
     for (const id in this.dm) {
@@ -141,7 +143,7 @@ export class WsChatMethodsService {
   prepareRoom(roomData) {
     let room:RoomService;
 
-    room = new RoomService(this.WsChatService, new MessageService(this.storage), this.storage, this.platform, this.sqlservice, this.NativeNotificationService)
+    room = new RoomService(this.WsChatService, new MessageService(this.storage), this.storage, this.platform, this.sqlservice, this.NativeNotificationService, this.sortService)
 
     room.setData({
       customFields: roomData.customFields,
@@ -158,8 +160,6 @@ 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++

src/app/services/functions/object.service.ts

@@ -8,7 +8,7 @@ export class ObjectService {
   constructor() { }
 
 
-  deepFind(obj, path) {
+  deepFind(obj, path):any {
     var paths = path.split('.')
       , current = obj
       , i;