peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 05:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve

Browse Source
This commit is contained in:
Peter Maquiran
2022-02-07 18:48:33 +01:00
parent e03fb2b413
commit 202b430966
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/chat/room.service.ts
+11 -11
View File
@@ -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())
})