Skip to content
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

Jump to bottom

fix: fixed deleteMessage #1954

Merged
merged 5 commits into from
Jun 6, 2024
Merged

fix: fixed deleteMessage #1954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ffe256
fix: fixed deleteMessage
opsJson May 23, 2024
1c16f7e
fix: chatId readded
opsJson May 24, 2024
63592ba
fix: isRevoked fixed
opsJson May 24, 2024
1b0d7b9
fix: isSentByMe fixed
opsJson May 24, 2024
d2ceb31
fix: backwards compatibility with versions < 2.3000.x
opsJson May 28, 2024
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
32 changes: 28 additions & 4 deletions src/chat/functions/deleteMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* limitations under the License.
*/

import { compare } from 'compare-versions';

import { assertGetChat } from '../../assert';
import { Cmd, Wid } from '../../whatsapp';
import { MSG_TYPE, SendMsgResult } from '../../whatsapp/enums';
Expand Down Expand Up @@ -83,7 +85,7 @@ export async function deleteMessage(
let sendMsgResult: SendMsgResult = SendMsgResult.ERROR_UNKNOWN;
let isRevoked = false;
let isDeleted = false;
const isSentByMe = msg.isSentByMe;
const isSentByMe = msg.senderObj.isMe;

if (msg.type === MSG_TYPE.REVOKED && revoke) {
// Message is already revoked
Expand All @@ -94,17 +96,39 @@ export async function deleteMessage(
(msg as any).__x_isUserCreatedType = true;
}

Cmd.sendRevokeMsgs(chat, [msg], { clearMedia: deleteMediaInDevice });
if (compare(self.Debug.VERSION, '2.3000.0', '>=')) {
Cmd.sendRevokeMsgs(
chat,
{
type: 'message',
list: [msg],
},
{ clearMedia: deleteMediaInDevice }
);
} else {
Cmd.sendRevokeMsgs(chat, [msg], { clearMedia: deleteMediaInDevice });
}

if (chat.promises.sendRevokeMsgs) {
const result = await chat.promises.sendRevokeMsgs;
if (Array.isArray(result)) {
sendMsgResult = result[0];
}
}
isRevoked = msg.isRevokedByMe;
isRevoked = msg.type == 'revoked';
} else {
Cmd.sendDeleteMsgs(chat, [msg], deleteMediaInDevice);
if (compare(self.Debug.VERSION, '2.3000.0', '>=')) {
Cmd.sendDeleteMsgs(
chat,
{
type: 'message',
list: [msg],
},
{ clearMedia: deleteMediaInDevice }
);
} else {
Cmd.sendDeleteMsgs(chat, [msg], { clearMedia: deleteMediaInDevice });
}

if (chat.promises.sendDeleteMsgs) {
const result = await chat.promises.sendDeleteMsgs;
Expand Down
20 changes: 16 additions & 4 deletions src/whatsapp/misc/Cmd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,25 @@ export declare class CmdClass extends EventEmitter {
): void;
sendDeleteMsgs(
chat: ChatModel,
msgs: MsgModel[],
clearMedia?: boolean,
toastPosition?: any
msg:
| {
type: string;
list: MsgModel[];
}
| MsgModel[],
options?: {
clearMedia?: boolean;
toastPosition?: any;
}
): void;
sendRevokeMsgs(
chat: ChatModel,
msgs: MsgModel[],
msg:
| {
type: string;
list: MsgModel[];
}
| MsgModel[],
options?: {
clearMedia?: boolean;
toastPosition?: any;
Expand Down