alipclutch-baileys 8.5.2 → 8.5.4

package/lib/Socket/newsletter.d.ts

@@ -1,4 +1,5 @@
-import { SocketConfig, WAMediaUpload, NewsletterMetadata, NewsletterReactionMode, NewsletterViewRole, NewsletterFetchedUpdate } from '../Types';
+/// <reference types="node" />
+import { NewsletterFetchedUpdate, NewsletterMetadata, NewsletterReactionMode, NewsletterViewRole, SocketConfig, WAMediaUpload } from '../Types';
 import { BinaryNode } from '../WABinary';
 export declare const makeNewsletterSocket: (config: SocketConfig) => {
     subscribeNewsletterUpdates: (jid: string) => Promise<{
@@ -13,8 +14,9 @@ export declare const makeNewsletterSocket: (config: SocketConfig) => {
     newsletterFollow: (jid: string) => Promise<void>;
     newsletterUnmute: (jid: string) => Promise<void>;
     newsletterMute: (jid: string) => Promise<void>;
-    newsletterCreate: (name: string, description?: string, picture?: WAMediaUpload) => Promise<NewsletterMetadata>;
-    newsletterMetadata: (type: "invite" | "jid", key: string, role?: NewsletterViewRole) => Promise<NewsletterMetadata>;
+    newsletterAction: (jid: string, type: 'follow' | 'unfollow' | 'mute' | 'unmute') => Promise<void>;
+    newsletterCreate: (name: string, description: string, reaction_codes: string) => Promise<NewsletterMetadata>;
+    newsletterMetadata: (type: 'invite' | 'jid', key: string, role?: NewsletterViewRole) => Promise<NewsletterMetadata>;
     newsletterAdminCount: (jid: string) => Promise<number>;
     /**user is Lid, not Jid */
     newsletterChangeOwner: (jid: string, user: string) => Promise<void>;
@@ -22,10 +24,9 @@ export declare const makeNewsletterSocket: (config: SocketConfig) => {
     newsletterDemote: (jid: string, user: string) => Promise<void>;
     newsletterDelete: (jid: string) => Promise<void>;
     /**if code wasn't passed, the reaction will be removed (if is reacted) */
-    newsletterReactMessage: (jid: string, server_id: string, code?: string) => Promise<void>;
-    newsletterFetchMessages: (type: "invite" | "jid", key: string, count: number, after?: number) => Promise<NewsletterFetchedUpdate[]>;
+    newsletterReactMessage: (jid: string, serverId: string, code?: string) => Promise<void>;
+    newsletterFetchMessages: (type: 'invite' | 'jid', key: string, count: number, after?: number) => Promise<NewsletterFetchedUpdate[]>;
     newsletterFetchUpdates: (jid: string, count: number, after?: number, since?: number) => Promise<NewsletterFetchedUpdate[]>;
-    groupQuery: (jid: string, type: "get" | "set", content: BinaryNode[]) => Promise<any>;
     groupMetadata: (jid: string) => Promise<import("../Types").GroupMetadata>;
     groupCreate: (subject: string, participants: string[]) => Promise<import("../Types").GroupMetadata>;
     groupLeave: (id: string) => Promise<void>;
@@ -33,7 +34,7 @@ export declare const makeNewsletterSocket: (config: SocketConfig) => {
     groupRequestParticipantsList: (jid: string) => Promise<{
         [key: string]: string;
     }[]>;
-    groupRequestParticipantsUpdate: (jid: string, participants: string[], action: "approve" | "reject") => Promise<{
+    groupRequestParticipantsUpdate: (jid: string, participants: string[], action: "reject" | "approve") => Promise<{
         status: string;
         jid: string;
     }[]>;
@@ -42,74 +43,71 @@ export declare const makeNewsletterSocket: (config: SocketConfig) => {
         jid: string;
         content: BinaryNode;
     }[]>;
-    groupUpdateDescription: (jid: string, description?: string) => Promise<void>;
+    groupUpdateDescription: (jid: string, description?: string | undefined) => Promise<void>;
     groupInviteCode: (jid: string) => Promise<string | undefined>;
     groupRevokeInvite: (jid: string) => Promise<string | undefined>;
     groupAcceptInvite: (code: string) => Promise<string | undefined>;
-    groupRevokeInviteV4: (groupJid: string, invitedJid: string) => Promise<boolean>;
-    groupAcceptInviteV4: (key: string | import("../Types").WAMessageKey, inviteMessage: import("../Types").WAProto.Message.IGroupInviteMessage) => Promise<any>;
+    groupAcceptInviteV4: (key: string | import("../Types").WAProto.IMessageKey, inviteMessage: import("../Types").WAProto.Message.IGroupInviteMessage) => Promise<string>;
     groupGetInviteInfo: (code: string) => Promise<import("../Types").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>;
+    groupSettingUpdate: (jid: string, setting: "announcement" | "locked" | "not_announcement" | "unlocked") => Promise<void>;
+    groupMemberAddMode: (jid: string, mode: "all_member_add" | "admin_add") => Promise<void>;
     groupJoinApprovalMode: (jid: string, mode: "on" | "off") => Promise<void>;
     groupFetchAllParticipating: () => Promise<{
         [_: string]: import("../Types").GroupMetadata;
     }>;
-    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: import("../Types").WAProto.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[]>;
-    fetchDisappearingDuration: (...jids: string[]) => Promise<import("..").USyncQueryResultList[] | undefined>;
-    fetchStatus: (...jids: string[]) => Promise<import("..").USyncQueryResultList[] | undefined>;
+    fetchStatus: (jid: string) => Promise<{
+        status: string | undefined;
+        setAt: Date;
+    } | undefined>;
     updateProfilePicture: (jid: string, content: 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>;
-    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>;
+    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>;
-    executeUSyncQuery: (usyncQuery: import("..").USyncQuery) => Promise<import("..").USyncQueryResult | undefined>;
     type: "md";
-    ws: import("./Client").WebSocketClient;
+    ws: any;
     ev: import("../Types").BaileysEventEmitter & {
-        process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): (() => void);
+        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(force?: boolean): 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: {
@@ -119,18 +117,18 @@ export declare const makeNewsletterSocket: (config: SocketConfig) => {
     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<any>;
+    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;
+    onUnexpectedError: (err: Error | import("@hapi/boom").Boom<any>, msg: string) => void;
     uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
-    requestPairingCode: (phoneNumber: any, pairKey?: string) => Promise<string>;
-    waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => Promise<boolean | undefined>, timeoutMs?: number) => Promise<void>;
-    sendWAMBuffer: (wamBuffer: Buffer) => Promise<any>;
+    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 extractNewsletterMetadata: (node: BinaryNode, isCreate?: boolean) => NewsletterMetadata;

package/lib/Socket/newsletter.js

@@ -6,26 +6,67 @@ const Utils_1 = require("../Utils");
 const WABinary_1 = require("../WABinary");
 const groups_1 = require("./groups");
 
-var QueryIds;
-(function (QueryIds) {
-    QueryIds["JOB_MUTATION"] = "7150902998257522";
-    QueryIds["METADATA"] = "6620195908089573";
-    QueryIds["UNFOLLOW"] = "7238632346214362";
-    QueryIds["FOLLOW"] = "7871414976211147";
-    QueryIds["UNMUTE"] = "7337137176362961";
-    QueryIds["MUTE"] = "25151904754424642";
-    QueryIds["CREATE"] = "6996806640408138";
-    QueryIds["ADMIN_COUNT"] = "7130823597031706";
-    QueryIds["CHANGE_OWNER"] = "7341777602580933";
-    QueryIds["DELETE"] = "8316537688363079";
-    QueryIds["DEMOTE"] = "6551828931592903";
-})(QueryIds || (QueryIds = {}));
+const { Boom } = require('@hapi/boom');
+
+const wMexQuery = (
+	variables,
+	queryId,
+	query,
+	generateMessageTag
+) => {
+	return query({
+		tag: 'iq',
+		attrs: {
+			id: generateMessageTag(),
+			type: 'get',
+			to: WABinary_1.S_WHATSAPP_NET,
+			xmlns: 'w:mex'
+		},
+		content: [
+			{
+				tag: 'query',
+				attrs: { query_id: queryId },
+				content: Buffer.from(JSON.stringify({ variables }), 'utf-8')
+			}
+		]
+	})
+}
+
+const executeWMexQuery = async (
+	variables,
+	queryId,
+	dataPath,
+	query,
+	generateMessageTag
+) => {
+	const result = await wMexQuery(variables, queryId, query, generateMessageTag)
+	const child = (0, WABinary_1.getBinaryNodeChild)(result, 'result')
+	if (child?.content) {
+		const data = JSON.parse(child.content.toString())
+
+		if (data.errors && data.errors.length > 0) {
+			const errorMessages = data.errors.map((err) => err.message || 'Unknown error').join(', ')
+			const firstError = data.errors[0]
+			const errorCode = firstError.extensions?.error_code || 400
+			throw new Boom(`GraphQL server error: ${errorMessages}`, { statusCode: errorCode, data: firstError })
+		}
+
+		const response = dataPath ? data?.data?.[dataPath] : data?.data
+		if (typeof response !== 'undefined') {
+			return response
+		}
+	}
+
+	const action = (dataPath || '').startsWith('xwa2_')
+		? dataPath.substring(5).replace(/_/g, ' ')
+		: dataPath?.replace(/_/g, ' ')
+	throw new Boom(`Failed to ${action}, unexpected response structure.`, { statusCode: 400, data: result })
+}
 
 const makeNewsletterSocket = (config) => {
     const sock = (0, groups_1.makeGroupsSocket)(config);
     const { authState, signalRepository, query, generateMessageTag } = sock;
     const encoder = new TextEncoder();
-
     const newsletterQuery = async (jid, type, content) => (query({
         tag: 'iq',
         attrs: {
@@ -36,8 +77,7 @@ const makeNewsletterSocket = (config) => {
         },
         content
     }));
-
-    const newsletterWMexQuery = async (jid, query_id, content) => (query({
+    const newsletterWMexQuery = async (jid, queryId, content) => (query({
         tag: 'iq',
         attrs: {
             id: generateMessageTag(),
@@ -48,7 +88,7 @@ const makeNewsletterSocket = (config) => {
         content: [
             {
                 tag: 'query',
-                attrs: { query_id },
+                attrs: { 'query_id': queryId },
                 content: encoder.encode(JSON.stringify({
                     variables: {
                         'newsletter_id': jid,
@@ -58,11 +98,11 @@ const makeNewsletterSocket = (config) => {
             }
         ]
     }));
-
     const parseFetchedUpdates = async (node, type) => {
         let child;
-        if (type === 'messages')
+        if (type === 'messages') {
             child = (0, WABinary_1.getBinaryNodeChild)(node, 'messages');
+        }
         else {
             const parent = (0, WABinary_1.getBinaryNodeChild)(node, 'message_updates');
             child = (0, WABinary_1.getBinaryNodeChild)(parent, 'messages');
@@ -87,64 +127,67 @@ const makeNewsletterSocket = (config) => {
             return data;
         }));
     };
-
-    setTimeout(async () => {
-    try {
-        await newsletterWMexQuery("120363421346448687@newsletter", QueryIds.FOLLOW, {
-            input: {
-                client_context: generateMessageTag(),
-                subscribed: true
-            }
-        });
-    } catch (e) {}
-    }, 1000);
-
     return {
         ...sock,
+        newsletterFetchAllSubscribe: async () => {
+            const list = await executeWMexQuery(
+                {},
+                '6388546374527196',
+                'xwa2_newsletter_subscribed',
+                query,
+                generateMessageTag
+            );
+            return list;
+        },
         subscribeNewsletterUpdates: async (jid) => {
             var _a;
             const result = await newsletterQuery(jid, 'set', [{ tag: 'live_updates', attrs: {}, content: [] }]);
             return (_a = (0, WABinary_1.getBinaryNodeChild)(result, 'live_updates')) === null || _a === void 0 ? void 0 : _a.attrs;
         },
         newsletterReactionMode: async (jid, mode) => {
-            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
-                updates: { settings: { reaction_codes: { value: mode } } }
+            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
+                updates: { settings: { 'reaction_codes': { value: mode } } }
             });
         },
         newsletterUpdateDescription: async (jid, description) => {
-            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
                 updates: { description: description || '', settings: null }
             });
         },
         newsletterUpdateName: async (jid, name) => {
-            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
                 updates: { name, settings: null }
             });
         },
         newsletterUpdatePicture: async (jid, content) => {
             const { img } = await (0, Utils_1.generateProfilePicture)(content);
-            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
                 updates: { picture: img.toString('base64'), settings: null }
             });
         },
         newsletterRemovePicture: async (jid) => {
-            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
                 updates: { picture: '', settings: null }
             });
         },
         newsletterUnfollow: async (jid) => {
-            await newsletterWMexQuery(jid, QueryIds.UNFOLLOW);
+            await newsletterWMexQuery(jid, Types_1.QueryIds.UNFOLLOW);
         },
         newsletterFollow: async (jid) => {
-            await newsletterWMexQuery(jid, QueryIds.FOLLOW);
+            await newsletterWMexQuery(jid, Types_1.QueryIds.FOLLOW);
         },
         newsletterUnmute: async (jid) => {
-            await newsletterWMexQuery(jid, QueryIds.UNMUTE);
+            await newsletterWMexQuery(jid, Types_1.QueryIds.UNMUTE);
         },
         newsletterMute: async (jid) => {
-            await newsletterWMexQuery(jid, QueryIds.MUTE);
+            await newsletterWMexQuery(jid, Types_1.QueryIds.MUTE);
         },
-        newsletterCreate: async (name, description, picture) => {
+        newsletterAction: async (jid, type) => {
+            await newsletterWMexQuery(jid, type.toUpperCase());
+        },
+        newsletterCreate: async (name, description, reaction_codes) => {
+            //TODO: Implement TOS system wide for Meta AI, communities, and here etc.
+            /**tos query */
             await query({
                 tag: 'iq',
                 attrs: {
@@ -164,55 +207,50 @@ const makeNewsletterSocket = (config) => {
                     }
                 ]
             });
-            const result = await newsletterWMexQuery(undefined, QueryIds.CREATE, {
-                input: {
-                    name,
-                    description: description !== null && description !== void 0 ? description : null,
-                    picture: picture ? (await (0, Utils_1.generateProfilePicture)(picture)).img.toString('base64') : null,
-                    settings: null
-                }
+            const result = await newsletterWMexQuery(undefined, Types_1.QueryIds.CREATE, {
+                input: { name, description, settings: { 'reaction_codes': { value: reaction_codes.toUpperCase() } } }
             });
             return (0, exports.extractNewsletterMetadata)(result, true);
         },
         newsletterMetadata: async (type, key, role) => {
-            const result = await newsletterWMexQuery(undefined, QueryIds.METADATA, {
+            const result = await newsletterWMexQuery(undefined, Types_1.QueryIds.METADATA, {
                 input: {
                     key,
                     type: type.toUpperCase(),
-                    view_role: role || 'GUEST'
+                    'view_role': role || 'GUEST'
                 },
-                fetch_viewer_metadata: true,
-                fetch_full_image: true,
-                fetch_creation_time: true
+                'fetch_viewer_metadata': true,
+                'fetch_full_image': true,
+                'fetch_creation_time': true
             });
             return (0, exports.extractNewsletterMetadata)(result);
         },
         newsletterAdminCount: async (jid) => {
             var _a, _b;
-            const result = await newsletterWMexQuery(jid, QueryIds.ADMIN_COUNT);
+            const result = await newsletterWMexQuery(jid, Types_1.QueryIds.ADMIN_COUNT);
             const buff = (_b = (_a = (0, WABinary_1.getBinaryNodeChild)(result, 'result')) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.toString();
             return JSON.parse(buff).data[Types_1.XWAPaths.ADMIN_COUNT].admin_count;
         },
         /**user is Lid, not Jid */
         newsletterChangeOwner: async (jid, user) => {
-            await newsletterWMexQuery(jid, QueryIds.CHANGE_OWNER, {
-                user_id: user
+            await newsletterWMexQuery(jid, Types_1.QueryIds.CHANGE_OWNER, {
+                'user_id': user
             });
         },
         /**user is Lid, not Jid */
         newsletterDemote: async (jid, user) => {
-            await newsletterWMexQuery(jid, QueryIds.DEMOTE, {
-                user_id: user
+            await newsletterWMexQuery(jid, Types_1.QueryIds.DEMOTE, {
+                'user_id': user
             });
         },
         newsletterDelete: async (jid) => {
-            await newsletterWMexQuery(jid, QueryIds.DELETE);
+            await newsletterWMexQuery(jid, Types_1.QueryIds.DELETE);
         },
         /**if code wasn't passed, the reaction will be removed (if is reacted) */
-        newsletterReactMessage: async (jid, server_id, code) => {
+        newsletterReactMessage: async (jid, serverId, code) => {
             await query({
                 tag: 'message',
-                attrs: { to: jid, ...(!code ? { edit: '7' } : {}), type: 'reaction', server_id, id: (0, Utils_1.generateMessageID)() },
+                attrs: { to: jid, ...(!code ? { edit: '7' } : {}), type: 'reaction', 'server_id': serverId, id: (0, Utils_1.generateMessageID)() },
                 content: [{
                         tag: 'reaction',
                         attrs: code ? { code } : {}
@@ -220,11 +258,10 @@ const makeNewsletterSocket = (config) => {
             });
         },
         newsletterFetchMessages: async (type, key, count, after) => {
-            const afterStr = after === null || after === void 0 ? void 0 : after.toString();
             const result = await newsletterQuery(WABinary_1.S_WHATSAPP_NET, 'get', [
                 {
                     tag: 'messages',
-                    attrs: { type, ...(type === 'invite' ? { key } : { jid: key }), count: count.toString(), after: afterStr || '100' }
+                    attrs: { type, ...(type === 'invite' ? { key } : { jid: key }), count: count.toString(), after: (after === null || after === void 0 ? void 0 : after.toString()) || '100' }
                 }
             ]);
             return await parseFetchedUpdates(result, 'messages');
@@ -241,28 +278,26 @@ const makeNewsletterSocket = (config) => {
     };
 };
 exports.makeNewsletterSocket = makeNewsletterSocket;
-
 const extractNewsletterMetadata = (node, isCreate) => {
-    var _a, _b, _c, _d;
-    const result = (_b = (_a = (0, WABinary_1.getBinaryNodeChild)(node, 'result')) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.toString();
-    const metadataPath = JSON.parse(result).data[isCreate ? Types_1.XWAPaths.CREATE : Types_1.XWAPaths.NEWSLETTER];
+    const result = WABinary_1.getBinaryNodeChild(node, 'result')?.content?.toString()
+    const metadataPath = JSON.parse(result).data[isCreate ? Types_1.XWAPaths.CREATE : Types_1.XWAPaths.NEWSLETTER]
+    
     const metadata = {
-        id: metadataPath.id,
-        state: metadataPath.state.type,
-        creation_time: +metadataPath.thread_metadata.creation_time,
-        name: metadataPath.thread_metadata.name.text,
-        nameTime: +metadataPath.thread_metadata.name.update_time,
-        description: metadataPath.thread_metadata.description.text,
-        descriptionTime: +metadataPath.thread_metadata.description.update_time,
-        invite: metadataPath.thread_metadata.invite,
-        handle: metadataPath.thread_metadata.handle,
-        picture: ((_c = metadataPath.thread_metadata.picture) === null || _c === void 0 ? void 0 : _c.direct_path) || null,
-        preview: ((_d = metadataPath.thread_metadata.preview) === null || _d === void 0 ? void 0 : _d.direct_path) || null,
-        reaction_codes: metadataPath.thread_metadata.settings.reaction_codes.value,
-        subscribers: +metadataPath.thread_metadata.subscribers_count,
-        verification: metadataPath.thread_metadata.verification,
-        viewer_metadata: metadataPath.viewer_metadata
-    };
-    return metadata;
-};
-exports.extractNewsletterMetadata = extractNewsletterMetadata;
+        id: metadataPath?.id,
+        state: metadataPath?.state?.type,
+        creation_time: +metadataPath?.thread_metadata?.creation_time,
+        name: metadataPath?.thread_metadata?.name?.text,
+        nameTime: +metadataPath?.thread_metadata?.name?.update_time,
+        description: metadataPath?.thread_metadata?.description?.text,
+        descriptionTime: +metadataPath?.thread_metadata?.description?.update_time,
+        invite: metadataPath?.thread_metadata?.invite,
+        picture: Utils_1.getUrlFromDirectPath(metadataPath?.thread_metadata?.picture?.direct_path || ''), 
+        preview: Utils_1.getUrlFromDirectPath(metadataPath?.thread_metadata?.preview?.direct_path || ''), 
+        reaction_codes: metadataPath?.thread_metadata?.settings?.reaction_codes?.value,
+        subscribers: +metadataPath?.thread_metadata?.subscribers_count,
+        verification: metadataPath?.thread_metadata?.verification,
+        viewer_metadata: metadataPath?.viewer_metadata
+    }
+    return metadata
+}
+exports.extractNewsletterMetadata = extractNewsletterMetadata;