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 4f1862878..17f117c9d 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -63,7 +63,8 @@ {{msg.duration}}
- {{msg.msg}} + {{msg.msg}} + {{msg.msg}} {{last ? scrollToBottom() : ''}}
@@ -92,7 +93,7 @@ --> -
+
{{msg.u.name ?? ""}} @@ -148,7 +149,9 @@ {{msg.file.venue}}
- +
+ Apagou a mensagem +
Alterou o nome do grupo para "{{msg.msg.split('-').join(' ')}}"
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 89c5c8110..06dfbc98d 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -13,10 +13,12 @@
- {{wsChatMethodsService.getDmRoom(roomId).name}} +
+ +
delete all
@@ -60,6 +62,7 @@ {{msg.duration}}
+<<<<<<< HEAD {{msg.msg}} {{last ? scrollToBottom() : ''}}
@@ -73,27 +76,29 @@
{{msg.msg}} +======= + {{msg.msg}} + {{msg.msg}} +>>>>>>> c9af986ae8181cf24741ac7407264daea648d27e {{last ? scrollToBottom() : ''}}
-
-
-
- {{msg.u.name}} - {{msg.duration}} -
-
-
-
-
- image - -
-
+
+
+
+ {{msg.u.name}} + {{msg.duration}} +
+
+
+
+
+ image + +
+
@@ -153,7 +158,7 @@
-
+
{{msg.u.name}} criou esta reunião
{{last ? scrollToBottom() : ''}}
+ +
+ Apagou a mensagem +
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index edbf2cc58..472164861 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -242,6 +242,7 @@ export class MessageService { async delateDB() { + // alert('delete data') const message = await MessageModel.get({_id: this._id}) await message.delete() diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 0f68669f5..9b1fedb29 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -313,8 +313,6 @@ export class RoomService { async deleteMessageToReceive(userId) { - - const allDeleteMessages = await DeleteMessageModel.filter({rid: this.id}).execute() for(let message_ of allDeleteMessages) { @@ -392,6 +390,15 @@ export class RoomService { } + + deleteAll() { + this.messages.forEach((message)=>{ + if(message?._id) { + this.sendDeleteRequest(message._id) + } + }) + } + async delateMessageToSendToOthers(userId) { const deleteMessage = await DeleteMessageModel.all() @@ -410,10 +417,12 @@ export class RoomService { (response: any) => { message.delateRequest = true message.save() + this.deleteMessage(msgId) }, (response) => { if (response.error.error.startsWith('No message found with the id of')) { + // alert('not found') this.deleteMessage(msgId) } else { // this.deleteMessage(DeletedMessageId) @@ -429,6 +438,7 @@ export class RoomService { } ) + } @@ -553,7 +563,7 @@ export class RoomService { const wewMessage = await this.simplePrepareMessage(ChatMessage) if(wewMessage.offline == false) { - const message = await this.prepareMessageCreateIfNotExist({message:ChatMessage}) + const message = await this.prepareMessageCreateIfNotExist_iD({message:ChatMessage}) message?.decryptMessage() } else { @@ -584,7 +594,7 @@ export class RoomService { } // runs onces only - async loadHistory({limit = 10000000, forceUpdate = false }) { + async loadHistory({limit = 1000, forceUpdate = false }) { if(forceUpdate == false) { if (this.hasLoadHistory) { @@ -599,12 +609,14 @@ export class RoomService { await this.WsChatService.loadHistory(this.id, limit).then( async (chatHistory:chatHistory) => { + console.log('load chatHistory', JSON.stringify(chatHistory)) + const messagesId = this.messages.map((message)=> message._id) chatHistory.result.messages.reverse().forEach(async(message: any) => { if (!messagesId.includes(message._id)) { - const messagesToSave = await this.prepareMessageCreateIfNotExist({message: message}); + const messagesToSave = await this.prepareMessageCreateIfNotExist_iD({message: message}); if(messagesToSave) { await messagesToSave.addMessageDB() } @@ -612,7 +624,6 @@ export class RoomService { }) - // console.log('load chatHistory', chatHistory) }) @@ -755,6 +766,27 @@ export class RoomService { } } + + async prepareMessageCreateIfNotExist_iD({message}) { + message = this.fix_updatedAt(message) + + const found = this.messages.find((MessageService, index) => { + if (MessageService._id == message._id ) { + return true + } else { + return false + } + }) + + if (!found) { + const wewMessage = this.simplePrepareMessage(message) + this.messages.push(wewMessage) + return wewMessage + } else { + return null + } + } + private calDateDuration(date = null) { this.duration = showDateDuration(date || this._updatedAt); this._updatedAt = date || this._updatedAt 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 23a735b7d..ec38e0b7e 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,7 @@
- +
@@ -57,12 +54,13 @@ {{msg.duration}}
- {{msg.msg}} + {{msg.msg}} + {{msg.msg}} {{last ? scrollToBottom() : ''}}
-
+
@@ -126,35 +124,10 @@ {{msg.file.venue}}
- - - +
Alterou o nome do grupo para "{{msg.msg.split('-').join(' ')}}"
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 85a04d94d..fb8e308fd 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -14,10 +14,6 @@
- -
+
@@ -159,8 +155,14 @@
+ +
+ Apagou a mensagem +
+
+ diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index c33a532a9..e5f72e4c6 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -6,5 +6,5 @@ export const environment = { domain: 'gabinetedigital.local', defaultuser: '',//paulo.pinto paulo.pinto@gabinetedigital.local defaultuserpwd: '', //tabteste@006, - chatOffline: false + chatOffline: true };