@heavstaltech/baileys 2.3.4 → 3.2.4

package/lib/Socket/dugong.js

@@ -0,0 +1,484 @@
+// "kikyy dugonggg", ah dejavu (r)
+// tanggal 14 agustus 2025 makassar
+// telegram: @tskiofc & @kyuucode
+
+const WAProto = require('../../WAProto').proto;
+const crypto = require('crypto');
+const Utils_1 = require("../Utils");
+
+class kikyy {
+    constructor(utils, waUploadToServer, relayMessageFn) {
+        this.utils = utils;
+        this.relayMessage = relayMessageFn
+        this.waUploadToServer = waUploadToServer;
+        
+        this.bail = {
+            generateWAMessageContent: this.utils.generateWAMessageContent || Utils_1.generateWAMessageContent,
+            generateMessageID: Utils_1.generateMessageID,
+            getContentType: (msg) => Object.keys(msg.message || {})[0]
+        };
+    }
+
+    detectType(content) {
+        if (content.requestPaymentMessage) return 'PAYMENT';
+        if (content.productMessage) return 'PRODUCT';
+        if (content.interactiveMessage) return 'INTERACTIVE';
+        if (content.albumMessage) return 'ALBUM';
+        if (content.eventMessage) return 'EVENT';
+        if (content.pollResultMessage) return 'POLL_RESULT';
+        if (content.groupStatusMessage) return 'GROUP_STORY';
+        return null;
+    }
+
+    async handlePayment(content, quoted) {
+        const data = content.requestPaymentMessage;
+        let notes = {};
+
+        if (data.sticker?.stickerMessage) {
+            notes = {
+                stickerMessage: {
+                    ...data.sticker.stickerMessage,
+                    contextInfo: {
+                        stanzaId: quoted?.key?.id,
+                        participant: quoted?.key?.participant || content.sender,
+                        quotedMessage: quoted?.message
+                    }
+                }
+            };
+        } else if (data.note) {
+            notes = {
+                extendedTextMessage: {
+                    text: data.note,
+                    contextInfo: {
+                        stanzaId: quoted?.key?.id,
+                        participant: quoted?.key?.participant || content.sender,
+                        quotedMessage: quoted?.message
+                    }
+                }
+            };
+        }
+
+        return {
+            requestPaymentMessage: WAProto.Message.RequestPaymentMessage.fromObject({
+                expiryTimestamp: data.expiry || 0,
+                amount1000: data.amount || 0,
+                currencyCodeIso4217: data.currency || "IDR",
+                requestFrom: data.from || "0@s.whatsapp.net",
+                noteMessage: notes,
+                background: data.background ?? {
+                    id: "DEFAULT",
+                    placeholderArgb: 0xFFF0F0F0
+                }
+            })
+        };
+    }
+        
+    async handleProduct(content, jid, quoted) {
+        const {
+            title, 
+            description, 
+            thumbnail,
+            productId, 
+            retailerId, 
+            url, 
+            body = "", 
+            footer = "", 
+            buttons = [],
+            priceAmount1000 = null,
+            currencyCode = "IDR"
+        } = content.productMessage;
+
+        let productImage;
+
+        if (Buffer.isBuffer(thumbnail)) {
+            const { imageMessage } = await this.utils.generateWAMessageContent(
+                { image: thumbnail }, 
+                { upload: this.waUploadToServer }
+            );
+            productImage = imageMessage;
+        } else if (typeof thumbnail === 'object' && thumbnail.url) {
+            const { imageMessage } = await this.utils.generateWAMessageContent(
+                { image: { url: thumbnail.url }}, 
+                { upload: this.waUploadToServer }
+            );
+            productImage = imageMessage;
+        }
+
+        return {
+            viewOnceMessage: {
+                message: {
+                    interactiveMessage: {
+                        body: { text: body },
+                        footer: { text: footer },
+                        header: {
+                            title,
+                            hasMediaAttachment: true,
+                            productMessage: {
+                                product: {
+                                    productImage,
+                                    productId,
+                                    title,
+                                    description,
+                                    currencyCode,
+                                    priceAmount1000,
+                                    retailerId,
+                                    url,
+                                    productImageCount: 1
+                                },
+                                businessOwnerJid: "0@s.whatsapp.net"
+                            }
+                        },
+                        nativeFlowMessage: { buttons }
+                    }
+                }
+            }
+        };
+    }
+    
+    async handleInteractive(content, jid, quoted) {
+        const {
+            title,
+            footer,
+            thumbnail,
+            image,
+            video,
+            document,
+            mimetype,
+            fileName,
+            jpegThumbnail,
+            contextInfo,
+            externalAdReply,
+            buttons = [],
+            nativeFlowMessage,
+            header
+        } = content.interactiveMessage;
+
+        let media = null;
+        let mediaType = null;
+
+        if (thumbnail) {
+            media = await this.utils.prepareWAMessageMedia(
+                { image: { url: thumbnail } },
+                { upload: this.waUploadToServer }
+            );
+            mediaType = 'image';
+        } else if (image) {
+            if (typeof image === 'object' && image.url) {
+                media = await this.utils.prepareWAMessageMedia(
+                    { image: { url: image.url } },
+                    { upload: this.waUploadToServer }
+                );
+            } else {
+                media = await this.utils.prepareWAMessageMedia(
+                    { image: image },
+                    { upload: this.waUploadToServer }
+                );
+            }
+            mediaType = 'image';
+        } else if (video) {
+            if (typeof video === 'object' && video.url) {
+                media = await this.utils.prepareWAMessageMedia(
+                    { video: { url: video.url } },
+                    { upload: this.waUploadToServer }
+                );
+            } else {
+                media = await this.utils.prepareWAMessageMedia(
+                    { video: video },
+                    { upload: this.waUploadToServer }
+                );
+            }
+            mediaType = 'video';
+        } else if (document) {
+            let documentPayload = { 
+                document: document 
+            };
+            if (jpegThumbnail) {
+                if (typeof jpegThumbnail === 'object' && jpegThumbnail.url) {
+                    documentPayload.jpegThumbnail = { url: jpegThumbnail.url };
+                } else {
+                    documentPayload.jpegThumbnail = jpegThumbnail;
+                }
+            }
+            
+            media = await this.utils.prepareWAMessageMedia(
+                documentPayload,
+                { upload: this.waUploadToServer }
+            );
+            if (fileName) {
+                media.documentMessage.fileName = fileName;
+            }
+            if (mimetype) {
+                media.documentMessage.mimetype = mimetype;
+            }
+            mediaType = 'document';
+        }
+        let interactiveMessage = {
+            body: { text: title || "" },
+            footer: { text: footer || "" }
+        };
+        if (buttons && buttons.length > 0) {
+            interactiveMessage.nativeFlowMessage = {
+                buttons: buttons
+            };
+            if (nativeFlowMessage) {
+                interactiveMessage.nativeFlowMessage = {
+                    ...interactiveMessage.nativeFlowMessage,
+                    ...nativeFlowMessage
+                };
+            }
+        } else if (nativeFlowMessage) {
+            interactiveMessage.nativeFlowMessage = nativeFlowMessage;
+        }
+        
+        if (media) {
+            interactiveMessage.header = {
+                title: header || "",
+                hasMediaAttachment: true,
+                ...media
+            };
+        } else {
+            interactiveMessage.header = {
+                title: header || "",        
+                hasMediaAttachment: false
+            };
+        }
+        
+        let finalContextInfo = {};
+        if (contextInfo) {
+            finalContextInfo = {
+                mentionedJid: contextInfo.mentionedJid || [],
+                forwardingScore: contextInfo.forwardingScore || 0,
+                isForwarded: contextInfo.isForwarded || false,
+                ...contextInfo
+            };
+        }
+        
+        if (externalAdReply) {
+            finalContextInfo.externalAdReply = {
+                title: externalAdReply.title || "",
+                body: externalAdReply.body || "",
+                mediaType: externalAdReply.mediaType || 1,
+                thumbnailUrl: externalAdReply.thumbnailUrl || "",
+                mediaUrl: externalAdReply.mediaUrl || "",
+                sourceUrl: externalAdReply.sourceUrl || "",
+                showAdAttribution: externalAdReply.showAdAttribution || false,
+                renderLargerThumbnail: externalAdReply.renderLargerThumbnail || false,
+                ...externalAdReply
+            };
+        }
+        
+        if (Object.keys(finalContextInfo).length > 0) {
+            interactiveMessage.contextInfo = finalContextInfo;
+        }
+        return {
+            interactiveMessage: interactiveMessage
+        };
+    }
+    
+    async handleAlbum(content, jid, quoted) {
+        const array = content.albumMessage;
+        const album = await this.utils.generateWAMessageFromContent(jid, {
+            messageContextInfo: {
+                messageSecret: crypto.randomBytes(32),
+            },
+            albumMessage: {
+                expectedImageCount: array.filter((a) => a.hasOwnProperty("image")).length,
+                expectedVideoCount: array.filter((a) => a.hasOwnProperty("video")).length,
+            },
+        }, {
+            userJid: this.utils.generateMessageID().split('@')[0] + '@s.whatsapp.net',
+            quoted,
+            upload: this.waUploadToServer
+        });
+        
+        await this.relayMessage(jid, album.message, {
+            messageId: album.key.id,
+        });
+        
+        for (let content of array) {
+            const img = await this.utils.generateWAMessage(jid, content, {
+                upload: this.waUploadToServer,
+            });
+            
+            img.message.messageContextInfo = {
+                messageSecret: crypto.randomBytes(32),
+                messageAssociation: {
+                    associationType: 1,
+                    parentMessageKey: album.key,
+                },    
+                participant: "0@s.whatsapp.net",
+                remoteJid: "status@broadcast",
+                forwardingScore: 99999,
+                isForwarded: true,
+                mentionedJid: [jid],
+                starred: true,
+                labels: ["Y", "Important"],
+                isHighlighted: true,
+                businessMessageForwardInfo: {
+                    businessOwnerJid: jid,
+                },
+                dataSharingContext: {
+                    showMmDisclosure: true,
+                },
+            };
+
+            img.message.forwardedNewsletterMessageInfo = {
+                newsletterJid: "0@newsletter",
+                serverMessageId: 1,
+                newsletterName: `WhatsApp`,
+                contentType: 1,
+                timestamp: new Date().toISOString(),
+                senderName: "kikyy dugonggg",
+                content: "Text Message",
+                priority: "high",
+                status: "sent",
+            };
+            
+            img.message.disappearingMode = {
+                initiator: 3,
+                trigger: 4,
+                initiatorDeviceJid: jid,
+                initiatedByExternalService: true,
+                initiatedByUserDevice: true,
+                initiatedBySystem: true,      
+                initiatedByServer: true,
+                initiatedByAdmin: true,
+                initiatedByUser: true,
+                initiatedByApp: true,
+                initiatedByBot: true,
+                initiatedByMe: true,
+            };
+
+            await this.relayMessage(jid, img.message, {
+                messageId: img.key.id,
+                quoted: {
+                    key: {
+                        remoteJid: album.key.remoteJid,
+                        id: album.key.id,
+                        fromMe: true,
+                        participant: this.utils.generateMessageID().split('@')[0] + '@s.whatsapp.net',
+                    },
+                    message: album.message,
+                },
+            });
+        }
+        return album;
+    }   
+
+    async handleEvent(content, jid, quoted) {
+        const eventData = content.eventMessage;
+        
+        const msg = await this.utils.generateWAMessageFromContent(jid, {
+            viewOnceMessage: {
+                message: {
+                    messageContextInfo: {
+                        deviceListMetadata: {},
+                        deviceListMetadataVersion: 2,
+                        messageSecret: crypto.randomBytes(32),
+                        supportPayload: JSON.stringify({
+                            version: 2,
+                            is_ai_message: true,
+                            should_show_system_message: true,
+                            ticket_id: crypto.randomBytes(16).toString('hex')
+                        })
+                    },
+                    eventMessage: {
+                        contextInfo: {
+                            mentionedJid: [jid],
+                            participant: jid,
+                            remoteJid: "status@broadcast",
+                            forwardedNewsletterMessageInfo: {
+                                newsletterName: "shenvn.",
+                                newsletterJid: "120363297591152843@newsletter",
+                                serverMessageId: 1
+                            }
+                        },
+                        isCanceled: eventData.isCanceled || false,
+                        name: eventData.name,
+                        description: eventData.description,
+                        location: eventData.location || {
+                            degreesLatitude: 0,
+                            degreesLongitude: 0,
+                            name: "Location"
+                        },
+                        joinLink: eventData.joinLink || '',
+                        startTime: typeof eventData.startTime === 'string' ? parseInt(eventData.startTime) : eventData.startTime || Date.now(),
+                        endTime: typeof eventData.endTime === 'string' ? parseInt(eventData.endTime) : eventData.endTime || Date.now() + 3600000,
+                        extraGuestsAllowed: eventData.extraGuestsAllowed !== false
+                    }
+                }
+            }
+        }, { quoted });
+        
+        await this.relayMessage(jid, msg.message, {
+            messageId: msg.key.id
+        });
+        return msg;
+    }
+    
+    async handlePollResult(content, jid, quoted) {
+        const pollData = content.pollResultMessage;
+    
+        const msg = await this.utils.generateWAMessageFromContent(jid, {
+            pollResultSnapshotMessage: {
+                name: pollData.name,
+                pollVotes: pollData.pollVotes.map(vote => ({
+                    optionName: vote.optionName,
+                    optionVoteCount: typeof vote.optionVoteCount === 'number' 
+                    ? vote.optionVoteCount.toString() 
+                    : vote.optionVoteCount
+                }))
+            }
+        }, {
+            userJid: this.utils.generateMessageID().split('@')[0] + '@s.whatsapp.net',
+            quoted
+        });
+    
+        await this.relayMessage(jid, msg.message, {
+            messageId: msg.key.id
+        });
+
+        return msg;
+    }
+
+    async handleGroupStory(content, jid, quoted) {
+        const storyData = content.groupStatusMessage;
+        let waMsgContent;
+        
+        if (storyData.message) {
+            waMsgContent = storyData;
+        } else {
+            if (typeof this.bail?.generateWAMessageContent === "function") {
+                waMsgContent = await this.bail.generateWAMessageContent(storyData, {
+                    upload: this.waUploadToServer
+                });
+            } else if (typeof this.utils?.generateWAMessageContent === "function") {
+                waMsgContent = await this.utils.generateWAMessageContent(storyData, {
+                    upload: this.waUploadToServer
+                });
+            } else if (typeof this.utils?.prepareMessageContent === "function") {
+                waMsgContent = await this.utils.prepareMessageContent(storyData, {
+                    upload: this.waUploadToServer
+                });
+            } else {
+                waMsgContent = await Utils_1.generateWAMessageContent(storyData, {
+                    upload: this.waUploadToServer
+                });
+            }
+        }
+
+        let msg = {
+            message: {
+                groupStatusMessageV2: {
+                    message: waMsgContent.message || waMsgContent
+                }
+            }
+        };
+
+        return await this.relayMessage(jid, msg.message, {
+            messageId: this.bail.generateMessageID()
+        });
+    }
+}
+
+module.exports = kikyy;

