eddy/whatsapp-web.js
Watch
1
0
Fork
You've already forked whatsapp-web.js
 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fix: msg.chat (#2139)

Browse source 
* fix function openChatWindowAt

* fix star \ unstar

* fix function delete

* fix closeRightDrawer
This commit is contained in:
tofers 2023-04-19 02:50:08 +03:00 • committed by GitHub
commit 37724f6959
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/structures/Message.js
View file

@ -443,15 +443,16 @@ class Message extends Base {
* @param {?boolean} everyone If true and the message is sent by the current user or the user is an admin, will delete it for everyone in the chat.
*/
async delete(everyone) {
await this.client.pupPage.evaluate((msgId, everyone) => {
await this.client.pupPage.evaluate(async (msgId, everyone) => {
let msg = window.Store.Msg.get(msgId);
let chat = await window.Store.Chat.find(msg.id.remote);
const canRevoke = window.Store.MsgActionChecks.canSenderRevokeMsg(msg) || window.Store.MsgActionChecks.canAdminRevokeMsg(msg);
if (everyone && canRevoke) {
return window.Store.Cmd.sendRevokeMsgs(msg.chat, [msg], { type: msg.id.fromMe ? 'Sender' : 'Admin' });
return window.Store.Cmd.sendRevokeMsgs(chat, [msg], { clearMedia: true, type: msg.id.fromMe ? 'Sender' : 'Admin' });
}
return window.Store.Cmd.sendDeleteMsgs(msg.chat, [msg], true);
return window.Store.Cmd.sendDeleteMsgs(chat, [msg], true);
}, this.id._serialized, everyone);
}
@ -459,11 +460,12 @@ class Message extends Base {
* Stars this message
*/
async star() {
await this.client.pupPage.evaluate((msgId) => {
await this.client.pupPage.evaluate(async (msgId) => {
let msg = window.Store.Msg.get(msgId);
if (window.Store.MsgActionChecks.canStarMsg(msg)) {
return window.Store.Cmd.sendStarMsgs(msg.chat, [msg], false);
let chat = await window.Store.Chat.find(msg.id.remote);
return window.Store.Cmd.sendStarMsgs(chat, [msg], false);
}
}, this.id._serialized);
}
@ -472,11 +474,12 @@ class Message extends Base {
* Unstars this message
*/
async unstar() {
await this.client.pupPage.evaluate((msgId) => {
await this.client.pupPage.evaluate(async (msgId) => {
let msg = window.Store.Msg.get(msgId);
if (window.Store.MsgActionChecks.canStarMsg(msg)) {
return window.Store.Cmd.sendUnstarMsgs(msg.chat, [msg], false);
let chat = await window.Store.Chat.find(msg.id.remote);
return window.Store.Cmd.sendUnstarMsgs(chat, [msg], false);
}
}, this.id._serialized);
}

2
src/util/Injected.js
View file

@ -54,6 +54,8 @@ exports.ExposeStore = (moduleRaidStr) => {
window.Store.QuotedMsg = window.mR.findModule('getQuotedMsgObj')[0];
window.Store.Socket = window.mR.findModule('deprecatedSendIq')[0];
window.Store.SocketWap = window.mR.findModule('wap')[0];
window.Store.SearchContext = window.mR.findModule('getSearchContext')[0].getSearchContext;
window.Store.DrawerManager = window.mR.findModule('DrawerManager')[0].DrawerManager;
window.Store.StickerTools = {
...window.mR.findModule('toWebpSticker')[0],
...window.mR.findModule('addWebpMetadata')[0]

6
src/util/InterfaceController.js
View file

@ -50,7 +50,9 @@ class InterfaceController {
async openChatWindowAt(msgId) {
await this.pupPage.evaluate(async msgId => {
let msg = await window.Store.Msg.get(msgId);
await window.Store.Cmd.openChatAt(msg.chat, msg.chat.getSearchContext(msg));
let chat = await window.Store.Chat.find(msg.id.remote);
let searchContext = await window.Store.SearchContext(chat,msg);
await window.Store.Cmd.openChatAt(chat, searchContext);
}, msgId);
}
@ -70,7 +72,7 @@ class InterfaceController {
*/
async closeRightDrawer() {
await this.pupPage.evaluate(async () => {
await window.Store.Cmd.closeDrawerRight();
await window.Store.DrawerManager.closeDrawerRight();
});
}