diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 5566246f0..e4ac8208f 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -15,7 +15,7 @@ import { chatUser } from 'src/app/models/chatMethod'; import { environment } from 'src/environments/environment'; import { ChatService } from 'src/app/services/chat.service'; import { NfService } from 'src/app/services/chat/nf.service' - +import alasql from 'alasql' @Injectable({ providedIn: 'root' }) @@ -238,7 +238,7 @@ export class RoomService { const result = this.NfService.beforeSendAttachment(message, this) delete message.temporaryData; - + if(result) { message.hasSendAttachment = true @@ -341,25 +341,26 @@ export class RoomService { restoreMessageFromDB() { this.storage.get('chatmsg' + this.id).then((messages = []) => { - let localMessages = [] + let localMessages: MessageService[] = [] if(messages==null) messages = [] - messages.reverse().forEach((ChatMessage, index) => { + messages.forEach((ChatMessage, index) => { const wewMessage = this.prepareMessage(ChatMessage) if(wewMessage.offline == true) { - this.WsChatService.send({roomId:this.id, msg:wewMessage.msg, attachments:wewMessage.attachments, file: wewMessage.file}).then((data: any) => { - let _ChatMessage = data.result - this.redefinedMessage(wewMessage, _ChatMessage) - this.storage.set('chatmsg' + this.id, messages) - }) + // this.WsChatService.send({roomId:this.id, msg:wewMessage.msg, attachments:wewMessage.attachments, file: wewMessage.file}).then((data: any) => { + // let _ChatMessage = data.result + // this.redefinedMessage(wewMessage, _ChatMessage) + // this.storage.set('chatmsg' + this.id, messages) + // }) } localMessages.push(wewMessage) }); - this.messages = localMessages + this.messages = alasql('SELECT * FROM ? ORDER BY _updatedAt',[localMessages]); + }) } @@ -386,7 +387,6 @@ export class RoomService { console.log(chatHistory.result.messages); - this.storage.set('chatmsg' + this.id, chatHistory.result.messages.reverse()) })