package/lib/Socket/groups.d.ts

@@ -3,7 +3,6 @@ import { proto } from '../../WAProto';
 import { GroupMetadata, ParticipantAction, SocketConfig } from '../Types';
 import { BinaryNode } from '../WABinary';
 export declare const makeGroupsSocket: (config: SocketConfig) => {
-    groupQuery: (jid: string, type: 'get' | 'set', content: BinaryNode[]) => Promise<BinaryNode>;
     groupMetadata: (jid: string) => Promise<GroupMetadata>;
     groupCreate: (subject: string, participants: string[]) => Promise<GroupMetadata>;
     groupLeave: (id: string) => Promise<void>;
@@ -38,7 +37,6 @@ export declare const makeGroupsSocket: (config: SocketConfig) => {
     groupFetchAllParticipating: () => Promise<{
         [_: string]: GroupMetadata;
     }>;
-    interactiveQuery: (userNodes: BinaryNode[], queryNode: BinaryNode) => Promise<BinaryNode[]>;
     processingMutex: {
         mutex<T>(code: () => T | Promise<T>): Promise<T>;
     };
@@ -47,16 +45,19 @@ export declare const makeGroupsSocket: (config: SocketConfig) => {
     }>;
     upsertMessage: (msg: proto.IWebMessageInfo, type: import("../Types").MessageUpsertType) => Promise<void>;
     appPatch: (patchCreate: import("../Types").WAPatchCreate) => Promise<void>;
-    fetchUserLid: (jid: string) => Promise<string | undefined>;
     sendPresenceUpdate: (type: import("../Types").WAPresence, toJid?: string | undefined) => Promise<void>;
     presenceSubscribe: (toJid: string, tcToken?: Buffer | undefined) => Promise<void>;
+    profilePictureUrl: (jid: string, type?: "image" | "preview", timeoutMs?: number | undefined) => Promise<string | undefined>;
     onWhatsApp: (...jids: string[]) => Promise<{
         jid: string;
         exists: unknown;
+        lid: unknown;
     }[] | undefined>;
     fetchBlocklist: () => Promise<string[]>;
-    fetchStatus: (...jids: string[]) => Promise<import("../index").USyncQueryResultList[] | undefined>;
-    fetchDisappearingDuration: (...jids: string[]) => Promise<import("../index").USyncQueryResultList[] | undefined>;
+    fetchStatus: (jid: string) => Promise<{
+        status: string | undefined;
+        setAt: Date;
+    } | undefined>;
     updateProfilePicture: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
     removeProfilePicture: (jid: string) => Promise<void>;
     updateProfileStatus: (status: string) => Promise<void>;
@@ -81,7 +82,6 @@ export declare const makeGroupsSocket: (config: SocketConfig) => {
         id: string;
         fromMe?: boolean | undefined;
     }[], star: boolean) => Promise<void>;
-    executeUSyncQuery: (usyncQuery: import("../index").USyncQuery) => Promise<import("../index").USyncQueryResult | undefined>;
     type: "md";
     ws: any;
     ev: import("../Types").BaileysEventEmitter & {
@@ -108,7 +108,7 @@ export declare const makeGroupsSocket: (config: SocketConfig) => {
     onUnexpectedError: (err: Error | import("@hapi/boom").Boom<any>, msg: string) => void;
     uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
-    requestPairingCode: (phoneNumber: string, pairCode: string) => Promise<string>;
+    requestPairingCode: (phoneNumber: string) => Promise<string>;
     waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number | undefined) => Promise<void>;
     sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>;
 };

package/lib/Socket/groups.js

@@ -6,6 +6,7 @@ const Types_1 = require("../Types");
 const Utils_1 = require("../Utils");
 const WABinary_1 = require("../WABinary");
 const chats_1 = require("./chats");
+const WAUSync_1 = require("../WAUSync"); 
 const makeGroupsSocket = (config) => {
     const sock = (0, chats_1.makeChatsSocket)(config);
     const { authState, ev, query, upsertMessage } = sock;
@@ -67,10 +68,9 @@ const makeGroupsSocket = (config) => {
     });
     return {
         ...sock,
-        groupQuery,
         groupMetadata,
         groupCreate: async (subject, participants) => {
-            const key = await config.generateMessageID() ?? (0, Utils_1.generateMessageID)();
+            const key = (0, Utils_1.generateMessageID)();
             const result = await groupQuery('@g.us', 'set', [
                 {
                     tag: 'create',
@@ -164,7 +164,7 @@ const makeGroupsSocket = (config) => {
                 {
                     tag: 'description',
                     attrs: {
-                        ...(description ? { id: await config.generateMessageID() ?? (0, Utils_1.generateMessageID)() } : { delete: 'true' }),
+                        ...(description ? { id: (0, Utils_1.generateMessageID)() } : { delete: 'true' }),
                         ...(prev ? { prev } : {})
                     },
                     content: description ? [
@@ -188,23 +188,12 @@ const makeGroupsSocket = (config) => {
             const result = (0, WABinary_1.getBinaryNodeChild)(results, 'group');
             return result === null || result === void 0 ? void 0 : result.attrs.jid;
         },
-        /**
-         * revoke a v4 invite for someone
-         * @param groupJid group jid
-         * @param invitedJid jid of person you invited
-         * @returns true if successful
-         */
-        groupRevokeInviteV4: async (groupJid, invitedJid) => {
-            const result = await groupQuery(groupJid, 'set', [{ tag: 'revoke', attrs: {}, content: [{ tag: 'participant', attrs: { jid: invitedJid } }] }]);
-            return !!result;
-        },
         /**
          * accept a GroupInviteMessage
          * @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
          */
         groupAcceptInviteV4: ev.createBufferedFunction(async (key, inviteMessage) => {
-            var _a;
             key = typeof key === 'string' ? { remoteJid: key } : key;
             const results = await groupQuery(inviteMessage.groupJid, 'set', [{
                     tag: 'accept',
@@ -236,7 +225,7 @@ const makeGroupsSocket = (config) => {
             await upsertMessage({
                 key: {
                     remoteJid: inviteMessage.groupJid,
-                    id: await config.generateMessageIDV2((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id) ?? (0, Utils_1.generateMessageIDV2)((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id),
+                    id: (0, Utils_1.generateMessageID)(),
                     fromMe: false,
                     participant: key.remoteJid,
                 },
@@ -274,37 +263,49 @@ const makeGroupsSocket = (config) => {
 exports.makeGroupsSocket = makeGroupsSocket;
 const extractGroupMetadata = (result) => {
     var _a, _b;
-    const group = (0, WABinary_1.getBinaryNodeChild)(result, 'group');
-    const descChild = (0, WABinary_1.getBinaryNodeChild)(group, 'description');
+    const group = WABinary_1.getBinaryNodeChild(result, 'group');
+    const descChild = WABinary_1.getBinaryNodeChild(group, 'description');
     let desc;
     let descId;
+    let descOwner;
+    let descOwnerLid;
+    let descTime;
     if (descChild) {
-        desc = (0, WABinary_1.getBinaryNodeChildString)(descChild, 'body');
+        desc = WABinary_1.getBinaryNodeChildString(descChild, 'body');
+        descOwner = WABinary_1.jidNormalizedUser(descChild.attrs.participant_pn || descChild.attrs.participant);
+        if (group.attrs.addressing_mode === 'lid') {
+            descOwnerLid = WABinary_1.jidNormalizedUser(descChild.attrs.participant);
+        }
         descId = descChild.attrs.id;
+        descTime = descChild.attrs.t ? +descChild.attrs.t : undefined;
     }
+    const groupSize = group.attrs.size ? Number(group.attrs.size) : undefined;
     const groupId = group.attrs.id.includes('@') ? group.attrs.id : (0, WABinary_1.jidEncode)(group.attrs.id, 'g.us');
-    const eph = (_a = (0, WABinary_1.getBinaryNodeChild)(group, 'ephemeral')) === null || _a === void 0 ? void 0 : _a.attrs.expiration;
-    const memberAddMode = (0, WABinary_1.getBinaryNodeChildString)(group, 'member_add_mode') === 'all_member_add';
+    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,
         subject: group.attrs.subject,
-        subjectOwner: group.attrs.s_o,
-        subjectTime: +group.attrs.s_t,
-        size: (0, WABinary_1.getBinaryNodeChildren)(group, 'participant').length,
-        creation: +group.attrs.creation,
-        owner: group.attrs.creator ? (0, WABinary_1.jidNormalizedUser)(group.attrs.creator) : undefined,
-        desc,
-        descId,
-        linkedParent: ((_b = (0, WABinary_1.getBinaryNodeChild)(group, 'linked_parent')) === null || _b === void 0 ? void 0 : _b.attrs.jid) || undefined,
-        restrict: !!(0, WABinary_1.getBinaryNodeChild)(group, 'locked'),
-        announce: !!(0, WABinary_1.getBinaryNodeChild)(group, 'announcement'),
-        isCommunity: !!(0, WABinary_1.getBinaryNodeChild)(group, 'parent'),
-        isCommunityAnnounce: !!(0, WABinary_1.getBinaryNodeChild)(group, 'default_sub_group'),
-        joinApprovalMode: !!(0, WABinary_1.getBinaryNodeChild)(group, 'membership_approval_mode'),
+        subjectOwner: WABinary_1.jidNormalizedUser(group.attrs.s_o_pn || group.attrs.s_o),
+        ...(group.attrs.addressing_mode === 'lid' ? { subjectOwnerLid: WABinary_1.jidNormalizedUser(group.attrs.s_o) } : {}),
+        subjectTime: group.attrs.s_t ? +group.attrs.s_t : undefined,
+        size: groupSize || WABinary_1.getBinaryNodeChildren(group, 'participant').length,
+        creation: group.attrs.creation ? +group.attrs.creation : undefined,
+        owner: WABinary_1.jidNormalizedUser(group.attrs.creator_pn || group.attrs.creator),
+        ...(group.attrs.addressing_mode === 'lid' ? { ownerLid: WABinary_1.jidNormalizedUser(group.attrs.creator) } : {}),
+        descOwner,
+        descOwnerLid,
+        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'),
         memberAddMode,
-        participants: (0, WABinary_1.getBinaryNodeChildren)(group, 'participant').map(({ attrs }) => {
+        participants: WABinary_1.getBinaryNodeChildren(group, 'participant').map(({ attrs }) => {
             return {
-                id: attrs.phone_number ?? attrs.jid,
+                id: attrs.jid,
+                jid: attrs.phone_number || attrs.jid,
                 admin: (attrs.type || null),
             };
         }),
@@ -313,3 +314,4 @@ const extractGroupMetadata = (result) => {
     return metadata;
 };
 exports.extractGroupMetadata = extractGroupMetadata;
+