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

Merge branch 'multi-device' into multi-device-legacy

Browse Source
This commit is contained in:
Adhiraj Singh
2021-12-17 19:28:00 +05:30
parent 19a9980492 38a44be006
commit be0e2210d9
9 changed files with 558 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Socket/chats.ts
View File

@@ -139,6 +139,7 @@ export const makeChatsSocket = (config: SocketConfig) => {
await query({
tag: 'iq',
attrs: {
xmlns: 'blocklist',
to: S_WHATSAPP_NET,
type: 'set'
},
@@ -604,4 +605,4 @@ export const makeChatsSocket = (config: SocketConfig) => {
chatModify,
resyncMainAppState,
}
}
}

8
src/Socket/messages-recv.ts
View File

@@ -494,9 +494,11 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
const handleReceipt = async(node: BinaryNode) => {
let shouldAck = true
const { attrs, content } = node
const isNodeFromMe = areJidsSameUser(attrs.from, authState.creds.me?.id)
const remoteJid = attrs.recipient || attrs.from
const fromMe = attrs.recipient ? false : true
const fromMe = isNodeFromMe || (attrs.recipient ? false : true)
const ids = [attrs.id]
if(Array.isArray(content)) {
@@ -512,7 +514,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
}
const status = getStatusFromReceiptType(attrs.type)
if(typeof status !== 'undefined' && !areJidsSameUser(attrs.from, authState.creds.me?.id)) {
if(typeof status !== 'undefined' && !isNodeFromMe) {
ev.emit('messages.update', ids.map(id => ({
key: { ...key, id },
update: { status }
@@ -520,6 +522,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
}
if(attrs.type === 'retry') {
// correctly set who is asking for the retry
key.participant = key.participant || attrs.from
if(key.fromMe) {
try {
logger.debug({ attrs }, 'recv retry request')

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

@@ -1,5 +1,4 @@
import got from "got"
import { Boom } from "@hapi/boom"
import { SocketConfig, MediaConnInfo, AnyMessageContent, MiscMessageGenerationOptions, WAMediaUploadFunction, MessageRelayOptions } from "../Types"
import { encodeWAMessage, generateMessageID, generateWAMessage, encryptSenderKeyMsgSignalProto, encryptSignalProto, extractDeviceJids, jidToSignalProtocolAddress, parseAndInjectE2ESessions, getWAUploadToServer } from "../Utils"
@@ -30,7 +29,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
const fetchPrivacySettings = async(force: boolean = false) => {
if(!privacySettings || force) {
const result = await query({
const { content } = await query({
tag: 'iq',
attrs: {
xmlns: 'privacy',
@@ -41,7 +40,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
{ tag: 'privacy', attrs: { } }
]
})
privacySettings = reduceBinaryNodeToDictionary(result, 'category')
privacySettings = reduceBinaryNodeToDictionary(content[0] as BinaryNode, 'category')
}
return privacySettings
}