@hansaka02/baileys 7.3.2 → 7.3.6

package/lib/Socket/groups.js

@@ -1,15 +1,33 @@
 "use strict"
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const WAProto_1 = require("../../WAProto")
-const Types_1 = require("../Types")
-const Utils_1 = require("../Utils")
-const WABinary_1 = require("../WABinary")
-const chats_1 = require("./chats")
+const { proto } = require("../../WAProto")
+const {
+  WAMessageStubType, 
+  WAMessageAddressingMode
+} = require("../Types")
+const {
+  generateMessageID, 
+  unixTimestampSeconds
+} = require("../Utils")
+const {
+  getBinaryNodeChild, 
+  getBinaryNodeChildren,
+  getBinaryNodeChildString, 
+  jidEncode,
+  jidNormalizedUser
+} = require("../WABinary")
+const { makeChatsSocket } = require("./chats")
 
 const makeGroupsSocket = (config) => {
-    const suki = chats_1.makeChatsSocket(config)
-    const { authState, ev, query, upsertMessage } = suki
+    const suki = makeChatsSocket(config)
+    const { 
+        authState, 
+        ev, 
+        query, 
+        cleanDirtyBits, 
+        upsertMessage 
+    } = suki
     
     const groupQuery = async (jid, type, content) => (query({
         tag: 'iq',
@@ -47,10 +65,10 @@ const makeGroupsSocket = (config) => {
         })
         
         const data = {}
-        const groupsChild = WABinary_1.getBinaryNodeChild(result, 'groups')
+        const groupsChild = getBinaryNodeChild(result, 'groups')
         
         if (groupsChild) {
-            const groups = WABinary_1.getBinaryNodeChildren(groupsChild, 'group')
+            const groups = getBinaryNodeChildren(groupsChild, 'group')
             for (const groupNode of groups) {
                 const meta = extractGroupMetadata({
                     tag: 'result',
@@ -66,13 +84,13 @@ const makeGroupsSocket = (config) => {
     }
     
     suki.ws.on('CB:ib,,dirty', async (node) => {
-        const { attrs } = WABinary_1.getBinaryNodeChild(node, 'dirty')
+        const { attrs } = getBinaryNodeChild(node, 'dirty')
         if (attrs.type !== 'groups') {
             return
         }
                 
         await groupFetchAllParticipating()
-        await suki.cleanDirtyBits('groups')
+        await cleanDirtyBits('groups')
     })
     
     return {
@@ -80,7 +98,7 @@ const makeGroupsSocket = (config) => {
         groupQuery, 
         groupMetadata,
         groupCreate: async (subject, participants) => {
-            const key = Utils_1.generateMessageID()
+            const key = generateMessageID()
             
             const result = await groupQuery('@g.us', 'set', [
                 {
@@ -126,8 +144,8 @@ const makeGroupsSocket = (config) => {
                 }
             ])
             
-            const node = WABinary_1.getBinaryNodeChild(result, 'membership_approval_requests')
-            const participants = WABinary_1.getBinaryNodeChildren(node, 'membership_approval_request')
+            const node = getBinaryNodeChild(result, 'membership_approval_requests')
+            const participants = getBinaryNodeChildren(node, 'membership_approval_request')
             
             return participants.map(v => v.attrs)
         },
@@ -147,9 +165,9 @@ const makeGroupsSocket = (config) => {
                     ]
                 }])
                 
-            const node = WABinary_1.getBinaryNodeChild(result, 'membership_requests_action')
-            const nodeAction = WABinary_1.getBinaryNodeChild(node, action)
-            const participantsAffected = WABinary_1.getBinaryNodeChildren(nodeAction, 'participant')
+            const node = getBinaryNodeChild(result, 'membership_requests_action')
+            const nodeAction = getBinaryNodeChild(node, action)
+            const participantsAffected = getBinaryNodeChildren(nodeAction, 'participant')
             
             return participantsAffected.map(p => {
                 return { status: p.attrs.error || '200', jid: p.attrs.jid }
@@ -166,8 +184,8 @@ const makeGroupsSocket = (config) => {
                     }))
                 }
             ])
-            const node = WABinary_1.getBinaryNodeChild(result, action)
-            const participantsAffected = WABinary_1.getBinaryNodeChildren(node, 'participant')
+            const node = getBinaryNodeChild(result, action)
+            const participantsAffected = getBinaryNodeChildren(node, 'participant')
             
             return participantsAffected.map(p => {
                 return { status: p.attrs.error || '200', jid: p.attrs.jid, content: p }
@@ -181,7 +199,7 @@ const makeGroupsSocket = (config) => {
                 {
                     tag: 'description',
                     attrs: {
-                        ...(description ? { id: Utils_1.generateMessageID() } : { delete: 'true' }),
+                        ...(description ? { id: generateMessageID() } : { delete: 'true' }),
                         ...(prev ? { prev } : {})
                     },
                     content: description ? [
@@ -192,19 +210,19 @@ const makeGroupsSocket = (config) => {
         },
         groupInviteCode: async (jid) => {
             const result = await groupQuery(jid, 'get', [{ tag: 'invite', attrs: {} }])
-            const inviteNode = WABinary_1.getBinaryNodeChild(result, 'invite')
+            const inviteNode = getBinaryNodeChild(result, 'invite')
             
             return inviteNode?.attrs?.code
         },
         groupRevokeInvite: async (jid) => {
             const result = await groupQuery(jid, 'set', [{ tag: 'invite', attrs: {} }])
-            const inviteNode = WABinary_1.getBinaryNodeChild(result, 'invite')
+            const inviteNode = getBinaryNodeChild(result, 'invite')
             
             return inviteNode?.attrs?.code
         },
         groupAcceptInvite: async (code) => {
             const results = await groupQuery('@g.us', 'set', [{ tag: 'invite', attrs: { code } }])
-            const result = WABinary_1.getBinaryNodeChild(results, 'group')
+            const result = getBinaryNodeChild(results, 'group')
             
             return result?.attrs?.jid
         },
@@ -239,7 +257,7 @@ const makeGroupsSocket = (config) => {
             // update the invite message to be expired
             if (key.id) {
                 // create new invite message that is expired
-                inviteMessage = WAProto_1.proto.Message.GroupInviteMessage.fromObject(inviteMessage)
+                inviteMessage = proto.Message.GroupInviteMessage.fromObject(inviteMessage)
                 inviteMessage.inviteExpiration = 0
                 inviteMessage.inviteCode = ''
                 ev.emit('messages.update', [
@@ -258,16 +276,14 @@ const makeGroupsSocket = (config) => {
             await upsertMessage({
                 key: {
                     remoteJid: inviteMessage.groupJid,
-                    id: Utils_1.generateMessageID(authState.creds.me?.id), 
+                    id: generateMessageID(suki.user?.id),
                     fromMe: false,
-                    participant: key.remoteJid,
+                    participant: key.remoteJid
                 },
-                messageStubType: Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD,
-                messageStubParameters: [
-                    authState.creds.me.id
-                ],
+                messageStubType: WAMessageStubType.GROUP_PARTICIPANT_ADD,
+                messageStubParameters: [JSON.stringify(authState.creds.me)],
                 participant: key.remoteJid,
-                messageTimestamp: Utils_1.unixTimestampSeconds()
+                messageTimestamp: unixTimestampSeconds()
             }, 'notify')
             
             return results.attrs.from
@@ -297,57 +313,57 @@ const makeGroupsSocket = (config) => {
 }
 
 const extractGroupMetadata = (result) => {
-    const group = WABinary_1.getBinaryNodeChild(result, 'group')
-    const descChild = WABinary_1.getBinaryNodeChild(group, 'description')
-    const mode = group.attrs.addressing_mode === 'lid' ? Types_1.WAMessageAddressingMode.LID : Types_1.WAMessageAddressingMode.PN
+    const group = getBinaryNodeChild(result, 'group')
+    const descChild = getBinaryNodeChild(group, 'description')
+    const mode = group.attrs.addressing_mode === WAMessageAddressingMode.LID ? WAMessageAddressingMode.LID : WAMessageAddressingMode.PN
     
     let desc
     let descId
     let descOwner
-    let descOwnerLid
+    let descOwnerAlt
     
     if (descChild) {
-        desc = WABinary_1.getBinaryNodeChildString(descChild, 'body')
+        desc = getBinaryNodeChildString(descChild, 'body')
         descId = descChild.attrs.id
-        descOwner = mode === Types_1.WAMessageAddressingMode.LID ? WABinary_1.jidNormalizedUser(descChild.attrs.participant_pn) : WABinary_1.jidNormalizedUser(descChild.attrs.participant) 
-        descOwnerLid = mode === Types_1.WAMessageAddressingMode.LID ? WABinary_1.jidNormalizedUser(descChild.attrs.participant) : undefined
+        descOwner = mode === WAMessageAddressingMode.LID ? jidNormalizedUser(descChild.attrs.participant_pn) : jidNormalizedUser(descChild.attrs.participant) 
+        descOwnerAlt = mode === WAMessageAddressingMode.LID ? jidNormalizedUser(descChild.attrs.participant) : undefined
     }
     
-    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 groupId = group.attrs.id.includes('@') ? group.attrs.id : jidEncode(group.attrs.id, 'g.us')
+    const eph = getBinaryNodeChild(group, 'ephemeral')?.attrs.expiration
+    const memberAddMode = getBinaryNodeChildString(group, 'member_add_mode') === 'all_member_add'
     
     const metadata = {
         id: groupId,
-        addressingMode: mode, 
         subject: group.attrs.subject,
-        subjectOwner: mode === Types_1.WAMessageAddressingMode.LID ? group.attrs.s_o_pn : group.attrs.s_o,
-        subjectOwnerLid: group.attrs.s_o, 
-        subjectTime: +group.attrs.s_t,
-        size: group.attrs?.size ? +group.attrs.size : WABinary_1.getBinaryNodeChildren(group, 'participant').length,
-        creation: +group.attrs.creation,
-        owner: group.attrs.creator ? WABinary_1.jidNormalizedUser(mode === Types_1.WAMessageAddressingMode.LID ? group.attrs.creator_pn : group.attrs.creator) : undefined,
-        ownerLid: group.attrs.creator ? WABinary_1.jidNormalizedUser(group.attrs.creator) : undefined, 
+        subjectOwner: group.attrs.s_o,
+        subjectOwnerAlt: group.attrs?.s_o_pn ? group.attrs.s_o_pn : group.attrs.s_o, 
+        subjectTime: Number(group.attrs.s_t),
+        size: Number(group.attrs?.size ? group.attrs.size : getBinaryNodeChildren(group, 'participant').length),
+        creation: Number(group.attrs.creation), 
+        owner: group.attrs.creator ? jidNormalizedUser(group.attrs.creator) : undefined,
+        ownerAlt: group.attrs.creator ? jidNormalizedUser(group.attrs?.creator_pn ? group.attrs.creator_pn : group.attrs.creator_pn) : undefined, 
         ownerCountry: group.attrs.creator_country_code, 
         desc,
         descId,
         descOwner, 
-        descOwnerLid, 
-        linkedParent: WABinary_1.getBinaryNodeChild(group, 'linked_parent')?.attrs.jid || undefined,
-        restrict: !!WABinary_1.getBinaryNodeChild(group, 'locked'),
-        announce: !!WABinary_1.getBinaryNodeChild(group, 'announcement'),
-        isCommunity: !!WABinary_1.getBinaryNodeChild(group, 'parent'),
-        isCommunityAnnounce: !!WABinary_1.getBinaryNodeChild(group, 'default_sub_group'),
-        joinApprovalMode: !!WABinary_1.getBinaryNodeChild(group, 'membership_approval_mode'),
+        descOwnerAlt, 
+        linkedParent: getBinaryNodeChild(group, 'linked_parent')?.attrs.jid || undefined,
+        restrict: !!getBinaryNodeChild(group, 'locked'),
+        announce: !!getBinaryNodeChild(group, 'announcement'),
+        isCommunity: !!getBinaryNodeChild(group, 'parent'),
+        isCommunityAnnounce: !!getBinaryNodeChild(group, 'default_sub_group'),
+        joinApprovalMode: !!getBinaryNodeChild(group, 'membership_approval_mode'),
         memberAddMode,
-        participants: WABinary_1.getBinaryNodeChildren(group, 'participant').map(({ attrs }) => {
+        participants: getBinaryNodeChildren(group, 'participant').map(({ attrs }) => {
             return {
-                id: mode === Types_1.WAMessageAddressingMode.LID ? attrs.phone_number : attrs.jid,
-                lid: mode === Types_1.WAMessageAddressingMode.LID ? attrs.jid : attrs.lid, 
-                admin: (attrs.type || null),
+                id: mode === WAMessageAddressingMode.LID ? attrs.phone_number : attrs.jid,
+                lid: mode === WAMessageAddressingMode.LID ? attrs.jid : attrs.lid, 
+                admin: (attrs.type || null)
             }
         }),
-        ephemeralDuration: eph ? +eph : undefined, 
+        ephemeralDuration: eph ? Number(eph) : undefined, 
+        addressingMode: mode
     }
     
     return metadata

package/lib/Socket/index.js

@@ -2,13 +2,13 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const Defaults_1 = require("../Defaults")
-const community_1 = require("./community")
+const { DEFAULT_CONNECTION_CONFIG } = require("../Defaults/connection")
+const { makeCommunitiesSocket } = require("./community")
 
 // export the last socket layer
 const makeWASocket = (config) => {
 	const newConfig = {
-    	...Defaults_1.DEFAULT_CONNECTION_CONFIG,
+    	...DEFAULT_CONNECTION_CONFIG,
    	 ...config
     }
     
@@ -18,7 +18,7 @@ const makeWASocket = (config) => {
         newConfig.shouldSyncHistoryMessage = () => !!newConfig.syncFullHistory
     }
 
-    return community_1.makeCommunitiesSocket(newConfig)
+    return makeCommunitiesSocket(newConfig)
 }
 
 exports.default = makeWASocket