diff --git a/package-lock.json b/package-lock.json index f9eacf4e2..6584646ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2202,21 +2202,6 @@ "integrity": "sha512-HCFwOxmK7igEgNm20y+zYi+XQ0OlZYnE4oCaI82TGmA7sehlDpBBKbjmI2Bd8aM09+BXFbAAtq7JCxkEfY8nIg==" }, "@capacitor/filesystem": { -<<<<<<< HEAD - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@capacitor/filesystem/-/filesystem-1.0.6.tgz", - "integrity": "sha512-8xqUbDZFGBMhgqoBSn9wEd9OBPdHIRegQ9zCCZcpHNf3FFAIby1ck+aDFnoq+Da49xhD6ks1SKCBSxz/26qWTw==" - }, - "@capacitor/haptics": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@capacitor/haptics/-/haptics-1.1.3.tgz", - "integrity": "sha512-ui2mY/riK1Y4bxnJKJfclWO61obZ0RHmtErPhpmt4wIEVjG1segYdFop45R2PxyEwoUJgzEsAxnviM/T6k8seQ==" - }, - "@capacitor/ios": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-3.3.0.tgz", - "integrity": "sha512-KImT4hVoQJuAfe01wUYiMLnutMu7PxVCv4c8HVWiW+OuyyOua3lC8wQ5gAauGDugAo6mdM7fVva5a0Vtyhnbdg==" -======= "version": "1.1.0", "resolved": "https://registry.npmjs.org/@capacitor/filesystem/-/filesystem-1.1.0.tgz", "integrity": "sha512-8O3UuvL8HNUEJvZnmn8yUmvgB1evtXfcF0oxIo3YbSlylqywJwS3JTiuhKmsvSxCdpbTy8IaTsutVh3gZgWbKg==" @@ -2230,7 +2215,6 @@ "version": "3.4.1", "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-3.4.1.tgz", "integrity": "sha512-ycFCyKI8DsgedVg7PW5MpCVgqFuD0PMHQGVfC5ichXc2C/jAATX32EVdEMCB0N3guKoH2k6T3Efwg59+Fcdx2w==" ->>>>>>> 0b14c4c0c63a6d55c9945163d7afb971a7375994 }, "@capacitor/keyboard": { "version": "1.1.3", @@ -3013,16 +2997,6 @@ "integrity": "sha512-68hdPn0hA7yn4YNTgmLF32x/l7arFulboGhNiyFQ35/QxqrOmppf77p4xaPOyJtNyICKHLaiStC6w1eEAtl9MA==", "requires": { "@types/cordova": "^0.0.34" -<<<<<<< HEAD - }, - "dependencies": { - "@types/cordova": { - "version": "0.0.34", - "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", - "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" - } -======= ->>>>>>> 0b14c4c0c63a6d55c9945163d7afb971a7375994 } }, "@ionic-native/core": { @@ -4943,6 +4917,11 @@ "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==", "dev": true }, + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + }, "@types/cors": { "version": "2.8.12", "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", @@ -16568,29 +16547,6 @@ "tslib": "^2.3.0" } }, -<<<<<<< HEAD - "ng2-pdf-viewer": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/ng2-pdf-viewer/-/ng2-pdf-viewer-3.0.8.tgz", - "integrity": "sha512-p2qndFu1wQW4y+xXXw7yk1BhpRo5PGHKWD3PTc7pUULujx9d2vT26lhXR3p9WHitySadGqdCQpkA7W3v1dBlSg==", - "requires": { - "@types/pdfjs-dist": "^0.1.1", - "pdfjs-dist": "1.9.489" - }, - "dependencies": { - "pdfjs-dist": { - "version": "1.9.489", - "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-1.9.489.tgz", - "integrity": "sha1-yuWf7d0WouXRlappUnlVz+QALB0=", - "requires": { - "node-ensure": "^0.0.0", - "worker-loader": "^0.8.0" - } - } - } - }, -======= ->>>>>>> 0b14c4c0c63a6d55c9945163d7afb971a7375994 "ngx-cookie-service": { "version": "12.0.3", "resolved": "https://registry.npmjs.org/ngx-cookie-service/-/ngx-cookie-service-12.0.3.tgz", 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 62dc32da5..97c525f3d 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 ?? ""}} @@ -140,7 +141,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 d4a585683..9c5d7d096 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
@@ -56,24 +58,14 @@ {{msg.duration}}
- {{msg.msg}} - {{last ? scrollToBottom() : ''}} -
-
- -
-
- {{msg.u.name}} - {{msg.duration}} -
-
- {{msg.msg}} + {{msg.msg}} + {{msg.msg}} {{last ? scrollToBottom() : ''}}
-
+
{{msg.u.name}} @@ -123,7 +115,7 @@
-
+
{{msg.u.name}} criou esta reunião

@@ -132,6 +124,10 @@
{{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 3972a4591..8032aa779 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() : ''}}
-
+
@@ -118,35 +116,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 532881b59..f2b691ed3 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -14,10 +14,6 @@
- -
+
@@ -151,8 +147,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 };