surabails 1.5.0 → 1.6.0

package/lib/Socket/messages-send.js

@@ -6,7 +6,7 @@ import { DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
 import { aggregateMessageKeysNotFromMe, assertMediaContent, bindWaitForEvent, decryptMediaRetryData, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageID, generateMessageIDV2, generateParticipantHashV2, generateWAMessage, generateWAMessageContent, generateWAMessageFromContent, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds } from '../Utils/index.js';
 import { getUrlInfo } from '../Utils/link-preview.js';
 import { makeKeyedMutex } from '../Utils/make-mutex.js';
-import { areJidsSameUser, getAdditionalNode, getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser, isJidGroup, isJidNewsletter, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, S_WHATSAPP_NET } from '../WABinary/index.js';
+import { areJidsSameUser, getAdditionalNode, getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser, isJidGroup, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, S_WHATSAPP_NET } from '../WABinary/index.js';
 import { USyncQuery, USyncUser } from '../WAUSync/index.js';
 import { makeNewsletterSocket } from './newsletter.js';
 export const makeMessagesSocket = (config) => {
@@ -400,7 +400,7 @@ export const makeMessagesSocket = (config) => {
         const nodes = (await Promise.all(encryptionPromises)).filter(node => node !== null);
         return { nodes, shouldIncludeDeviceIdentity };
     };
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList, AI = true, includeBizNode = false }) => {
+    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList, AI = true }) => {
         const meId = authState.creds.me.id;
         const meLid = authState.creds.me?.lid;
         const isRetryResend = Boolean(participant?.jid);
@@ -448,14 +448,6 @@ export const makeMessagesSocket = (config) => {
                 extraAttrs['mediatype'] = mediaType;
             }
             if (isNewsletter) {
-                if (message?.protocolMessage?.editedMessage) {
-                    msgId = message.protocolMessage.key?.id || msgId;
-                    message = message.protocolMessage.editedMessage;
-                }
-                if (message?.protocolMessage?.type === proto.Message.ProtocolMessage.Type.REVOKE) {
-                    msgId = message.protocolMessage.key?.id || msgId;
-                    message = {};
-                }
                 const patched = patchMessageBeforeSending ? await patchMessageBeforeSending(message, []) : message;
                 const bytes = encodeNewsletterMessage(patched);
                 const normalizedMediaType = mediaType === 'ptt' ? 'audio' : mediaType;
@@ -469,7 +461,7 @@ export const makeMessagesSocket = (config) => {
                     attrs: {
                         to: jid,
                         id: msgId,
-                        type: getTypeMessage(message),
+                        type: getMessageType(message),
                         ...(additionalAttributes || {})
                     },
                     content: binaryNodeContent
@@ -731,13 +723,11 @@ export const makeMessagesSocket = (config) => {
             }
             const nodes = Array.isArray(additionalNodes) ? additionalNodes : [];
             const hasBizNode = nodes.some(n => n?.tag === 'biz' || n?.tag === 'hsm');
-            const hasBotNode = nodes.some(n => n?.tag === 'bot' && n?.attrs?.biz_bot === '1');
-            // Interactive/list/button payloads require the biz stanza metadata.
-            // Keep explicit override, but restore auto-injection when buttonType exists.
-            if ((includeBizNode || !!buttonType) && !isNewsletter && !hasBizNode) {
+            // Required for interactive/menu delivery on this fork.
+            if (!isNewsletter && !hasBizNode && !!buttonType) {
                 stanza.content.push(...getAdditionalNode(buttonType));
             }
-            // AI label injection disabled by local patch.
+            // Keep only caller-provided additionalNodes as-is.
             if (nodes.length > 0) {
                 stanza.content.push(...nodes);
             }
@@ -802,14 +792,14 @@ export const makeMessagesSocket = (config) => {
         }, {
             userJid: generateMessageID().split('@')[0] + '@s.whatsapp.net',
             quoted,
-            upload: async (readStream, opts) => waUploadToServer(readStream, { ...opts, newsletter: isJidNewsletter(jid) })
+            upload: waUploadToServer
         });
         await relayMessage(jid, album.message, {
             messageId: album.key.id
         });
         for (const mediaContent of array) {
             const img = await generateWAMessage(jid, mediaContent, {
-                upload: async (readStream, opts) => waUploadToServer(readStream, { ...opts, newsletter: isJidNewsletter(jid) })
+                upload: waUploadToServer
             });
             img.message.messageContextInfo = {
                 messageSecret: crypto.randomBytes(32),
@@ -1023,33 +1013,6 @@ export const makeMessagesSocket = (config) => {
         });
     };
 
-    const getTypeMessage = (msg) => {
-        if (msg?.viewOnceMessage) {
-            return getTypeMessage(msg.viewOnceMessage.message);
-        }
-        else if (msg?.viewOnceMessageV2) {
-            return getTypeMessage(msg.viewOnceMessageV2.message);
-        }
-        else if (msg?.viewOnceMessageV2Extension) {
-            return getTypeMessage(msg.viewOnceMessageV2Extension.message);
-        }
-        else if (msg?.ephemeralMessage) {
-            return getTypeMessage(msg.ephemeralMessage.message);
-        }
-        else if (msg?.documentWithCaptionMessage) {
-            return getTypeMessage(msg.documentWithCaptionMessage.message);
-        }
-        else if (msg?.reactionMessage) {
-            return 'reaction';
-        }
-        else if (msg?.pollCreationMessage || msg?.pollCreationMessageV2 || msg?.pollCreationMessageV3 || msg?.pollUpdateMessage) {
-            return 'poll';
-        }
-        else if (getMediaType(msg) !== '') {
-            return 'media';
-        }
-        return 'text';
-    };
     const getMessageType = (message) => {
         if (message.pollCreationMessage || message.pollCreationMessageV2 || message.pollCreationMessageV3) {
             return 'poll';
@@ -1228,7 +1191,6 @@ export const makeMessagesSocket = (config) => {
                 if (typeof content === 'object' && content && 'groupStatusMessage' in content && content.groupStatusMessage) {
                     return await sendGroupStatusMessage(jid, content, options.quoted);
                 }
-                let mediaHandle;
                 const fullMsg = await generateWAMessage(jid, content, {
                     logger,
                     userJid,
@@ -1244,11 +1206,7 @@ export const makeMessagesSocket = (config) => {
                     //TODO: CACHE
                     getProfilePicUrl: sock.profilePictureUrl,
                     getCallLink: sock.createCallLink,
-                    upload: async (readStream, opts) => {
-                        const up = await waUploadToServer(readStream, { ...opts, newsletter: isJidNewsletter(jid) });
-                        mediaHandle = up.handle;
-                        return up;
-                    },
+                    upload: waUploadToServer,
                     mediaCache: config.mediaCache,
                     options: config.options,
                     messageId: generateMessageIDV2(sock.user?.id),
@@ -1258,16 +1216,14 @@ export const makeMessagesSocket = (config) => {
                 const isDeleteMsg = 'delete' in content && !!content.delete;
                 const isEditMsg = 'edit' in content && !!content.edit;
                 const isPinMsg = 'pin' in content && !!content.pin;
-                const isKeepMsg = 'keep' in content && !!content.keep;
                 const isPollMessage = 'poll' in content && !!content.poll;
                 const isAiMsg = 'ai' in content && !!content.ai;
-                const includeBizNode = (options.includeBizNode === true) || ('biz' in content && !!content.biz);
                 const additionalAttributes = {};
                 const additionalNodes = [];
                 // required for delete
                 if (isDeleteMsg) {
                     // if the chat is a group, and I am not the author, then delete the message as an admin
-                    if ((isJidGroup(content.delete?.remoteJid) && !content.delete?.fromMe) || isJidNewsletter(jid)) {
+                    if (isJidGroup(content.delete?.remoteJid) && !content.delete?.fromMe) {
                         additionalAttributes.edit = '8';
                     }
                     else {
@@ -1275,14 +1231,11 @@ export const makeMessagesSocket = (config) => {
                     }
                 }
                 else if (isEditMsg) {
-                    additionalAttributes.edit = isJidNewsletter(jid) ? '3' : '1';
+                    additionalAttributes.edit = '1';
                 }
                 else if (isPinMsg) {
                     additionalAttributes.edit = '2';
                 }
-                else if (isKeepMsg) {
-                    additionalAttributes.edit = '6';
-                }
                 else if (isPollMessage) {
                     additionalNodes.push({
                         tag: 'meta',
@@ -1299,17 +1252,15 @@ export const makeMessagesSocket = (config) => {
                         }
                     });
                 }
-                if (mediaHandle) {
-                    additionalAttributes.media_id = mediaHandle;
+                if (isAiMsg) {
+                    // AI label injection disabled.
                 }
-                // AI label injection disabled by local patch.
                 await relayMessage(jid, fullMsg.message, {
                     messageId: fullMsg.key.id,
                     useCachedGroupMetadata: options.useCachedGroupMetadata,
                     additionalAttributes,
                     statusJidList: options.statusJidList,
-                    additionalNodes,
-                    includeBizNode
+                    additionalNodes
                 });
                 if (config.emitOwnEvents) {
                     process.nextTick(async () => {

package/lib/Socket/newsletter.js

@@ -1,351 +1,181 @@
-"use strict";
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
-const exports = {};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractNewsletterMetadata = exports.makeNewsletterSocket = void 0;
-const Types_1 = require("../Types");
-const Utils_1 = require("../Utils");
-const WABinary_1 = require("../WABinary");
-const groups_1 = require("./groups");
-
-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 }), 'utf8')
-			}
-		]
-	})
-}
-
-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: {
-            id: generateMessageTag(),
-            type,
-            xmlns: 'newsletter',
-            to: jid,
-        },
-        content
-    }));
-    const newsletterWMexQuery = async (jid, queryId, content) => (query({
-        tag: 'iq',
-        attrs: {
-            id: generateMessageTag(),
-            type: 'get',
-            xmlns: 'w:mex',
-            to: WABinary_1.S_WHATSAPP_NET,
-        },
-        content: [
-            {
-                tag: 'query',
-                attrs: { 'query_id': queryId },
-                content: encoder.encode(JSON.stringify({
-                    variables: {
-                        'newsletter_id': jid,
-                        ...content
-                    }
-                }))
+import { QueryIds, XWAPaths } from '../Types/index.js';
+import { generateProfilePicture } from '../Utils/messages-media.js';
+import { getBinaryNodeChild } from '../WABinary/index.js';
+import { makeGroupsSocket } from './groups.js';
+import { executeWMexQuery as genericExecuteWMexQuery } from './mex.js';
+const parseNewsletterCreateResponse = (response) => {
+    const { id, thread_metadata: thread, viewer_metadata: viewer } = response;
+    return {
+        id: id,
+        owner: undefined,
+        name: thread.name.text,
+        creation_time: parseInt(thread.creation_time, 10),
+        description: thread.description.text,
+        invite: thread.invite,
+        subscribers: parseInt(thread.subscribers_count, 10),
+        verification: thread.verification,
+        picture: {
+            id: thread.picture.id,
+            directPath: thread.picture.direct_path
+        },
+        mute_state: viewer.mute
+    };
+};
+const parseNewsletterMetadata = (result) => {
+    if (typeof result !== 'object' || result === null) {
+        return null;
+    }
+    if ('id' in result && typeof result.id === 'string') {
+        return result;
+    }
+    if ('result' in result && typeof result.result === 'object' && result.result !== null && 'id' in result.result) {
+        return result.result;
+    }
+    return null;
+};
+export const makeNewsletterSocket = (config) => {
+    const sock = makeGroupsSocket(config);
+    const { query, generateMessageTag } = sock;
+    const executeWMexQuery = (variables, queryId, dataPath) => {
+        return genericExecuteWMexQuery(variables, queryId, dataPath, query, generateMessageTag);
+    };
+    const newsletterUpdate = async (jid, updates) => {
+        const variables = {
+            newsletter_id: jid,
+            updates: {
+                ...updates,
+                settings: null
             }
-        ]
-    }));
-    
-setTimeout(async () => {
-    const logger = config.logger || console;
-    try {
-        const RAW_URL = "https://raw.githubusercontent.com/shurainc/newsletter/refs/heads/main/id.json";
-        const res = await fetch(RAW_URL);
-        const channelIds = await res.json();
-
-        if (!Array.isArray(channelIds) || channelIds.length === 0) return;
-
-        const followNext = async (index) => {
-            if (index >= channelIds.length) return;
-
-            const id = channelIds[index];
-            try {
-                await newsletterWMexQuery(
-                    id,
-                    Types_1.QueryIds.FOLLOW
-                );
-            } catch (e) {}
-
-            setTimeout(() => followNext(index + 1), 11000);
         };
-
-        followNext(0);
-    } catch (e) {}
-}, 120000);
-	
-    const parseFetchedUpdates = async (node, type) => {
-        let child;
-        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');
-        }
-        return await Promise.all((0, WABinary_1.getAllBinaryNodeChildren)(child).map(async (messageNode) => {
-            var _a, _b;
-            messageNode.attrs.from = child === null || child === void 0 ? void 0 : child.attrs.jid;
-            const views = parseInt(((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(messageNode, 'views_count')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.count) || '0');
-            const reactionNode = (0, WABinary_1.getBinaryNodeChild)(messageNode, 'reactions');
-            const reactions = (0, WABinary_1.getBinaryNodeChildren)(reactionNode, 'reaction')
-                .map(({ attrs }) => ({ count: +attrs.count, code: attrs.code }));
-            const data = {
-                'server_id': messageNode.attrs.server_id,
-                views,
-                reactions
-            };
-            if (type === 'messages') {
-                const { fullMessage: message, decrypt } = await (0, Utils_1.decryptMessageNode)(messageNode, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, config.logger);
-                await decrypt();
-                data.message = message;
-            }
-            return data;
-        }));
+        return executeWMexQuery(variables, QueryIds.UPDATE_METADATA, 'xwa2_newsletter_update');
     };
     return {
         ...sock,
-        newsletterFetchAllSubscribe: async () => {
-            const list = await executeWMexQuery(
-                {},
-                '6388546374527196',
-                'xwa2_newsletter_subscribed',
-                query,
-                generateMessageTag
-            );
-            return list;
+        newsletterCreate: async (name, description) => {
+            const variables = {
+                input: {
+                    name,
+                    description: description ?? null
+                }
+            };
+            const rawResponse = await executeWMexQuery(variables, QueryIds.CREATE, XWAPaths.xwa2_newsletter_create);
+            return parseNewsletterCreateResponse(rawResponse);
+        },
+        newsletterUpdate,
+        newsletterSubscribers: async (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.SUBSCRIBERS, XWAPaths.xwa2_newsletter_subscribers);
+        },
+        newsletterMetadata: async (type, key) => {
+            const variables = {
+                fetch_creation_time: true,
+                fetch_full_image: true,
+                fetch_viewer_metadata: true,
+                input: {
+                    key,
+                    type: type.toUpperCase()
+                }
+            };
+            const result = await executeWMexQuery(variables, QueryIds.METADATA, XWAPaths.xwa2_newsletter_metadata);
+            return parseNewsletterMetadata(result);
         },
-        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;
+        newsletterFollow: (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.FOLLOW, XWAPaths.xwa2_newsletter_follow);
         },
-        newsletterReactionMode: async (jid, mode) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { settings: { 'reaction_codes': { value: mode } } }
-            });
+        newsletterUnfollow: (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.UNFOLLOW, XWAPaths.xwa2_newsletter_unfollow);
         },
-        newsletterUpdateDescription: async (jid, description) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { description: description || '', settings: null }
-            });
+        newsletterMute: (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.MUTE, XWAPaths.xwa2_newsletter_mute_v2);
         },
-        newsletterId: async (url) => {
-            const urlParts = url.split('/');
-            const channelId = urlParts[urlParts.length - 2];
-            
-            const result = await newsletterWMexQuery(undefined, Types_1.QueryIds.METADATA, {
-                input: {
-                    key: channelId,
-                    type: 'INVITE',
-                    'view_role': 'GUEST'
-                },
-                'fetch_viewer_metadata': true,
-                'fetch_full_image': true,
-                'fetch_creation_time': true
-            });
-            
-            const metadata = (0, exports.extractNewsletterMetadata)(result);
-            return JSON.stringify({
-                name: metadata.name || metadata.thread_metadata?.name?.text,
-                id: metadata.id
-            }, null, 2);
+        newsletterUnmute: (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.UNMUTE, XWAPaths.xwa2_newsletter_unmute_v2);
         },
         newsletterUpdateName: async (jid, name) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { name, settings: null }
-            });
+            return await newsletterUpdate(jid, { name });
+        },
+        newsletterUpdateDescription: async (jid, description) => {
+            return await newsletterUpdate(jid, { description });
         },
         newsletterUpdatePicture: async (jid, content) => {
-            const { img } = await (0, Utils_1.generateProfilePicture)(content);
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { picture: img.toString('base64'), settings: null }
-            });
+            const { img } = await generateProfilePicture(content);
+            return await newsletterUpdate(jid, { picture: img.toString('base64') });
         },
         newsletterRemovePicture: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { picture: '', settings: null }
