From 3dab4a3f41ca994accbe3110c3c36a43c53e2183 Mon Sep 17 00:00:00 2001 From: tofers Date: Tue, 5 Dec 2023 15:50:55 +0300 Subject: [PATCH] fix: `message_edit` event and edit caption in file (#2617) * edit caption * Update Client.js * refactor: events combined into one line --------- Co-authored-by: alechkos <93551621+alechkos@users.noreply.github.com> --- src/Client.js | 3 ++- src/structures/Message.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Client.js b/src/Client.js index 475067d..a25af4d 100644 --- a/src/Client.js +++ b/src/Client.js @@ -43,6 +43,7 @@ const NoAuth = require('./authStrategies/NoAuth'); * @fires Client#message_create * @fires Client#message_revoke_me * @fires Client#message_revoke_everyone + * @fires Client#message_edit * @fires Client#media_uploaded * @fires Client#group_join * @fires Client#group_leave @@ -665,7 +666,7 @@ class Client extends EventEmitter { window.Store.Msg.on('change:ack', (msg, ack) => { window.onMessageAckEvent(window.WWebJS.getMessageModel(msg), ack); }); window.Store.Msg.on('change:isUnsentMedia', (msg, unsent) => { if (msg.id.fromMe && !unsent) window.onMessageMediaUploadedEvent(window.WWebJS.getMessageModel(msg)); }); window.Store.Msg.on('remove', (msg) => { if (msg.isNewMsg) window.onRemoveMessageEvent(window.WWebJS.getMessageModel(msg)); }); - window.Store.Msg.on('change:body', (msg, newBody, prevBody) => { window.onEditMessageEvent(window.WWebJS.getMessageModel(msg), newBody, prevBody); }); + window.Store.Msg.on('change:body change:caption', (msg, newBody, prevBody) => { window.onEditMessageEvent(window.WWebJS.getMessageModel(msg), newBody, prevBody); }); window.Store.AppState.on('change:state', (_AppState, state) => { window.onAppStateChangedEvent(state); }); window.Store.Conn.on('change:battery', (state) => { window.onBatteryStateChangedEvent(state); }); window.Store.Call.on('add', (call) => { window.onIncomingCall(call); }); diff --git a/src/structures/Message.js b/src/structures/Message.js index d21be77..6b8b293 100644 --- a/src/structures/Message.js +++ b/src/structures/Message.js @@ -644,7 +644,7 @@ class Message extends Base { let msg = window.Store.Msg.get(msgId); if (!msg) return null; - let catEdit = (msg.type === 'chat' && window.Store.MsgActionChecks.canEditText(msg)); + let catEdit = window.Store.MsgActionChecks.canEditText(msg) || window.Store.MsgActionChecks.canEditCaption(msg); if (catEdit) { const msgEdit = await window.WWebJS.editMessage(msg, message, options); return msgEdit.serialize();