@jkt48connect-corp/baileys 7.4.5 → 7.4.9

package/lib/Defaults/baileys-version.json

@@ -1,3 +1,3 @@
 {
-    "version": [2, 3000, 1023380135]
+    "version": [2, 3000, 1023780065]
 }

package/lib/Socket/business.js

@@ -5,8 +5,8 @@ const WABinary_1 = require("../WABinary")
 const generic_utils_1 = require("../WABinary/generic-utils")
 const messages_recv_1 = require("./messages-recv")
 const makeBusinessSocket = (config) => {
-const suki = messages_recv_1.makeMessagesRecvSocket(config)
-const { authState, query, waUploadToServer } = suki
+const sock = messages_recv_1.makeMessagesRecvSocket(config)
+const { authState, query, waUploadToServer } = sock
 const getCatalog = async ({ jid, limit, cursor }) => {
 jid = jid || authState.creds.me?.id
 jid = WABinary_1.jidNormalizedUser(jid)
@@ -244,7 +244,7 @@ deleted: +(productCatalogDelNode?.attrs?.deleted_count || 0)
 }
 }
 return {
-...suki,
+...sock,
 logger: config.logger,
 getOrderDetails,
 getCatalog,

package/lib/Socket/chats.js

@@ -16,8 +16,8 @@ const usync_1 = require("./usync")
 const MAX_SYNC_ATTEMPTS = 2
 const makeChatsSocket = (config) => {
 const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, } = config
-const suki = usync_1.makeUSyncSocket(config)
-const { ev, ws, authState, generateMessageTag, sendNode, query, onUnexpectedError, groupFetchAllParticipating } = suki
+const sock = usync_1.makeUSyncSocket(config)
+const { ev, ws, authState, generateMessageTag, sendNode, query, onUnexpectedError, groupFetchAllParticipating } = sock
 let privacySettings
 let needToFlushWithAppStateSync = false
 let pendingAppStateSync = false
@@ -164,7 +164,7 @@ parser: (node) => node.attrs.val
 usyncQuery.users.push({
 id: targetJid
 })
-const result = await suki.executeUSyncQuery(usyncQuery)
+const result = await sock.executeUSyncQuery(usyncQuery)
 if (result) {
 return result.list
 }
@@ -175,7 +175,7 @@ for (const jid of jids) {
 const phone = `+${jid.replace('+', '').split('@')[0].split(':')[0]}`
 usyncQuery.withUser(new WAUSync_1.USyncUser().withPhone(phone))
 }
-const results = await suki.executeUSyncQuery(usyncQuery)
+const results = await sock.executeUSyncQuery(usyncQuery)
 if (results) {
 return results.list.filter((a) => !!a.contact).map(({ contact, id, lid }) => ({ jid: id, exists: contact, lid }))
 }
@@ -185,7 +185,7 @@ const usyncQuery = new WAUSync_1.USyncQuery().withStatusProtocol()
 for (const jid of jids) {
 usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid))
 }
-const result = await suki.executeUSyncQuery(usyncQuery)
+const result = await sock.executeUSyncQuery(usyncQuery)
 if (result) {
 return result.list
 }
@@ -195,7 +195,7 @@ const usyncQuery = new WAUSync_1.USyncQuery().withDisappearingModeProtocol()
 for (const jid of jids) {
 usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid))
 }
-const result = await suki.executeUSyncQuery(usyncQuery)
+const result = await sock.executeUSyncQuery(usyncQuery)
 if (result) {
 return result.list
 }