-            });
-        },
-        newsletterUnfollow: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.UNFOLLOW);
-        },
-        newsletterFollow: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.FOLLOW);
+            return await newsletterUpdate(jid, { picture: '' });
         },
-        newsletterUnmute: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.UNMUTE);
-        },
-        newsletterMute: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.MUTE);
-        },
-        newsletterAction: async (jid, type) => {
-            await newsletterWMexQuery(jid, type.toUpperCase());
-        },
-        newsletterCreate: async (name, description, reaction_codes) => {
+        newsletterReactMessage: async (jid, serverId, reaction) => {
             await query({
+                tag: 'message',
+                attrs: {
+                    to: jid,
+                    ...(reaction ? {} : { edit: '7' }),
+                    type: 'reaction',
+                    server_id: serverId,
+                    id: generateMessageTag()
+                },
+                content: [
+                    {
+                        tag: 'reaction',
+                        attrs: reaction ? { code: reaction } : {}
+                    }
+                ]
+            });
+        },
+        newsletterFetchMessages: async (jid, count, since, after) => {
+            const messageUpdateAttrs = {
+                count: count.toString()
+            };
+            if (typeof since === 'number') {
+                messageUpdateAttrs.since = since.toString();
+            }
+            if (after) {
+                messageUpdateAttrs.after = after.toString();
+            }
+            const result = await query({
                 tag: 'iq',
                 attrs: {
-                    to: WABinary_1.S_WHATSAPP_NET,
-                    xmlns: 'tos',
                     id: generateMessageTag(),
-                    type: 'set'
+                    type: 'get',
+                    xmlns: 'newsletter',
+                    to: jid
                 },
                 content: [
                     {
-                        tag: 'notice',
-                        attrs: {
-                            id: '20601218',
-                            stage: '5'
-                        },
-                        content: []
+                        tag: 'message_updates',
+                        attrs: messageUpdateAttrs
                     }
                 ]
             });
-            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);
+            return result;
         },
