@hansaka02/baileys 7.3.4 → 7.3.6

package/lib/Socket/community.js

@@ -3,7 +3,11 @@
 Object.defineProperty(exports, "__esModule", { value: true })
 
 const { proto } = require("../../WAProto")
-const { WAMessageStubType } = require("../Types")
+const { default: logger } = require("../Utils/logger")
+const { 
+  WAMessageStubType, 
+  WAMessageAddressingMode
+} = require("../Types")
 const {
   generateMessageID, 
   unixTimestampSeconds
@@ -19,7 +23,14 @@ const { makeBusinessSocket } = require("./business")
 
 const makeCommunitiesSocket = (config) => {
     const suki = makeBusinessSocket(config)
-    const { authState, ev, query, groupMetadata, upsertMessage } = suki
+    const { 
+		authState, 
+		ev, 
+		query, 
+		groupMetadata, 
+		upsertMessage, 
+		cleanDirtyBits
+	} = suki
     
     const communityQuery = async (jid, type, content) => (query({
         tag: 'iq',
@@ -75,6 +86,28 @@ const makeCommunitiesSocket = (config) => {
         return data
     }
     
+    async function parseGroupResult(node) {
+        logger.info({ node }, 'parseGroupResult')
+        
+        const groupNode = getBinaryNodeChild(node, 'group')
+        
+        if (groupNode) {
+            try {
+                logger.info({ groupNode }, 'groupNode')
+                
+                const metadata = await groupMetadata(`${groupNode.attrs.id}@g.us`)
+                
+                return metadata ? metadata : null
+            }
+            catch (error) {
+                logger.warn({ error }, 'Error parsing group metadata')
+                return null
+            }
+        }
+        
+        return null
+    }
+    
     suki.ws.on('CB:ib,,dirty', async (node) => {
     	const { attrs } = getBinaryNodeChild(node, 'dirty') 
     
@@ -83,7 +116,7 @@ const makeCommunitiesSocket = (config) => {
     	}
     
     	await communityFetchAllParticipating() 
-    	await suki.cleanDirtyBits('groups') 
+    	await cleanDirtyBits('groups') 
     }) 
     
     return {
@@ -125,7 +158,28 @@ const makeCommunitiesSocket = (config) => {
                 }
             ])
             
-            return extractCommunityMetadata(result)
+            return await parseGroupResult(result)
+        },
+        communityCreateGroup: async (subject, participants, parentCommunityJid) => {
+            const key = generateMessageID()
+            const result = await communityQuery('@g.us', 'set', [
+                {
+                    tag: 'create',
+                    attrs: {
+                        subject,
+                        key
+                    },
+                    content: [
+                        ...participants.map(jid => ({
+                            tag: 'participant',
+                            attrs: { jid }
+                        })),
+                        { tag: 'linked_parent', attrs: { jid: parentCommunityJid } }
+                    ]
+                }
+            ])
+            
+            return await parseGroupResult(result)
         },
         communityLeave: async (id) => {
             await communityQuery('@g.us', 'set', [
@@ -147,6 +201,72 @@ const makeCommunitiesSocket = (config) => {
                 }
             ])
         },
+        communityLinkGroup: async (groupJid, parentCommunityJid) => {
+            await communityQuery(parentCommunityJid, 'set', [
+                {
+                    tag: 'links',
+                    attrs: {},
+                    content: [
+                        {
+                            tag: 'link',
+                            attrs: { link_type: 'sub_group' },
+                            content: [{ tag: 'group', attrs: { jid: groupJid } }]
+                        }
+                    ]
+                }
+            ])
+        },
+        communityUnlinkGroup: async (groupJid, parentCommunityJid) => {
+            await communityQuery(parentCommunityJid, 'set', [
+                {
+                    tag: 'unlink',
+                    attrs: { unlink_type: 'sub_group' },
+                    content: [{ tag: 'group', attrs: { jid: groupJid } }]
+                }
+            ])
+        },
+        communityFetchLinkedGroups: async (jid) => {
+            let communityJid = jid
+            let isCommunity = false
+            
+            // Try to determine if it is a subgroup or a community
+            const metadata = await groupMetadata(jid)
+            
+            if (metadata.linkedParent) {
+                // It is a subgroup, get the community jid
+                communityJid = metadata.linkedParent
+            }
+            
+            else {
+                // It is a community
+                isCommunity = true
+            }
+            
+            // Fetch all subgroups of the community
+            const result = await communityQuery(communityJid, 'get', [{ tag: 'sub_groups', attrs: {} }])
+            const linkedGroupsData = []
+            const subGroupsNode = getBinaryNodeChild(result, 'sub_groups')
+            
+            if (subGroupsNode) {
+                const groupNodes = getBinaryNodeChildren(subGroupsNode, 'group')
+                
+                for (const groupNode of groupNodes) {
+                    linkedGroupsData.push({
+                        id: groupNode.attrs.id ? jidEncode(groupNode.attrs.id, 'g.us') : undefined,
+                        subject: groupNode.attrs.subject || '',
+                        creation: groupNode.attrs.creation ? Number(groupNode.attrs.creation) : undefined,
+                        owner: groupNode.attrs.creator ? jidNormalizedUser(groupNode.attrs.creator) : undefined,
+                        size: groupNode.attrs.size ? Number(groupNode.attrs.size) : undefined
+                    })
+                }
+            }
+            
+            return {
+                communityJid,
+                isCommunity,
+                linkedGroups: linkedGroupsData
+            }
+        },
         communityRequestParticipantsList: async (jid) => {
             const result = await communityQuery(jid, 'get', [
                 {
@@ -161,7 +281,8 @@ const makeCommunitiesSocket = (config) => {
             return participants.map(v => v.attrs)
         },
         communityRequestParticipantsUpdate: async (jid, participants, action) => {
-            const result = await communityQuery(jid, 'set', [{
+            const result = await communityQuery(jid, 'set', [
+                {
                     tag: 'membership_requests_action',
                     attrs: {},
                     content: [
@@ -174,8 +295,9 @@ const makeCommunitiesSocket = (config) => {
                             }))
                         }
                     ]
-                }])
-                
+                }
+            ])
+            
             const node = getBinaryNodeChild(result, 'membership_requests_action')
             const nodeAction = getBinaryNodeChild(node, action)
             const participantsAffected = getBinaryNodeChildren(nodeAction, 'participant')
@@ -188,13 +310,14 @@ const makeCommunitiesSocket = (config) => {
             const result = await communityQuery(jid, 'set', [
                 {
                     tag: action,
-                    attrs: {},
+                    attrs: action === 'remove' ? { linked_groups: 'true' } : {},
                     content: participants.map(jid => ({
                         tag: 'participant',
                         attrs: { jid }
                     }))
                 }
             ])
+            
             const node = getBinaryNodeChild(result, action)
             const participantsAffected = getBinaryNodeChildren(node, 'participant')
             
@@ -204,8 +327,7 @@ const makeCommunitiesSocket = (config) => {
         },
         communityUpdateDescription: async (jid, description) => {
             const metadata = await communityMetadata(jid)
-            const prev = metadata.descId ? metadata.descId : null
-            
+            const prev = metadata.descId ?? null
             await communityQuery(jid, 'set', [
                 {
                     tag: 'description',
@@ -213,9 +335,7 @@ const makeCommunitiesSocket = (config) => {
                         ...(description ? { id: generateMessageID() } : { delete: 'true' }),
                         ...(prev ? { prev } : {})
                     },
-                    content: description ? [
-                        { tag: 'body', attrs: {}, content: Buffer.from(description, 'utf-8') }
-                    ] : undefined
+                    content: description ? [{ tag: 'body', attrs: {}, content: Buffer.from(description, 'utf-8') }] : undefined
                 }
             ])
         },
@@ -223,19 +343,19 @@ const makeCommunitiesSocket = (config) => {
             const result = await communityQuery(jid, 'get', [{ tag: 'invite', attrs: {} }])
             const inviteNode = getBinaryNodeChild(result, 'invite')
             
-            return inviteNode?.attrs?.code
+            return inviteNode?.attrs.code
         },
         communityRevokeInvite: async (jid) => {
             const result = await communityQuery(jid, 'set', [{ tag: 'invite', attrs: {} }])
             const inviteNode = getBinaryNodeChild(result, 'invite')
             
-            return inviteNode?.attrs?.code
+            return inviteNode?.attrs.code
         },
         communityAcceptInvite: async (code) => {
             const results = await communityQuery('@g.us', 'set', [{ tag: 'invite', attrs: { code } }])
             const result = getBinaryNodeChild(results, 'community')
             
-            return result?.attrs?.jid
+            return result?.attrs.jid
         },
         /**
          * revoke a v4 invite for someone
@@ -244,26 +364,31 @@ const makeCommunitiesSocket = (config) => {
          * @returns true if successful
          */
         communityRevokeInviteV4: async (communityJid, invitedJid) => {
-            const result = await communityQuery(communityJid, 'set', [{ tag: 'revoke', attrs: {}, content: [{ tag: 'participant', attrs: { jid: invitedJid } }] }])
+            const result = await communityQuery(communityJid, 'set', [
+                { tag: 'revoke', attrs: {}, content: [{ tag: 'participant', attrs: { jid: invitedJid } }] }
+            ])
             
             return !!result
         },
         /**
-         * accept a GroupInviteMessage
+         * accept a CommunityInviteMessage
          * @param key the key of the invite message, or optionally only provide the jid of the person who sent the invite
          * @param inviteMessage the message to accept
          */
         communityAcceptInviteV4: ev.createBufferedFunction(async (key, inviteMessage) => {
             key = typeof key === 'string' ? { remoteJid: key } : key
-            const results = await communityQuery(inviteMessage.groupJid, 'set', [{
+            
+            const results = await communityQuery(inviteMessage.groupJid, 'set', [
+                {
                     tag: 'accept',
                     attrs: {
                         code: inviteMessage.inviteCode,
                         expiration: inviteMessage.inviteExpiration.toString(),
                         admin: key.remoteJid
                     }
-                }])
-                
+                }
+            ])
+            
             // if we have the full message key
             // update the invite message to be expired
             if (key.id) {
@@ -283,18 +408,16 @@ const makeCommunitiesSocket = (config) => {
                 ])
             }
             
-            // generate the group add message
+            // generate the community add message
             await upsertMessage({
                 key: {
                     remoteJid: inviteMessage.groupJid,
-                    id: generateMessageID(authState.creds.me?.id), 
+                    id: generateMessageID(suki.user?.id),
                     fromMe: false,
-                    participant: key.remoteJid,
+                    participant: key.remoteJid // TODO: investigate if this makes any sense at all
                 },
                 messageStubType: WAMessageStubType.GROUP_PARTICIPANT_ADD,
-                messageStubParameters: [
-                    authState.creds.me.id
-                ],
+                messageStubParameters: [JSON.stringify(authState.creds.me)],
                 participant: key.remoteJid,
                 messageTimestamp: unixTimestampSeconds()
             }, 'notify')
@@ -303,13 +426,13 @@ const makeCommunitiesSocket = (config) => {
         }),
         communityGetInviteInfo: async (code) => {
             const results = await communityQuery('@g.us', 'get', [{ tag: 'invite', attrs: { code } }])
-            
             return extractCommunityMetadata(results)
         },
         communityToggleEphemeral: async (jid, ephemeralExpiration) => {
-            const content = ephemeralExpiration ?
-                { tag: 'ephemeral', attrs: { expiration: ephemeralExpiration.toString() } } :
-                { tag: 'not_ephemeral', attrs: {} }
+            const content = ephemeralExpiration
+                ? { tag: 'ephemeral', attrs: { expiration: ephemeralExpiration.toString() } }
+                : { tag: 'not_ephemeral', attrs: {} }
+                
             await communityQuery(jid, 'set', [content])
         },
         communitySettingUpdate: async (jid, setting) => {
@@ -319,7 +442,9 @@ const makeCommunitiesSocket = (config) => {
             await communityQuery(jid, 'set', [{ tag: 'member_add_mode', attrs: {}, content: mode }])
         },
         communityJoinApprovalMode: async (jid, mode) => {
-            await communityQuery(jid, 'set', [{ tag: 'membership_approval_mode', attrs: {}, content: [{ tag: 'community_join', attrs: { state: mode } }] }])
+            await communityQuery(jid, 'set', [
+                { tag: 'membership_approval_mode', attrs: {}, content: [{ tag: 'community_join', attrs: { state: mode } }] }
+            ])
         },
         communityFetchAllParticipating
     }
@@ -344,13 +469,15 @@ const extractCommunityMetadata = (result) => {
     
     const metadata = {
         id: communityId,
-        addressingMode: mode, 
         subject: community.attrs.subject,
-        subjectOwner: mode === 'lid' ? community.attrs.s_o_pn : community.attrs.s_o,
-        subjectTime: +community.attrs.s_t,
-        size: community.attrs?.size ? +community.attrs.size : getBinaryNodeChildren(community, 'participant').length,
-        creation: +community.attrs.creation,
-        owner: community.attrs.creator ? jidNormalizedUser(mode === 'lid' ? community.attrs.creator_pn : community.attrs.creator) : undefined,
+        subjectOwner: community.attrs.s_o,
+        subjectOwnerAlt: community.attrs?.s_o_pn ? community.attrs.s_o_pn : community.attrs.s_o, 
+        subjectTime: Number(community.attrs.s_t || 0),
+        size: Number(community.attrs?.size ? community.attrs.size : getBinaryNodeChildren(community, 'participant').length),
+        creation: Number(community.attrs.creation || 0),
+        owner: community.attrs.creator ? jidNormalizedUser(community.attrs.creator) : undefined,
+        ownerAlt: community.attrs.creator ? jidNormalizedUser(community.attrs?.creator_pn ? community.attrs.creator_pn : community.attrs.creator) : undefined, 
+        ownerCountry: community.attrs.creator_country_code, 
         desc,
         descId,
         linkedParent: getBinaryNodeChild(community, 'linked_parent')?.attrs.jid || undefined,
@@ -362,12 +489,13 @@ const extractCommunityMetadata = (result) => {
         memberAddMode,
         participants: getBinaryNodeChildren(community, 'participant').map(({ attrs }) => {
             return {
-                id: mode === 'lid' ? community.phone_number : attrs.jid,
-                lid: mode === 'lid' ? community.jid : attrs.lid, 
+                id: mode === WAMessageAddressingMode.LID ? community.phone_number : attrs.jid,
+                lid: mode === WAMessageAddressingMode.LID ? community.jid : attrs.lid, 
                 admin: (attrs.type || null),
             }
         }),
-        ephemeralDuration: eph ? +eph : undefined, 
+        ephemeralDuration: eph ? Number(ph) : undefined, 
+        addressingMode: mode
     }
     
     return metadata

package/lib/Socket/groups.js

@@ -21,7 +21,13 @@ const { makeChatsSocket } = require("./chats")
 
 const makeGroupsSocket = (config) => {
     const suki = makeChatsSocket(config)
-    const { authState, ev, query, upsertMessage } = suki
+    const { 
+        authState, 
+        ev, 
+        query, 
+        cleanDirtyBits, 
+        upsertMessage 
+    } = suki
     
     const groupQuery = async (jid, type, content) => (query({
         tag: 'iq',
@@ -84,7 +90,7 @@ const makeGroupsSocket = (config) => {
         }
                 
         await groupFetchAllParticipating()
-        await suki.cleanDirtyBits('groups')
+        await cleanDirtyBits('groups')
     })
     
     return {
@@ -270,14 +276,12 @@ const makeGroupsSocket = (config) => {
             await upsertMessage({
                 key: {
                     remoteJid: inviteMessage.groupJid,
-                    id: generateMessageID(authState.creds.me?.id), 
+                    id: generateMessageID(suki.user?.id),
                     fromMe: false,
-                    participant: key.remoteJid,
+                    participant: key.remoteJid
                 },
                 messageStubType: WAMessageStubType.GROUP_PARTICIPANT_ADD,
-                messageStubParameters: [
-                    authState.creds.me.id
-                ],
+                messageStubParameters: [JSON.stringify(authState.creds.me)],
                 participant: key.remoteJid,
                 messageTimestamp: unixTimestampSeconds()
             }, 'notify')
@@ -311,18 +315,18 @@ const makeGroupsSocket = (config) => {
 const extractGroupMetadata = (result) => {
     const group = getBinaryNodeChild(result, 'group')
     const descChild = getBinaryNodeChild(group, 'description')
-    const mode = group.attrs.addressing_mode === 'lid' ? WAMessageAddressingMode.LID : WAMessageAddressingMode.PN
+    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 = getBinaryNodeChildString(descChild, 'body')
         descId = descChild.attrs.id
         descOwner = mode === WAMessageAddressingMode.LID ? jidNormalizedUser(descChild.attrs.participant_pn) : jidNormalizedUser(descChild.attrs.participant) 
-        descOwnerLid = mode === WAMessageAddressingMode.LID ? jidNormalizedUser(descChild.attrs.participant) : undefined
+        descOwnerAlt = mode === WAMessageAddressingMode.LID ? jidNormalizedUser(descChild.attrs.participant) : undefined
     }
     
     const groupId = group.attrs.id.includes('@') ? group.attrs.id : jidEncode(group.attrs.id, 'g.us')
@@ -331,20 +335,19 @@ const extractGroupMetadata = (result) => {
     
     const metadata = {
         id: groupId,
-        addressingMode: mode, 
         subject: group.attrs.subject,
-        subjectOwner: mode === 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 : getBinaryNodeChildren(group, 'participant').length,
-        creation: +group.attrs.creation,
-        owner: group.attrs.creator ? jidNormalizedUser(mode === WAMessageAddressingMode.LID ? group.attrs.creator_pn : group.attrs.creator) : undefined,
-        ownerLid: group.attrs.creator ? 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, 
+        descOwnerAlt, 
         linkedParent: getBinaryNodeChild(group, 'linked_parent')?.attrs.jid || undefined,
         restrict: !!getBinaryNodeChild(group, 'locked'),
         announce: !!getBinaryNodeChild(group, 'announcement'),
@@ -356,10 +359,11 @@ const extractGroupMetadata = (result) => {
             return {
                 id: mode === WAMessageAddressingMode.LID ? attrs.phone_number : attrs.jid,
                 lid: mode === WAMessageAddressingMode.LID ? attrs.jid : attrs.lid, 
-                admin: (attrs.type || null),
+                admin: (attrs.type || null)
             }
         }),
-        ephemeralDuration: eph ? +eph : undefined, 
+        ephemeralDuration: eph ? Number(eph) : undefined, 
+        addressingMode: mode
     }
     
     return metadata