diff --git a/src/core/engines/gows/session.gows.core.ts b/src/core/engines/gows/session.gows.core.ts index 2a9362c7..5a9fa91e 100644 --- a/src/core/engines/gows/session.gows.core.ts +++ b/src/core/engines/gows/session.gows.core.ts @@ -548,9 +548,8 @@ export class WhatsappSessionGoWSCore extends WhatsappSession { onlyEvent(WhatsMeowEvent.RECEIPT), filter((r: any) => this.jids.include(r?.Chat)), ); - const [receiptGroups$, receiptContacts$] = partition( - receipt$, - (r: any) => isJidGroup(r?.Chat || r?.Info?.Chat), + const [receiptGroups$, receiptContacts$] = partition(receipt$, (r: any) => + isJidGroup(r?.Chat || r?.Info?.Chat), ); const messageAckGroups$ = receiptGroups$.pipe( mergeMap(this.receiptToMessageAck.bind(this)), @@ -560,7 +559,7 @@ export class WhatsappSessionGoWSCore extends WhatsappSession { mergeMap(this.receiptToMessageAck.bind(this)), DistinctAck(), ); - this.events2.get(WAHAEvents.GROUP_ACK).switch(messageAckGroups$); + this.events2.get(WAHAEvents.MESSAGE_ACK_GROUP).switch(messageAckGroups$); this.events2.get(WAHAEvents.MESSAGE_ACK).switch(messageAckContacts$); const messageReactions$ = messages$.pipe( diff --git a/src/core/engines/noweb/session.noweb.core.ts b/src/core/engines/noweb/session.noweb.core.ts index 3ea0153c..10c91a63 100644 --- a/src/core/engines/noweb/session.noweb.core.ts +++ b/src/core/engines/noweb/session.noweb.core.ts @@ -2078,7 +2078,9 @@ export class WhatsappSessionNoWebCore extends WhatsappSession { const messageAckGroupsFinal$ = messageAckGroups$.pipe(DistinctAck()); this.events2.get(WAHAEvents.MESSAGE_ACK).switch(messageAckDirectFinal$); - this.events2.get(WAHAEvents.GROUP_ACK).switch(messageAckGroupsFinal$); + this.events2 + .get(WAHAEvents.MESSAGE_ACK_GROUP) + .switch(messageAckGroupsFinal$); // // Other diff --git a/src/core/engines/webjs/session.webjs.core.ts b/src/core/engines/webjs/session.webjs.core.ts index 00787399..9228c1af 100644 --- a/src/core/engines/webjs/session.webjs.core.ts +++ b/src/core/engines/webjs/session.webjs.core.ts @@ -1703,7 +1703,9 @@ export class WhatsappSessionWebJSCore extends WhatsappSession { const messageAckGroupsFinal$ = messageAckGroups$.pipe(DistinctAck()); this.events2.get(WAHAEvents.MESSAGE_ACK).switch(messageAckDMFinal$); - this.events2.get(WAHAEvents.GROUP_ACK).switch(messageAckGroupsFinal$); + this.events2 + .get(WAHAEvents.MESSAGE_ACK_GROUP) + .switch(messageAckGroupsFinal$); // // Others diff --git a/src/structures/enums.dto.ts b/src/structures/enums.dto.ts index 33015fdf..c826f088 100644 --- a/src/structures/enums.dto.ts +++ b/src/structures/enums.dto.ts @@ -6,6 +6,7 @@ export enum WAHAEvents { MESSAGE_REACTION = 'message.reaction', MESSAGE_ANY = 'message.any', MESSAGE_ACK = 'message.ack', + MESSAGE_ACK_GROUP = 'message.ack.group', MESSAGE_WAITING = 'message.waiting', MESSAGE_REVOKED = 'message.revoked', MESSAGE_EDITED = 'message.edited', @@ -16,7 +17,6 @@ export enum WAHAEvents { GROUP_V2_LEAVE = 'group.v2.leave', GROUP_V2_UPDATE = 'group.v2.update', GROUP_V2_PARTICIPANTS = 'group.v2.participants', - GROUP_ACK = 'group.ack', PRESENCE_UPDATE = 'presence.update', POLL_VOTE = 'poll.vote', POLL_VOTE_FAILED = 'poll.vote.failed', diff --git a/src/structures/webhooks.dto.ts b/src/structures/webhooks.dto.ts index fbfb2d6f..433d05d9 100644 --- a/src/structures/webhooks.dto.ts +++ b/src/structures/webhooks.dto.ts @@ -214,12 +214,12 @@ export class WAHAWebhookMessageAck extends WAHAWebhook { payload: WAMessageAckBody; } -export class WAHAWebhookGroupAck extends WAHAWebhook { +export class WAHAWebhookMessageAckGroup extends WAHAWebhook { @ApiProperty({ description: 'Receive events when participants in a group read or play messages.', }) - event = WAHAEvents.GROUP_ACK; + event = WAHAEvents.MESSAGE_ACK_GROUP; payload: WAMessageAckBody; } diff --git a/src/structures/webhooks.ts b/src/structures/webhooks.ts index fb765cad..42673fbf 100644 --- a/src/structures/webhooks.ts +++ b/src/structures/webhooks.ts @@ -21,7 +21,7 @@ import { WAHAWebhookMessage, WAHAWebhookMessageAck, WAHAWebhookMessageAny, - WAHAWebhookGroupAck, + WAHAWebhookMessageAckGroup, WAHAWebhookMessageEdited, WAHAWebhookMessageReaction, WAHAWebhookMessageRevoked, @@ -38,7 +38,7 @@ const WAHA_WEBHOOKS = [ WAHAWebhookMessageReaction, WAHAWebhookMessageAny, WAHAWebhookMessageAck, - WAHAWebhookGroupAck, + WAHAWebhookMessageAckGroup, WAHAWebhookMessageRevoked, WAHAWebhookMessageEdited, WebhookGroupV2Join,