Skip to content

fix(revoke): use protocolMessageKey for original message ID #201696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Adi1231234 wants to merge 2 commits into
base: main
Choose a base branch
from
+18 −28
Open

fix(revoke): use protocolMessageKey for original message ID #201696

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf74d1c
fix(revoke): use protocolMessageKey for original message ID
Adi1231234 Apr 6, 2026
788de15
Merge branch 'main' into fix/revoke-use-protocolMessageKey
Adi1231234 Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 18 additions & 28 deletions src/Client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,46 +664,35 @@ class Client extends EventEmitter {
},
);

let last_message;

await exposeFunctionIfAbsent(
this.pupPage,
'onChangeMessageTypeEvent',
(msg) => {
if (msg.type === 'revoked') {
const message = new Message(this, msg);
let revoked_msg;
if (last_message && msg.id.id === last_message.id.id) {
revoked_msg = new Message(this, last_message);

if (message.protocolMessageKey)
revoked_msg.id = { ...message.protocolMessageKey };
}
const originalKey = msg.protocolMessageKey;
const message = new Message(this, { ...msg, id: originalKey });
const revoked_msg = originalKey
? new Message(this, { id: originalKey })
: undefined;

/**
* Emitted when a message is deleted for everyone in the chat.
* @event Client#message_revoke_everyone
* @param {Message} message The message that was revoked, in its current state. It will not contain the original message's data.
* @param {?Message} revoked_msg The message that was revoked, before it was revoked. It will contain the message's original data.
* Note that due to the way this data is captured, it may be possible that this param will be undefined.
*/
this.emit(
Events.MESSAGE_REVOKED_EVERYONE,
message,
revoked_msg,
);
}
/**
* Emitted when a message is deleted for everyone in the chat.
* @event Client#message_revoke_everyone
* @param {Message} message The message that was revoked, in its current state. It will not contain the original message's data.
* @param {?Message} revoked_msg The message that was revoked, before it was revoked. It will contain the message's original data.
* Note that due to the way this data is captured, it may be possible that this param will be undefined.
*/
this.emit(
Events.MESSAGE_REVOKED_EVERYONE,
message,
revoked_msg,
);
},
);

await exposeFunctionIfAbsent(
this.pupPage,
'onChangeMessageEvent',
(msg) => {
if (msg.type !== 'revoked') {
last_message = msg;
}

/**
* The event notification that is received when one of
* the group participants changes their phone number.
Expand Down Expand Up @@ -1032,6 +1021,7 @@ class Client extends EventEmitter {
window.onChangeMessageEvent(window.WWebJS.getMessageModel(msg));
});
Msg.on('change:type', (msg) => {
if (msg.type !== 'revoked') return;
window.onChangeMessageTypeEvent(
window.WWebJS.getMessageModel(msg),
);
Expand Down
Loading