franpcode/Baileys
1
0
Fork 0
mirror of https://github.com/FranP-code/Baileys.git synced 2025-10-13 00:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: bad request on sending messages in some cases

Browse Source 
Issue source found out by @jackcokk
This commit is contained in:
Adhiraj Singh
2021-12-03 15:20:17 +05:30
parent 7d89b9bb95
commit d9cfed64ff
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Socket/messages-send.ts
View File

@@ -178,9 +178,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
], ],
} }
const result = await query(iq) const result = await query(iq)
const { device } = jidDecode(authState.creds.me!.id) const extracted = extractDeviceJids(result, authState.creds.me!.id, ignoreZeroDevices)
const extracted = extractDeviceJids(result, device, ignoreZeroDevices)
const deviceMap: { [_: string]: JidWithDevice[] } = {} const deviceMap: { [_: string]: JidWithDevice[] } = {}
for(const item of extracted) { for(const item of extracted) {

10
src/Utils/signal.ts
View File

@@ -231,7 +231,8 @@ export const parseAndInjectE2ESession = async(node: BinaryNode, auth: SignalAuth
await cipher.initOutgoing(device) await cipher.initOutgoing(device)
} }
export const extractDeviceJids = (result: BinaryNode, myDeviceId: number, excludeZeroDevices: boolean) => { export const extractDeviceJids = (result: BinaryNode, myJid: string, excludeZeroDevices: boolean) => {
const { user: myUser, device: myDevice } = jidDecode(myJid)
const extracted: JidWithDevice[] = [] const extracted: JidWithDevice[] = []
for(const node of result.content as BinaryNode[]) { for(const node of result.content as BinaryNode[]) {
const list = getBinaryNodeChild(node, 'list')?.content const list = getBinaryNodeChild(node, 'list')?.content
@@ -243,7 +244,12 @@ export const extractDeviceJids = (result: BinaryNode, myDeviceId: number, exclud
if(Array.isArray(deviceListNode?.content)) { if(Array.isArray(deviceListNode?.content)) {
for(const { tag, attrs } of deviceListNode!.content) { for(const { tag, attrs } of deviceListNode!.content) {
const device = +attrs.id const device = +attrs.id
if(tag === 'device' && myDeviceId !== device && (!excludeZeroDevices || device !== 0)) { if(
tag === 'device' && // ensure the "device" tag
(!excludeZeroDevices || device !== 0) && // if zero devices are not-excluded, or device is non zero
(myUser !== user || myDevice !== device) && // either different user or if me user, not this device
(device === 0 || !!attrs['key-index']) // ensure that "key-index" is specified for "non-zero" devices, produces a bad req otherwise
) {
extracted.push({ user, device }) extracted.push({ user, device })
} }
} }