fix Event Ready Again and SendMessage (#3747)
* fix Event Ready Again * Fixing SendMessage * Fixing RejectCall
This commit is contained in:
parent
f1fe3aad09
commit
4ac22c8c37
2 changed files with 3 additions and 3 deletions
|
|
@ -234,7 +234,7 @@ class Client extends EventEmitter {
|
||||||
* @type {ClientInfo}
|
* @type {ClientInfo}
|
||||||
*/
|
*/
|
||||||
this.info = new ClientInfo(this, await this.pupPage.evaluate(() => {
|
this.info = new ClientInfo(this, await this.pupPage.evaluate(() => {
|
||||||
return { ...window.Store.Conn.serialize(), wid: window.Store.User.getMaybeMeUser() };
|
return { ...window.Store.Conn.serialize(), wid: window.Store.User.getMaybeMePnUser() || window.Store.User.getMaybeMeLidUser() };
|
||||||
}));
|
}));
|
||||||
|
|
||||||
this.interface = new InterfaceController(this);
|
this.interface = new InterfaceController(this);
|
||||||
|
|
|
||||||
|
|
@ -242,7 +242,7 @@ exports.LoadUtils = () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const lidUser = window.Store.User.getMaybeMeLidUser();
|
const lidUser = window.Store.User.getMaybeMeLidUser();
|
||||||
const meUser = window.Store.User.getMaybeMeUser();
|
const meUser = window.Store.User.getMaybeMePnUser();
|
||||||
const newId = await window.Store.MsgKey.newId();
|
const newId = await window.Store.MsgKey.newId();
|
||||||
let from = chat.id.isLid() ? lidUser : meUser;
|
let from = chat.id.isLid() ? lidUser : meUser;
|
||||||
let participant;
|
let participant;
|
||||||
|
|
@ -839,7 +839,7 @@ exports.LoadUtils = () => {
|
||||||
|
|
||||||
window.WWebJS.rejectCall = async (peerJid, id) => {
|
window.WWebJS.rejectCall = async (peerJid, id) => {
|
||||||
peerJid = peerJid.split('@')[0] + '@s.whatsapp.net';
|
peerJid = peerJid.split('@')[0] + '@s.whatsapp.net';
|
||||||
let userId = window.Store.User.getMaybeMeUser().user + '@s.whatsapp.net';
|
let userId = window.Store.User.getMaybeMePnUser().user + '@s.whatsapp.net';
|
||||||
const stanza = window.Store.SocketWap.wap('call', {
|
const stanza = window.Store.SocketWap.wap('call', {
|
||||||
id: window.Store.SocketWap.generateId(),
|
id: window.Store.SocketWap.generateId(),
|
||||||
from: window.Store.SocketWap.USER_JID(userId),
|
from: window.Store.SocketWap.USER_JID(userId),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue