diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index f27e2fbc2..99e9754fb 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -465,10 +465,27 @@ export class RoomService { const message = this.messages.find((e) => e._id == DeletedMessageId) - if(message.delate == false) { - this.deleteMessage(DeletedMessageId) + if(message) { + if(message.delate == false) { + this.deleteMessage(DeletedMessageId) + } + } else { + const message = await MessageModel.get({_id: DeletedMessageId}) + if(message) { + (message as MessageModel).delete() + + DeleteMessageModel.create({ + messageId: DeletedMessageId, + rid: this.id, + ts: "", + u: {}, + needToReceiveBy: [] + }) + + } } + } ) } @@ -584,7 +601,6 @@ export class RoomService { this.message = this.message.replace(/(\n$)/,'') - if(file && this.message) { this.send({}) } @@ -822,6 +838,8 @@ export class RoomService { cloneMessage.duration = "" cloneMessage.dateLabel = true cloneMessage.delate = false + cloneMessage.attachments = undefined + cloneMessage.file = undefined this.messages.push(cloneMessage as any) }