@@ -859,7 +859,7 @@ needToFlushWithAppStateSync = true
 }
 })
 return {
-...suki, 
+...sock, 
 star, 
 addOrEditContact, 
 removeContact, 

package/lib/Socket/groups.js

@@ -6,8 +6,8 @@ const Utils_1 = require("../Utils")
 const WABinary_1 = require("../WABinary")
 const chats_1 = require("./chats")
 const makeGroupsSocket = (config) => {
-const suki = chats_1.makeChatsSocket(config)
-const { authState, ev, query, upsertMessage } = suki
+const sock = chats_1.makeChatsSocket(config)
+const { authState, ev, query, upsertMessage } = sock
 const groupQuery = async (jid, type, content) => (query({
 tag: 'iq',
 attrs: {
@@ -53,11 +53,11 @@ content: [groupNode]
 data[meta.id] = meta
 }
 }
-suki.ev.emit('groups.update', Object.values(data))
+sock.ev.emit('groups.update', Object.values(data))
 return data
 }
 return {
-...suki,
+...sock,
 groupQuery, 
 groupMetadata,
 groupCreate: async (subject, participants) => {
@@ -269,18 +269,20 @@ if (descChild) {
 desc = WABinary_1.getBinaryNodeChildString(descChild, 'body')
 descId = descChild.attrs.id
 }
+const mode = group.attrs.addressing_mode
 const groupId = group.attrs.id.includes('@') ? group.attrs.id : WABinary_1.jidEncode(group.attrs.id, 'g.us')
 const eph = WABinary_1.getBinaryNodeChild(group, 'ephemeral')?.attrs.expiration
 const memberAddMode = WABinary_1.getBinaryNodeChildString(group, 'member_add_mode') === 'all_member_add'
 const metadata = {
 id: groupId,
-addressingMode: group.attrs.addressing_mode, 
+addressingMode: mode, 
 subject: group.attrs.subject,
-subjectOwner: group.attrs.s_o,
+subjectOwner: mode === 'lid' ? group.attrs.s_o_pn : group.attrs.s_o,
 subjectTime: +group.attrs.s_t,
 size: WABinary_1.getBinaryNodeChildren(group, 'participant').length,
 creation: +group.attrs.creation,
-owner: group.attrs.creator ? WABinary_1.jidNormalizedUser(group.attrs.creator) : undefined,
+owner: group.attrs.creator ? WABinary_1.jidNormalizedUser(mode === 'lid' ? group.attrs.creator_pn : group.attrs.creator) : undefined,
+ownerCountry: group.attrs.creator_country_code, 
 desc,
 descId,
 linkedParent: WABinary_1.getBinaryNodeChild(group, 'linked_parent')?.attrs.jid || undefined,
@@ -292,8 +294,8 @@ joinApprovalMode: !!WABinary_1.getBinaryNodeChild(group, 'membership_approval_mo
 memberAddMode,
 participants: WABinary_1.getBinaryNodeChildren(group, 'participant').map(({ attrs }) => {
 return {
-id: attrs.jid,
-lid: attrs.lid, 
+id: mode === 'lid' ? attrs.phone_number : attrs.jid,
+lid: mode === 'lid' ? attrs.jid : attrs.lid, 
 admin: (attrs.type || null),
 }
 }),

package/lib/Socket/messages-recv.js

@@ -16,8 +16,8 @@ const groups_1 = require("./groups")
 const messages_send_1 = require("./messages-send")
 const makeMessagesRecvSocket = (config) => {
 const { logger, retryRequestDelayMs, maxMsgRetryCount, getMessage, shouldIgnoreJid } = config
-const suki = messages_send_1.makeMessagesSocket(config)
-const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, getUSyncDevices, createParticipantNodes, sendPeerDataOperationMessage } = suki
+const sock = messages_send_1.makeMessagesSocket(config)
+const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, getUSyncDevices, createParticipantNodes, sendPeerDataOperationMessage } = sock
 /** this mutex ensures that each retryRequest will wait for the previous one to finish */
 const retryMutex = make_mutex_1.makeMutex()
 const msgRetryCache = config.msgRetryCounterCache || new node_cache_1.default({
@@ -227,8 +227,8 @@ logger.info({ node }, 'unknown encrypt notification')
 }
 }
 }
-const handleGroupNotification = (participant, child, msg) => {
-const participantJid = WABinary_1.getBinaryNodeChild(child, 'participant')?.attrs?.jid || participant
+const handleGroupNotification = (participant, child, msg, mode) => {
+const participantJid = mode === 'lid' ? WABinary_1.getBinaryNodeChild(child, 'participant')?.attrs?.phone_number : WABinary_1.getBinaryNodeChild(child, 'participant')?.attrs?.jid || participant
 switch (child.tag) {
 case 'create':
 const metadata = groups_1.extractGroupMetadata(child)
@@ -259,7 +259,7 @@ ephemeralExpiration: +(child.attrs.expiration || 0)
 }
 break
 case 'modify':
-const oldNumber = WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid)
+const oldNumber = mode === 'lid' ? WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.phone_number) : WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid)
 msg.messageStubParameters = oldNumber || []
 msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER
 break
@@ -273,7 +273,7 @@ if (child.attrs?.reason === 'linked_group_join') {
 stubType = GROUP_PARTICIPANT_LINKED_GROUP_JOIN
 }
 msg.messageStubType = Types_1.WAMessageStubType[stubType]
-const participants = WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid)
+const participants =  mode === 'lid' ? WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.phone_number) : WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid)
 if (participants.length === 1 &&
 // if recv. "remove" message and sender removed themselves
 // mark as left
@@ -285,7 +285,7 @@ msg.messageStubParameters = participants
 break
 case 'subject':
 msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_SUBJECT
-msg.messageStubParameters = [child.attrs.subject]
+msg.messageStubParameters = [participantJid, child.attrs.subject]
 break
 case 'description':
 const description = WABinary_1.getBinaryNodeChild(child, 'body')?.content?.toString()
@@ -346,7 +346,7 @@ break
 case 'linked_group_promote':
 case 'linked_group_demote':
 const stubtype = `COMMUNITY_PARTICIPANT_${child.tag.split('_')[2].toUpperCase()}`
-const participantS = WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid)
+const participantS =  mode === 'lid' ? WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.phone_number) : WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid)
 msg.messageStubType = Types_1.WAMessageStubType[stubtype]
 msg.messageStubParameters = participantS
 break
@@ -452,7 +452,8 @@ logger.debug({ jid }, 'got privacy token update')
 }
 break
 case 'w:gp2':
-handleGroupNotification(node.attrs.participant, child, result)
+const mode = node.attrs.addressing_mode
+handleGroupNotification(mode === 'lid' ? node.attrs.participant_pn : node.attrs.participant, child, result, mode)
 break
 case 'newsletter':
 handleNewsletterNotification(node.attrs.from, child) 
@@ -550,7 +551,7 @@ tag: 'iq',
 attrs: {
 to: WABinary_1.S_WHATSAPP_NET,
 type: 'set',
-id: suki.generateMessageTag(),
+id: sock.generateMessageTag(),
 xmlns: 'md'
 },
 content: [
@@ -1059,7 +1060,7 @@ logger.trace(`sendActiveReceipts set to "${sendActiveReceipts}"`)
 }
 })
 return {
-...suki,
+...sock,
 sendMessageAck,
 sendRetryRequest,
 offerCall,