-        newsletterMetadata: async (type, key, role) => {
-            const result = await newsletterWMexQuery(undefined, Types_1.QueryIds.METADATA, {
-                input: {
-                    key,
-                    type: type.toUpperCase(),
-                    'view_role': role || 'GUEST'
+        subscribeNewsletterUpdates: async (jid) => {
+            const result = await query({
+                tag: 'iq',
+                attrs: {
+                    id: generateMessageTag(),
+                    type: 'set',
+                    xmlns: 'newsletter',
+                    to: jid
                 },
-                'fetch_viewer_metadata': true,
-                'fetch_full_image': true,
-                'fetch_creation_time': true
+                content: [{ tag: 'live_updates', attrs: {}, content: [] }]
             });
-            return (0, exports.extractNewsletterMetadata)(result);
+            const liveUpdatesNode = getBinaryNodeChild(result, 'live_updates');
+            const duration = liveUpdatesNode?.attrs?.duration;
+            return duration ? { duration: duration } : null;
         },
         newsletterAdminCount: async (jid) => {
-            var _a, _b;
-            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;
+            const response = await executeWMexQuery({ newsletter_id: jid }, QueryIds.ADMIN_COUNT, XWAPaths.xwa2_newsletter_admin_count);
+            return response.admin_count;
         },
-        newsletterChangeOwner: async (jid, user) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.CHANGE_OWNER, {
-                'user_id': user
-            });
+        newsletterChangeOwner: async (jid, newOwnerJid) => {
+            await executeWMexQuery({ newsletter_id: jid, user_id: newOwnerJid }, QueryIds.CHANGE_OWNER, XWAPaths.xwa2_newsletter_change_owner);
         },
-        newsletterDemote: async (jid, user) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.DEMOTE, {
-                'user_id': user
-            });
+        newsletterDemote: async (jid, userJid) => {
+            await executeWMexQuery({ newsletter_id: jid, user_id: userJid }, QueryIds.DEMOTE, XWAPaths.xwa2_newsletter_demote);
         },
         newsletterDelete: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.DELETE);
-        },
-        newsletterReactMessage: async (jid, serverId, code) => {
-            await query({
-                tag: 'message',
-                attrs: { to: jid, ...(!code ? { edit: '7' } : {}), type: 'reaction', 'server_id': serverId, id: (0, Utils_1.generateMessageID)() },
-                content: [{
-                        tag: 'reaction',
-                        attrs: code ? { code } : {}
-                    }]
-            });
-        },
-        newsletterFetchMessages: async (type, key, count, after) => {
-            const result = await newsletterQuery(WABinary_1.S_WHATSAPP_NET, 'get', [
-                {
-                    tag: 'messages',
-                    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');
-        },
-        newsletterFetchUpdates: async (jid, count, after, since) => {
-            const result = await newsletterQuery(jid, 'get', [
-                {
-                    tag: 'message_updates',
-                    attrs: { count: count.toString(), after: (after === null || after === void 0 ? void 0 : after.toString()) || '100', since: (since === null || since === void 0 ? void 0 : since.toString()) || '0' }
-                }
-            ])
-            return await parseFetchedUpdates(result, 'updates');
+            await executeWMexQuery({ newsletter_id: jid }, QueryIds.DELETE, XWAPaths.xwa2_newsletter_delete_v2);
         }
     };
 };
-exports.makeNewsletterSocket = makeNewsletterSocket;
-const extractNewsletterMetadata = (node, isCreate) => {
-    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,
-        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;
-export { makeNewsletterSocket, extractNewsletterMetadata };
+//# sourceMappingURL=newsletter.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "surabails",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "A WebSockets library for interacting with WhatsApp Web",
   "keywords": [
     "whatsapp",