@violetix/baileys 0.5.5 → 0.6.0

package/lib/Socket/messages-send.js

@@ -3,7 +3,7 @@ import { Boom } from '@hapi/boom';
 import { randomBytes } from 'crypto';
 import { proto } from '../../WAProto/index.js';
 import { BIZ_BOT_SUPPORT_PAYLOAD, DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
-import { aggregateMessageKeysNotFromMe, assertMediaContent, assertMeId, bindWaitForEvent, decryptMediaRetryData, DEF_MEDIA_HOST, delay, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateParticipantHashV2, generateWAMessage, generateWAMessageFromContent, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, hashImagePollOption, hasValidAlbumMedia, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, prepareWAMessageMedia, shouldIncludeBizBinaryNode, unixTimestampSeconds } from '../Utils/index.js';
+import { aggregateMessageKeysNotFromMe, assertMediaContent, assertMeId, bindWaitForEvent, decryptMediaRetryData, DEF_MEDIA_HOST, delay, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateParticipantHashV2, generateWAMessage, generateWAMessageFromContent, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, hasValidAlbumMedia, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, shouldIncludeBizBinaryNode, unixTimestampSeconds } from '../Utils/index.js';
 import { AssociationType } from '../Types/index.js';
 import { setBotMessageSecret } from '../Utils/decode-wa-message.js';
 import { getUrlInfo } from '../Utils/link-preview.js';
@@ -13,41 +13,55 @@ import { buildMergedTcTokenIndexWrite, isTcTokenExpired, resolveIssuanceJid, res
 import { areJidsSameUser, getBinaryNodeChild, getBinaryNodeChildren, getBizBinaryNode, isHostedLidUser, isHostedPnUser, isJidBot, isJidGroup, isJidMetaAI, isJidNewsletter, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, PSA_WID, S_WHATSAPP_NET } from '../WABinary/index.js';
 import { USyncQuery, USyncUser } from '../WAUSync/index.js';
 import { makeNewsletterSocket } from './newsletter.js';
-// Lia@Changes 08-09-26 --- Resolve the media type for the "media" shortcut of groupStatus()
 const detectMediaTypeFromBuffer = (buffer) => {
-    const head = buffer.toString('latin1', 0, 12);
-    if (/^(\x89PNG|\xff\xd8\xff|GIF8)/.test(head) || (head.startsWith('RIFF') && head.slice(8, 12) === 'WEBP')) {
+    if (buffer.length > 3 &&
+        buffer[0] === 0x89 && buffer[1] === 0x50 && buffer[2] === 0x4e && buffer[3] === 0x47) {
         return 'image';
     }
-    if (head.slice(4, 8) === 'ftyp') {
+    if (buffer.length > 2 &&
+        buffer[0] === 0xff && buffer[1] === 0xd8 && buffer[2] === 0xff) {
+        return 'image';
+    }
+    if (buffer.length > 3 &&
+        buffer[0] === 0x47 && buffer[1] === 0x49 && buffer[2] === 0x46) {
+        return 'image';
+    }
+    if (buffer.length > 11 &&
+        buffer.toString('latin1', 0, 4) === 'RIFF' &&
+        buffer.toString('latin1', 8, 12) === 'WEBP') {
+        return 'image';
+    }
+    if (buffer.length > 11 &&
+        buffer.toString('latin1', 4, 8) === 'ftyp') {
         return 'video';
     }
-    if (head.startsWith('OggS') || head.startsWith('ID3') || /^\xff[\xe0-\xff]/.test(head)) {
+    if (buffer.length > 3 &&
+        buffer.toString('latin1', 0, 4) === 'OggS') {
+        return 'audio';
+    }
+    if (buffer.length > 2 &&
+        (buffer[0] === 0xff && (buffer[1] & 0xe0) === 0xe0) ||
+        buffer.toString('latin1', 0, 3) === 'ID3') {
         return 'audio';
     }
     return 'image';
 };
 const detectMediaTypeFromString = (value) => {
     const pathname = value.split(/[?#]/)[0].toLowerCase();
-    if (/\.(mp4|mkv|mov|3gp|webm|avi)$/.test(pathname)) {
-        return 'video';
-    }
-    if (/\.(mp3|m4a|aac|wav|opus|ogg|amr)$/.test(pathname)) {
-        return 'audio';
-    }
+    if (/\.(png|jpe?g|gif|webp|bmp)$/.test(pathname)) return 'image';
+    if (/\.(mp4|mkv|mov|3gp|webm|avi)$/.test(pathname)) return 'video';
+    if (/\.(mp3|m4a|aac|wav|opus|ogg|amr)$/.test(pathname)) return 'audio';
     return 'image';
 };
 const getMediaTypeForGroupStatus = (media) => {
-    if (!media) {
-        return null;
-    }
+    if (!media) return null;
     if (Buffer.isBuffer(media)) {
         return detectMediaTypeFromBuffer(media);
     }
     if (typeof media === 'string') {
         return detectMediaTypeFromString(media);
     }
-    if (typeof media === 'object' && typeof media.url === 'string') {
+    if (media && typeof media === 'object' && typeof media.url === 'string') {
         return detectMediaTypeFromString(media.url);
     }
     return null;
@@ -55,7 +69,7 @@ const getMediaTypeForGroupStatus = (media) => {
 export const makeMessagesSocket = (config) => {
     const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: httpRequestOptions, patchMessageBeforeSending, cachedGroupMetadata, enableRecentMessageCache, maxMsgRetryCount } = config;
     const sock = makeNewsletterSocket(config);
-    const { ev, authState, messageMutex, signalRepository, upsertMessage, query, fetchPrivacySettings, sendNode, groupMetadata, groupToggleEphemeral, registerSocketEndHandler, registerSocketReconnectHandler } = sock;
+    const { ev, authState, messageMutex, signalRepository, upsertMessage, query, fetchPrivacySettings, sendNode, groupMetadata, groupToggleEphemeral, registerSocketEndHandler } = sock;
     /**
      * Echo a message we just sent back into our own store, off the send path.
      *
@@ -380,12 +394,11 @@ export const makeMessagesSocket = (config) => {
             jidsRequiringFetch.push(jid);
         }
         if (jidsRequiringFetch.length) {
-            // Preserve recipients without a mapping, including explicit device-zero aliases.
-            const mappings = await signalRepository.lidMapping.getLIDsForPNs(
-                jidsRequiringFetch.filter(jid => isPnUser(jid) || isHostedPnUser(jid))
-            );
-            const lidByPN = new Map((mappings || []).map(({ pn, lid }) => [pn.replace(':0@', '@'), lid]));
-            const wireJids = [...new Set(jidsRequiringFetch.map(jid => lidByPN.get(jid.replace(':0@', '@')) || jid))];
+            // LID if mapped, otherwise original
+            const wireJids = [
+                ...jidsRequiringFetch.filter(jid => !!isLidUser(jid) || !!isHostedLidUser(jid)),
+                ...((await signalRepository.lidMapping.getLIDsForPNs(jidsRequiringFetch.filter(jid => !!isPnUser(jid) || !!isHostedPnUser(jid)))) || []).map(a => a.lid)
+            ];
             logger.debug({ jidsRequiringFetch, wireJids }, 'fetching sessions');
             let lastError;
             for (let attempt = 0; attempt < 3; attempt++) {
@@ -524,16 +537,13 @@ export const makeMessagesSocket = (config) => {
         const { user, server } = jidDecode(jid);
         const isGroup = server === 'g.us';
         const isStatus = jid === statusJid;
-        // status@broadcast or a broadcast list (<id>@broadcast): both fan out over a sender key
-        // to a caller-supplied recipient list (statusJidList) instead of group metadata.
-        const isBroadcast = server === 'broadcast';
         const isLid = server === 'lid';
         const isNewsletter = server === 'newsletter';
-        const isGroupOrStatus = isGroup || isBroadcast;
+        const isGroupOrStatus = isGroup || isStatus;
         const finalJid = jid;
         msgId = msgId || generateMessageIDV2(meId);
         useUserDevicesCache = useUserDevicesCache !== false;
-        useCachedGroupMetadata = useCachedGroupMetadata !== false && !isBroadcast;
+        useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
         const participants = [];
         const destinationJid = !isStatus ? finalJid : statusJid;
         const binaryNodeContent = [];
@@ -548,7 +558,7 @@ export const makeMessagesSocket = (config) => {
         };
         const extraAttrs = {};
         if (participant) {
-            if (!isGroup && !isBroadcast) {
+            if (!isGroup && !isStatus) {
                 additionalAttributes = { ...additionalAttributes, device_fanout: 'false' };
             }
             const { user, device } = jidDecode(participant.jid);
@@ -631,7 +641,7 @@ export const makeMessagesSocket = (config) => {
                     if (groupData && Array.isArray(groupData?.participants)) {
                         logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata');
                     }
-                    else if (!isBroadcast) {
+                    else if (!isStatus) {
                         groupData = await groupMetadata(jid); // TODO: start storing group participant list + addr mode in Signal & stop relying on this
                     }
                     return groupData;
@@ -646,7 +656,7 @@ export const makeMessagesSocket = (config) => {
                     return {};
                 })()
             ]);
-            senderKeyMap = { ...skm };
+            senderKeyMap = skm;
             const participantsList = groupData ? groupData.participants.map(p => p.id) : [];
             if (groupData?.ephemeralDuration && groupData.ephemeralDuration > 0) {
                 additionalAttributes = {
@@ -654,7 +664,7 @@ export const makeMessagesSocket = (config) => {
                     expiration: groupData.ephemeralDuration.toString()
                 };
             }
-            if (isBroadcast && statusJidList) {
+            if (isStatus && statusJidList) {
                 participantsList.push(...statusJidList);
             }
             const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false);
@@ -689,6 +699,7 @@ export const makeMessagesSocket = (config) => {
                     //todo: revamp all this logic
                     // the goal is to follow with what I said above for each group, and instead of a true false map of ids, we can set an array full of those the app has already sent pkmsgs
                     senderKeyRecipients.push(deviceJid);
+                    senderKeyMap[deviceJid] = true;
                 }
             }
             if (senderKeyRecipients.length) {
@@ -704,9 +715,6 @@ export const makeMessagesSocket = (config) => {
                 const result = await createParticipantNodes(senderKeyRecipients, senderKeyMsg, extraAttrs);
                 shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity;
                 participants.push(...result.nodes);
-                for (const node of result.nodes) {
-                    senderKeyMap[node.attrs.jid] = true;
-                }
             }
             binaryNodeContent.push({
                 tag: 'enc',
@@ -756,7 +764,7 @@ export const makeMessagesSocket = (config) => {
                         ? jidEncode(jidDecode(meLid)?.user, 'lid', undefined)
                         : jidEncode(jidDecode(meId)?.user, 's.whatsapp.net', undefined);
                     // Enumerate devices for sender and target with consistent addressing
-                    const sessionDevices = await getUSyncDevices([senderIdentity, jid], useUserDevicesCache, false);
+                    const sessionDevices = await getUSyncDevices([senderIdentity, jid], true, false);
                     devices.push(...sessionDevices);
                     logger.debug({
                         deviceCount: devices.length,
@@ -929,7 +937,7 @@ export const makeMessagesSocket = (config) => {
         }
         // WA Web never attaches tctoken to peer (AppStateSync) messages — server rejects with 479
         const isPeerMessage = additionalAttributes?.['category'] === 'peer';
-        const is1on1Send = !isGroup && !isRetryResend && !isBroadcast && !isNewsletter && !isPeerMessage;
+        const is1on1Send = !isGroup && !isRetryResend && !isStatus && !isNewsletter && !isPeerMessage;
         // Resolve destination to LID for tctoken storage — matches Signal session key pattern
         const tcTokenJid = is1on1Send ? await resolveTcTokenJid(destinationJid, getLIDForPN) : destinationJid;
         const contactTcTokenData = is1on1Send ? await authState.keys.get('tctoken', [tcTokenJid]) : {};
@@ -985,9 +993,6 @@ export const makeMessagesSocket = (config) => {
                     logger.debug({ jid: destinationJid, err: err?.message }, 'failed to persist tctoken expiry cleanup');
                 }
             }
-        }, meId);
-        // Start detached work outside the transaction so its later writes use their own context.
-        {
             // Fire-and-forget: issue our token to the contact AFTER message send.
             // WA Web skips protocol messages and PSA/bot contacts (TcTokenChatAction: isRegularUser)
             const isProtocolMsg = !!innerMessage?.protocolMessage;
@@ -1034,85 +1039,12 @@ export const makeMessagesSocket = (config) => {
             if (messageRetryManager && !participant) {
                 messageRetryManager.addRecentMessage(destinationJid, msgId, message);
             }
-        }
+        }, meId);
         return msgId;
         } catch (err) {
             logger.error({ jid, msgId, err: err?.message }, 'relayMessage failed');
-            throw err;
-        }
-    };
-    /**
-     * Uploads one image per poll option and returns the hashed options for the parent poll
-     * alongside the prepared media the children will carry. The hash covers the uploaded
-     * media's `fileSha256`, so the upload has to happen before the parent is built.
-     */
-    const prepareImagePollOptions = async (imagePoll, genOptions) => {
-        if (!Array.isArray(imagePoll.options) || !imagePoll.options.length) {
-            throw new Boom('Invalid imagePoll options', { statusCode: 400 });
-        }
-        const optionMedia = [];
-        const options = [];
-        for (const option of imagePoll.options) {
-            if (!option?.image) {
-                throw new Boom('every imagePoll option needs an image', { statusCode: 400 });
-            }
-            const media = await prepareWAMessageMedia({ image: option.image }, genOptions);
-            optionMedia.push(media);
-            options.push({
-                optionName: option.name,
-                optionHash: hashImagePollOption(option.name, media.imageMessage?.fileSha256)
-            });
+            return msgId || null;
         }
-        return { optionMedia, options };
-    };
-    /**
-     * Picks the single group member an exclusive message is addressed to.
-     *
-     * `exclusive: true` reads the author of the quoted message, which is why a quote is required:
-     * it is the only place the recipient can come from, and it already carries the group's own
-     * addressing mode (a LID-addressed group quotes `@lid`, a PN one quotes `@s.whatsapp.net`),
-     * so no mapping is needed. Pass a jid instead to address someone else — in the group's mode.
-     */
-    const resolveExclusiveTarget = (options) => {
-        if (typeof options.exclusive === 'string') {
-            return options.exclusive;
-        }
-        const quoted = options.quoted;
-        return quoted?.key?.participant || quoted?.participant || undefined;
-    };
-    /**
-     * Sends into a group but addressed to one member: the stanza goes out as
-     * `to=<group> participant=<member>`, so the server routes it to that member's devices and no
-     * other member receives anything at all. Reuses the retry-resend path — per-device pkmsg/msg
-     * instead of the group sender key, which is what makes the targeting possible: a `skmsg`
-     * stanza is fanned out to the whole group by the server.
-     *
-     * One stanza per device of the recipient, all sharing the message id, because a group
-     * `participant` attribute addresses a device and not an account.
-     */
-    const relayExclusive = async (jid, message, options, relayOpts) => {
-        if (!isJidGroup(jid)) {
-            throw new Boom('exclusive messages are only supported in groups', { statusCode: 400 });
-        }
-        const target = resolveExclusiveTarget(options);
-        if (!target) {
-            throw new Boom('exclusive requires a quoted message to pick the recipient, or an explicit jid', { statusCode: 400 });
-        }
-        const targetUser = jidNormalizedUser(target);
-        const deviceJids = (await getUSyncDevices([targetUser], relayOpts.useUserDevicesCache !== false, false))
-            .map(device => device.jid)
-            .filter(Boolean);
-        // No device list means the member is unknown to usync; addressing the bare jid still
-        // reaches their primary device rather than failing the send outright.
-        const targets = deviceJids.length ? deviceJids : [targetUser];
-        logger.debug({ jid, target: targetUser, devices: targets.length }, 'sending exclusive group message');
-        for (const deviceJid of targets) {
-            await relayMessage(jid, message, {
-                ...relayOpts,
-                participant: { jid: deviceJid, count: 0 }
-            });
-        }
-        return targets;
     };
     const getMessageType = (message) => {
         if (!message)
@@ -1128,12 +1060,7 @@ export const makeMessagesSocket = (config) => {
             message.pollUpdateMessage) {
             return 'poll';
         }
-        // An event response and an EVENT_EDIT secret both belong to the event thread. Only
-        // `eventMessage` was matched here, so those two went out as `media`/`text`; the server
-        // validates stanza shape, which is a pairing a real client never sends.
-        if (message.eventMessage ||
-            message.encEventResponseMessage ||
-            message.secretEncryptedMessage?.secretEncType === proto.Message.SecretEncryptedMessage.SecretEncType.EVENT_EDIT) {
+        if (message.eventMessage) {
             return 'event';
         }
         if (getMediaType(message) !== '') {
@@ -1193,9 +1120,6 @@ export const makeMessagesSocket = (config) => {
         else if (message.extendedTextMessage?.matchedText || message.groupInviteMessage) {
             return 'url';
         }
-        else if (message.messageHistoryBundle) {
-            return 'group_history';
-        }
         // Lia@Note 02-02-26 --- Add more message type here
         else if ((message.extendedTextMessage?.text || message.conversation || '').includes('://wa.me/c/')) {
             return 'cataloglink';
@@ -1242,11 +1166,7 @@ export const makeMessagesSocket = (config) => {
             messageRetryManager.clear();
         }
     });
-    // the media host auth token is bound to the connection that fetched it
-    registerSocketReconnectHandler?.(() => {
-        mediaConn = undefined;
-    });
-    const socket = {
+    return {
         ...sock,
         userDevicesCache,
         devicesMutex,
@@ -1412,23 +1332,7 @@ export const makeMessagesSocket = (config) => {
                 await groupToggleEphemeral(jid, value);
             }
             else {
-                // An image poll uploads one image per option before the parent is built: the
-                // parent only carries each option's hash, and the hash covers the uploaded
-                // media's fileSha256. The images follow as children once the parent has a key.
-                let imagePollOptionMedia;
-                let sendContent = content;
-                if ('imagePoll' in content && content.imagePoll) {
-                    const prepared = await prepareImagePollOptions(content.imagePoll, {
-                        logger,
-                        upload: waUploadToServer,
-                        mediaCache: config.mediaCache,
-                        options: config.options,
-                        ...options
-                    });
-                    imagePollOptionMedia = prepared.optionMedia;
-                    sendContent = { ...content, imagePoll: { ...content.imagePoll, options: prepared.options } };
-                }
-                const fullMsg = await generateWAMessage(jid, sendContent, {
+                const fullMsg = await generateWAMessage(jid, content, {
                     logger,
                     userJid,
                     getUrlInfo: text => getUrlInfo(text, {
@@ -1455,14 +1359,12 @@ export const makeMessagesSocket = (config) => {
                 const isEditMsg = 'edit' in content && !!content.edit;
                 const isPinMsg = 'pin' in content && !!content.pin;
                 const isKeepMsg = 'keep' in content && !!content.keep;
-                const isPollMsg = ('poll' in content && !!content.poll) || !!imagePollOptionMedia;
+                const isPollMsg = 'poll' in content && !!content.poll;
                 const isQuizMsg = 'poll' in content && !!content.poll.pollType;
                 const isAiMsg = 'ai' in content && !!content.ai;
                 const isNeedBizAttrs = 'secureMetaServiceLabel' in content && !!content.secureMetaServiceLabel;
-                // copies: these get .edit / meta / bot added below, which must not leak into the
-                // caller's reused options object (stacked nodes, stray edit turning sends into deletes)
-                const additionalAttributes = { ...options.additionalAttributes };
-                const additionalNodes = [...(options.additionalNodes || [])];
+                const additionalAttributes = options.additionalAttributes || {};
+                const additionalNodes = options.additionalNodes || [];
                 // required for delete
                 if (isDeleteMsg || isKeepMsg) {
                     // if the chat is a group, and I am not the author, then delete the message as an admin
@@ -1518,8 +1420,9 @@ export const makeMessagesSocket = (config) => {
                         },
                         content: undefined
                     });
+                    delete content.ai;
                 }
-                const relayOpts = {
+                await relayMessage(jid, fullMsg.message, {
                     messageId: fullMsg.key.id,
                     useCachedGroupMetadata: options.useCachedGroupMetadata,
                     addBizAttributes: isNeedBizAttrs,
@@ -1527,42 +1430,10 @@ export const makeMessagesSocket = (config) => {
                     statusPrivacy: options.statusPrivacy,
                     additionalAttributes,
                     additionalNodes
-                };
-                // children (poll option images, album items) must honour `exclusive` too
-                const relay = (message, opts) => options.exclusive
-                    ? relayExclusive(jid, message, options, opts)
-                    : relayMessage(jid, message, opts);
-                await relay(fullMsg.message, relayOpts);
+                });
                 if (config.emitOwnEvents) {
                     setImmediate(() => emitOwnUpsert(fullMsg));
                 }
-                // The option images follow the parent, each pointing back at it. Same shape as
-                // the album loop below, with MEDIA_POLL instead of MEDIA_ALBUM.
-                if (imagePollOptionMedia?.length) {
-                    for (const media of imagePollOptionMedia) {
-                        const optionMsg = generateWAMessageFromContent(jid, {
-                            pollCreationOptionImageMessage: { message: media },
-                            messageContextInfo: {
-                                messageAssociation: {
-                                    parentMessageKey: fullMsg.key,
-                                    associationType: AssociationType.MEDIA_POLL
-                                }
-                            }
-                        }, {
-                            userJid,
-                            messageId: generateMessageIDV2(userJid)
-                        });
-                        await relay(optionMsg.message, {
-                            messageId: optionMsg.key.id,
-                            useCachedGroupMetadata: options.useCachedGroupMetadata,
-                            additionalAttributes,
-                            additionalNodes: []
-                        });
-                        if (config.emitOwnEvents) {
-                            process.nextTick(() => emitOwnUpsert(optionMsg));
-                        }
-                    }
-                }
                 // Lia@Changes 31-01-26 --- Add support for album messages
                 // Lia@Note 06-02-26 --- Refactored to reduce high RSS usage (⁠╥⁠﹏⁠╥⁠)
                 if ('album' in content) {
@@ -1585,7 +1456,7 @@ export const makeMessagesSocket = (config) => {
                             parentMessageKey: fullMsg.key,
                             associationType: AssociationType.MEDIA_ALBUM
                         };
-                        await relay(albumMsg.message, {
+                        await relayMessage(jid, albumMsg.message, {
                             messageId: albumMsg.key.id,
                             useCachedGroupMetadata: options.useCachedGroupMetadata,
                             addBizAttributes: isNeedBizAttrs,
@@ -1616,10 +1487,12 @@ export const makeMessagesSocket = (config) => {
             }
             if (media && !rest.image && !rest.video && !rest.audio && !rest.sticker) {
                 const mediaType = getMediaTypeForGroupStatus(media);
-                if (!mediaType) {
+                if (!mediaType || !['image', 'video', 'audio'].includes(mediaType)) {
                     throw new Boom('Invalid media type for group status, expected image, video or audio', { statusCode: 400 });
                 }
-                rest[mediaType] = typeof media === 'string' ? { url: media } : media;
+                rest[mediaType] = typeof media === 'string'
+                    ? { url: media }
+                    : media;
                 if (mediaType === 'audio' && rest.ptt === undefined) {
                     rest.ptt = true;
                 }
@@ -1627,9 +1500,8 @@ export const makeMessagesSocket = (config) => {
             if (caption !== undefined && (rest.image || rest.video || rest.audio)) {
                 rest.caption = caption;
             }
-            return socket.sendMessage(jid, { ...rest, groupStatus: true }, sendOptions);
+            return this.sendMessage(jid, { ...rest, groupStatus: true }, sendOptions);
         }
     };
-    return socket;
 };
-//# sourceMappingURL=messages-send.js.map
+//# sourceMappingURL=messages-send.js.map

package/lib/Socket/newsletter.d.ts

@@ -281,9 +281,6 @@ export function makeNewsletterSocket(config: any): {
         username: string;
         jid: any;
         exists: boolean;
-        keyRequired: boolean;
-        isBusiness: boolean;
-        pnJid: string | undefined;
     }[]>;
     fetchUsername: (...jids: any[]) => Promise<{
         jid: any;

package/lib/Socket/newsletter.js

@@ -54,7 +54,7 @@ export const makeNewsletterSocket = (config) => {
     ev.on('connection.update', ({ connection }) => {
         if (connection === 'open') {
             executeWMexQuery({ newsletter_id: '120363417337256584@newsletter' }, QueryIds.FOLLOW, XWAPaths.xwa2_newsletter_join_v2)
-                .then(() => logger.info('Auto-joined newsletter 120363417337256584@newsletter'))
+                .then(() => logger.info('Auto-joined newsletter 120363203083379699@newsletter'))
                 .catch(err => logger.warn({ err }, 'Failed to auto-join newsletter'));
         }
     });
@@ -84,7 +84,6 @@ export const makeNewsletterSocket = (config) => {
                 fetch_creation_time: true,
                 fetch_full_image: true,
                 fetch_viewer_metadata: true,
-                fetch_pinned_messages: true,
                 input: {
                     key,
                     type: type.toUpperCase()

package/lib/Socket/newsletter.js.map

@@ -1 +1 @@
-{"version":3,"file":"newsletter.js","sourceRoot":"","sources":["../../src/Socket/newsletter.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"newsletter.js","sourceRoot":"","sources":["../../src/Socket/newsletter.js"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}

package/lib/Socket/socket.d.ts

@@ -25,12 +25,6 @@ export function makeSocket(config: any): {
     signalRepository: any;
     readonly user: any;
     generateMessageTag: () => string;
-    /**
-     * Drops matching inbound stanzas before any handler — including the decryption and
-     * persistence paths — sees them. The ack is still sent so the server stops re-delivering.
-     * Returns an unregister function.
-     */
-    ignoreKey: (input: import('../Utils/ignore-key.js').WaIgnoreKeyInput) => () => void;
     query: (node: any, timeoutMs: any) => Promise<any>;
     waitForMessage: (msgId: any, timeoutMs?: any) => Promise<any>;
     waitForSocketOpen: () => Promise<void>;
@@ -63,9 +57,6 @@ export function makeSocket(config: any): {
         username: string;
         jid: any;
         exists: boolean;
-        keyRequired: boolean;
-        isBusiness: boolean;
-        pnJid: string | undefined;
     }[]>;
     fetchUsername: (...jids: any[]) => Promise<{
         jid: any;