Skip to content

Commit ff5a8ad

Browse files
Merge pull request #1190 from GrimBit1/main
Fix Message deletion in Whatsapp Bailey Service
2 parents b096386 + c1494ca commit ff5a8ad

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3552,25 +3552,31 @@ export class BaileysStartupService extends ChannelStartupService {
35523552
const messageId = response.message?.protocolMessage?.key?.id;
35533553
if (messageId) {
35543554
const isLogicalDeleted = configService.get<Database>('DATABASE').DELETE_DATA.LOGICAL_MESSAGE_DELETE;
3555-
let message = await this.prismaRepository.message.findUnique({
3556-
where: { id: messageId },
3555+
let message = await this.prismaRepository.message.findFirst({
3556+
where: {
3557+
key: {
3558+
path: ['id'],
3559+
equals: messageId,
3560+
},
3561+
},
35573562
});
35583563
if (isLogicalDeleted) {
35593564
if (!message) return response;
35603565
const existingKey = typeof message?.key === 'object' && message.key !== null ? message.key : {};
35613566
message = await this.prismaRepository.message.update({
3562-
where: { id: messageId },
3567+
where: { id: message.id },
35633568
data: {
35643569
key: {
35653570
...existingKey,
35663571
deleted: true,
35673572
},
3573+
status: 'DELETED',
35683574
},
35693575
});
35703576
} else {
35713577
await this.prismaRepository.message.deleteMany({
35723578
where: {
3573-
id: messageId,
3579+
id: message.id,
35743580
},
35753581
});
35763582
}
@@ -3579,7 +3585,7 @@ export class BaileysStartupService extends ChannelStartupService {
35793585
instanceId: message.instanceId,
35803586
key: message.key,
35813587
messageType: message.messageType,
3582-
status: message.status,
3588+
status: 'DELETED',
35833589
source: message.source,
35843590
messageTimestamp: message.messageTimestamp,
35853591
pushName: message.pushName,

0 commit comments

Comments
 (0)