@hbmodsofc/baileys 1.7.8 → 2.2.0

package/lib/Socket/groups.d.ts

@@ -1,6 +1,7 @@
-import { proto } from '../../WAProto/index.js';
-import type { GroupMetadata, ParticipantAction, SocketConfig, WAMessageKey } from '../Types';
-import { type BinaryNode } from '../WABinary';
+/// <reference types="node" />
+import { proto } from '../../WAProto';
+import { GroupMetadata, ParticipantAction, SocketConfig } from '../Types';
+import { BinaryNode } from '../WABinary';
 export declare const makeGroupsSocket: (config: SocketConfig) => {
     groupMetadata: (jid: string) => Promise<GroupMetadata>;
     groupCreate: (subject: string, participants: string[]) => Promise<GroupMetadata>;
@@ -9,7 +10,7 @@ export declare const makeGroupsSocket: (config: SocketConfig) => {
     groupRequestParticipantsList: (jid: string) => Promise<{
         [key: string]: string;
     }[]>;
-    groupRequestParticipantsUpdate: (jid: string, participants: string[], action: "approve" | "reject") => Promise<{
+    groupRequestParticipantsUpdate: (jid: string, participants: string[], action: 'approve' | 'reject') => Promise<{
         status: string;
         jid: string;
     }[]>;
@@ -22,115 +23,93 @@ export declare const makeGroupsSocket: (config: SocketConfig) => {
     groupInviteCode: (jid: string) => Promise<string | undefined>;
     groupRevokeInvite: (jid: string) => Promise<string | undefined>;
     groupAcceptInvite: (code: string) => Promise<string | undefined>;
-    /**
-     * revoke a v4 invite for someone
-     * @param groupJid group jid
-     * @param invitedJid jid of person you invited
-     * @returns true if successful
-     */
-    groupRevokeInviteV4: (groupJid: string, invitedJid: string) => Promise<boolean>;
     /**
      * 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: (key: string | WAMessageKey, inviteMessage: proto.Message.IGroupInviteMessage) => Promise<any>;
+    groupAcceptInviteV4: (key: string | proto.IMessageKey, inviteMessage: proto.Message.IGroupInviteMessage) => Promise<string>;
     groupGetInviteInfo: (code: string) => Promise<GroupMetadata>;
     groupToggleEphemeral: (jid: string, ephemeralExpiration: number) => Promise<void>;
-    groupSettingUpdate: (jid: string, setting: "announcement" | "not_announcement" | "locked" | "unlocked") => Promise<void>;
-    groupMemberAddMode: (jid: string, mode: "admin_add" | "all_member_add") => Promise<void>;
-    groupJoinApprovalMode: (jid: string, mode: "on" | "off") => Promise<void>;
+    groupSettingUpdate: (jid: string, setting: 'announcement' | 'not_announcement' | 'locked' | 'unlocked') => Promise<void>;
+    groupMemberAddMode: (jid: string, mode: 'admin_add' | 'all_member_add') => Promise<void>;
+    groupJoinApprovalMode: (jid: string, mode: 'on' | 'off') => Promise<void>;
     groupFetchAllParticipating: () => Promise<{
         [_: string]: GroupMetadata;
     }>;
-    createCallLink: (type: "audio" | "video", event?: {
-        startTime: number;
-    }, timeoutMs?: number) => Promise<string | undefined>;
-    getBotListV2: () => Promise<import("../Types").BotListInfo[]>;
     processingMutex: {
-        mutex<T>(code: () => Promise<T> | T): Promise<T>;
+        mutex<T>(code: () => T | Promise<T>): Promise<T>;
     };
     fetchPrivacySettings: (force?: boolean) => Promise<{
         [_: string]: string;
     }>;
-    upsertMessage: (msg: import("../Types").WAMessage, type: import("../Types").MessageUpsertType) => Promise<void>;
+    upsertMessage: (msg: proto.IWebMessageInfo, type: import("../Types").MessageUpsertType) => Promise<void>;
     appPatch: (patchCreate: import("../Types").WAPatchCreate) => Promise<void>;
-    sendPresenceUpdate: (type: import("../Types").WAPresence, toJid?: string) => Promise<void>;
-    presenceSubscribe: (toJid: string, tcToken?: Buffer) => Promise<void>;
-    profilePictureUrl: (jid: string, type?: "preview" | "image", timeoutMs?: number) => 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.js").USyncQueryResultList[] | undefined>;
-    fetchDisappearingDuration: (...jids: string[]) => Promise<import("../index.js").USyncQueryResultList[] | undefined>;
-    updateProfilePicture: (jid: string, content: import("../Types").WAMediaUpload, dimensions?: {
-        width: number;
-        height: number;
-    }) => Promise<void>;
+    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>;
     updateProfileName: (name: string) => Promise<void>;
     updateBlockStatus: (jid: string, action: "block" | "unblock") => Promise<void>;
-    updateDisableLinkPreviewsPrivacy: (isPreviewsDisabled: boolean) => Promise<void>;
-    updateCallPrivacy: (value: import("../Types").WAPrivacyCallValue) => Promise<void>;
-    updateMessagesPrivacy: (value: import("../Types").WAPrivacyMessagesValue) => Promise<void>;
     updateLastSeenPrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
     updateOnlinePrivacy: (value: import("../Types").WAPrivacyOnlineValue) => Promise<void>;
     updateProfilePicturePrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
     updateStatusPrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
     updateReadReceiptsPrivacy: (value: import("../Types").WAReadReceiptsValue) => Promise<void>;
-    updateGroupsAddPrivacy: (value: import("../Types").WAPrivacyGroupAddValue) => Promise<void>;
+    updateGroupsAddPrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
     updateDefaultDisappearingMode: (duration: number) => Promise<void>;
-    getBusinessProfile: (jid: string) => Promise<import("../Types").WABusinessProfile | void>;
-    resyncAppState: (collections: readonly ("critical_unblock_low" | "regular_high" | "regular_low" | "critical_block" | "regular")[], isInitialSync: boolean) => Promise<void>;
+    getBusinessProfile: (jid: string) => Promise<void | import("../Types").WABusinessProfile>;
+    resyncAppState: (collections: readonly ("critical_block" | "critical_unblock_low" | "regular_high" | "regular_low" | "regular")[], isInitialSync: boolean) => Promise<void>;
     chatModify: (mod: import("../Types").ChatModification, jid: string) => Promise<void>;
-    cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: number | string) => Promise<void>;
-    addOrEditContact: (jid: string, contact: proto.SyncActionValue.IContactAction) => Promise<void>;
-    removeContact: (jid: string) => Promise<void>;
-    addLabel: (jid: string, labels: import("../Types/Label.js").LabelActionBody) => Promise<void>;
+    cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: string | number | undefined) => Promise<void>;
     addChatLabel: (jid: string, labelId: string) => Promise<void>;
     removeChatLabel: (jid: string, labelId: string) => Promise<void>;
     addMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>;
     removeMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>;
     star: (jid: string, messages: {
         id: string;
-        fromMe?: boolean;
+        fromMe?: boolean | undefined;
     }[], star: boolean) => Promise<void>;
-    addOrEditQuickReply: (quickReply: import("../Types/Bussines.js").QuickReplyAction) => Promise<void>;
-    removeQuickReply: (timestamp: string) => Promise<void>;
     type: "md";
-    ws: import("./Client/websocket.js").WebSocketClient;
+    ws: any;
     ev: import("../Types").BaileysEventEmitter & {
         process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): () => void;
         buffer(): void;
-        createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): (...args: A) => Promise<T>;
-        flush(): boolean;
+        createBufferedFunction<A extends any[], T_1>(work: (...args: A) => Promise<T_1>): (...args: A) => Promise<T_1>;
+        flush(force?: boolean | undefined): boolean;
         isBuffering(): boolean;
     };
     authState: {
         creds: import("../Types").AuthenticationCreds;
         keys: import("../Types").SignalKeyStoreWithTransaction;
     };
-    signalRepository: import("../Types").SignalRepositoryWithLIDStore;
+    signalRepository: import("../Types").SignalRepository;
     user: import("../Types").Contact | undefined;
     generateMessageTag: () => string;
-    query: (node: BinaryNode, timeoutMs?: number) => Promise<any>;
-    waitForMessage: <T>(msgId: string, timeoutMs?: number | undefined) => Promise<T | undefined>;
+    query: (node: BinaryNode, timeoutMs?: number | undefined) => Promise<BinaryNode>;
+    waitForMessage: <T_2>(msgId: string, timeoutMs?: number | undefined) => Promise<T_2>;
     waitForSocketOpen: () => Promise<void>;
     sendRawMessage: (data: Uint8Array | Buffer) => Promise<void>;
     sendNode: (frame: BinaryNode) => Promise<void>;
-    logout: (msg?: string) => Promise<void>;
+    logout: (msg?: string | undefined) => Promise<void>;
     end: (error: Error | undefined) => void;
-    onUnexpectedError: (err: Error | import("@hapi/boom").Boom, msg: string) => void;
-    uploadPreKeys: (count?: number, retryCount?: number) => Promise<void>;
+    onUnexpectedError: (err: Error | import("@hapi/boom").Boom<any>, msg: string) => void;
+    uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
-    requestPairingCode: (phoneNumber: string, customPairingCode?: string) => Promise<string>;
-    waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => Promise<boolean | undefined>, timeoutMs?: number) => Promise<void>;
-    sendWAMBuffer: (wamBuffer: Buffer) => Promise<any>;
-    executeUSyncQuery: (usyncQuery: import("../index.js").USyncQuery) => Promise<import("../index.js").USyncQueryResult | undefined>;
-    onWhatsApp: (...jids: string[]) => Promise<{
-        jid: string;
-        exists: boolean;
-        lid: string;
-    }[] | undefined>;
+    requestPairingCode: (phoneNumber: string) => Promise<string>;
+    waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number | undefined) => Promise<void>;
+    sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>;
 };
 export declare const extractGroupMetadata: (result: BinaryNode) => GroupMetadata;
-export type GroupsSocket = ReturnType<typeof makeGroupsSocket>;

package/lib/Socket/groups.js

@@ -1,23 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractGroupMetadata = exports.makeGroupsSocket = void 0;
-const index_js_1 = require("../../WAProto/index.js");
+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 WAUSync_1 = require("../WAUSync"); 
 const makeGroupsSocket = (config) => {
     const sock = (0, chats_1.makeChatsSocket)(config);
     const { authState, ev, query, upsertMessage } = sock;
-    const groupQuery = async (jid, type, content) => query({
+    const groupQuery = async (jid, type, content) => (query({
         tag: 'iq',
         attrs: {
             type,
             xmlns: 'w:g2',
-            to: jid
+            to: jid,
         },
         content
-    });
+    }));
     const groupMetadata = async (jid) => {
         const result = await groupQuery(jid, 'get', [{ tag: 'query', attrs: { request: 'interactive' } }]);
         return (0, exports.extractGroupMetadata)(result);
@@ -28,7 +29,7 @@ const makeGroupsSocket = (config) => {
             attrs: {
                 to: '@g.us',
                 xmlns: 'w:g2',
-                type: 'get'
+                type: 'get',
             },
             content: [
                 {
@@ -69,7 +70,7 @@ const makeGroupsSocket = (config) => {
         ...sock,
         groupMetadata,
         groupCreate: async (subject, participants) => {
-            const key = (0, Utils_1.generateMessageIDV2)();
+            const key = (0, Utils_1.generateMessageID)();
             const result = await groupQuery('@g.us', 'set', [
                 {
                     tag: 'create',
@@ -90,7 +91,9 @@ const makeGroupsSocket = (config) => {
                 {
                     tag: 'leave',
                     attrs: {},
-                    content: [{ tag: 'group', attrs: { id } }]
+                    content: [
+                        { tag: 'group', attrs: { id } }
+                    ]
                 }
             ]);
         },
@@ -115,8 +118,7 @@ const makeGroupsSocket = (config) => {
             return participants.map(v => v.attrs);
         },
         groupRequestParticipantsUpdate: async (jid, participants, action) => {
-            const result = await groupQuery(jid, 'set', [
-                {
+            const result = await groupQuery(jid, 'set', [{
                     tag: 'membership_requests_action',
                     attrs: {},
                     content: [
@@ -129,8 +131,7 @@ const makeGroupsSocket = (config) => {
                             }))
                         }
                     ]
-                }
-            ]);
+                }]);
             const node = (0, WABinary_1.getBinaryNodeChild)(result, 'membership_requests_action');
             const nodeAction = (0, WABinary_1.getBinaryNodeChild)(node, action);
             const participantsAffected = (0, WABinary_1.getBinaryNodeChildren)(nodeAction, 'participant');
@@ -156,45 +157,36 @@ const makeGroupsSocket = (config) => {
             });
         },
         groupUpdateDescription: async (jid, description) => {
+            var _a;
             const metadata = await groupMetadata(jid);
-            const prev = metadata.descId ?? null;
+            const prev = (_a = metadata.descId) !== null && _a !== void 0 ? _a : null;
             await groupQuery(jid, 'set', [
                 {
                     tag: 'description',
                     attrs: {
-                        ...(description ? { id: (0, Utils_1.generateMessageIDV2)() } : { delete: 'true' }),
+                        ...(description ? { id: (0, Utils_1.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
                 }
             ]);
         },
         groupInviteCode: async (jid) => {
             const result = await groupQuery(jid, 'get', [{ tag: 'invite', attrs: {} }]);
             const inviteNode = (0, WABinary_1.getBinaryNodeChild)(result, 'invite');
-            return inviteNode?.attrs.code;
+            return inviteNode === null || inviteNode === void 0 ? void 0 : inviteNode.attrs.code;
         },
         groupRevokeInvite: async (jid) => {
             const result = await groupQuery(jid, 'set', [{ tag: 'invite', attrs: {} }]);
             const inviteNode = (0, WABinary_1.getBinaryNodeChild)(result, 'invite');
-            return inviteNode?.attrs.code;
+            return inviteNode === null || inviteNode === void 0 ? void 0 : inviteNode.attrs.code;
         },
         groupAcceptInvite: async (code) => {
             const results = await groupQuery('@g.us', 'set', [{ tag: 'invite', attrs: { code } }]);
             const result = (0, WABinary_1.getBinaryNodeChild)(results, 'group');
-            return 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;
+            return result === null || result === void 0 ? void 0 : result.attrs.jid;
         },
         /**
          * accept a GroupInviteMessage
@@ -203,21 +195,19 @@ const makeGroupsSocket = (config) => {
          */
         groupAcceptInviteV4: ev.createBufferedFunction(async (key, inviteMessage) => {
             key = typeof key === 'string' ? { remoteJid: key } : key;
-            const results = await groupQuery(inviteMessage.groupJid, 'set', [
-                {
+            const results = await groupQuery(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) {
                 // create new invite message that is expired
-                inviteMessage = index_js_1.proto.Message.GroupInviteMessage.create(inviteMessage);
+                inviteMessage = WAProto_1.proto.Message.GroupInviteMessage.fromObject(inviteMessage);
                 inviteMessage.inviteExpiration = 0;
                 inviteMessage.inviteCode = '';
                 ev.emit('messages.update', [
@@ -235,12 +225,14 @@ const makeGroupsSocket = (config) => {
             await upsertMessage({
                 key: {
                     remoteJid: inviteMessage.groupJid,
-                    id: (0, Utils_1.generateMessageIDV2)(sock.user?.id),
+                    id: (0, Utils_1.generateMessageID)(),
                     fromMe: false,
-                    participant: key.remoteJid
+                    participant: key.remoteJid,
                 },
                 messageStubType: Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD,
-                messageStubParameters: [authState.creds.me.id],
+                messageStubParameters: [
+                    authState.creds.me.id
+                ],
                 participant: key.remoteJid,
                 messageTimestamp: (0, Utils_1.unixTimestampSeconds)()
             }, 'notify');
@@ -251,9 +243,9 @@ const makeGroupsSocket = (config) => {
             return (0, exports.extractGroupMetadata)(results);
         },
         groupToggleEphemeral: 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 groupQuery(jid, 'set', [content]);
         },
         groupSettingUpdate: async (jid, setting) => {
@@ -263,63 +255,58 @@ const makeGroupsSocket = (config) => {
             await groupQuery(jid, 'set', [{ tag: 'member_add_mode', attrs: {}, content: mode }]);
         },
         groupJoinApprovalMode: async (jid, mode) => {
-            await groupQuery(jid, 'set', [
-                { tag: 'membership_approval_mode', attrs: {}, content: [{ tag: 'group_join', attrs: { state: mode } }] }
-            ]);
+            await groupQuery(jid, 'set', [{ tag: 'membership_approval_mode', attrs: {}, content: [{ tag: 'group_join', attrs: { state: mode } }] }]);
         },
         groupFetchAllParticipating
     };
 };
 exports.makeGroupsSocket = makeGroupsSocket;
 const extractGroupMetadata = (result) => {
-    const group = (0, WABinary_1.getBinaryNodeChild)(result, 'group');
-    const descChild = (0, WABinary_1.getBinaryNodeChild)(group, 'description');
+    var _a, _b;
+    const group = WABinary_1.getBinaryNodeChild(result, 'group');
+    const descChild = WABinary_1.getBinaryNodeChild(group, 'description');
     let desc;
     let descId;
     let descOwner;
-    let descOwnerPn;
+    let descOwnerLid;
     let descTime;
     if (descChild) {
-        desc = (0, WABinary_1.getBinaryNodeChildString)(descChild, 'body');
-        descOwner = descChild.attrs.participant ? (0, WABinary_1.jidNormalizedUser)(descChild.attrs.participant) : undefined;
-        descOwnerPn = descChild.attrs.participant_pn ? (0, WABinary_1.jidNormalizedUser)(descChild.attrs.participant_pn) : undefined;
-        descTime = +descChild.attrs.t;
+        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 = (0, WABinary_1.getBinaryNodeChild)(group, 'ephemeral')?.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,
-        notify: group.attrs.notify,
-        addressingMode: group.attrs.addressing_mode === 'lid' ? Types_1.WAMessageAddressingMode.LID : Types_1.WAMessageAddressingMode.PN,
+        addressingMode: group.attrs.addressing_mode,
         subject: group.attrs.subject,
-        subjectOwner: group.attrs.s_o,
-        subjectOwnerPn: group.attrs.s_o_pn,
-        subjectTime: +group.attrs.s_t,
-        size: group.attrs.size ? +group.attrs.size : (0, WABinary_1.getBinaryNodeChildren)(group, 'participant').length,
-        creation: +group.attrs.creation,
-        owner: group.attrs.creator ? (0, WABinary_1.jidNormalizedUser)(group.attrs.creator) : undefined,
-        ownerPn: group.attrs.creator_pn ? (0, WABinary_1.jidNormalizedUser)(group.attrs.creator_pn) : undefined,
-        owner_country_code: group.attrs.creator_country_code,
-        desc,
-        descId,
+        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,
-        descOwnerPn,
-        descTime,
-        linkedParent: (0, WABinary_1.getBinaryNodeChild)(group, 'linked_parent')?.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'),
+        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.jid,
-                phoneNumber: (0, WABinary_1.isLidUser)(attrs.jid) && (0, WABinary_1.isPnUser)(attrs.phone_number) ? attrs.phone_number : undefined,
-                lid: (0, WABinary_1.isPnUser)(attrs.jid) && (0, WABinary_1.isLidUser)(attrs.lid) ? attrs.lid : undefined,
-                admin: (attrs.type || null)
+                jid: attrs.phone_number || attrs.jid,
+                admin: (attrs.type || null),
             };
         }),
         ephemeralDuration: eph ? +eph : undefined
@@ -327,3 +314,4 @@ const extractGroupMetadata = (result) => {
     return metadata;
 };
 exports.extractGroupMetadata = extractGroupMetadata;
+