@queenanya/baileys 7.4.10 → 7.4.13

package/lib/Types/Message.d.ts

@@ -1,14 +1,13 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
 import { AxiosRequestConfig } from 'axios';
 import type { Logger } from 'pino';
 import type { Readable } from 'stream';
 import type { URL } from 'url';
+import { BinaryNode } from '../WABinary';
 import { proto } from '../../WAProto';
 import { MEDIA_HKDF_KEY_MAPPING } from '../Defaults';
-import { BinaryNode } from '../WABinary';
 import type { GroupMetadata } from './GroupMetadata';
 import { CacheStore } from './Socket';
 export { proto as WAProto };
@@ -16,22 +15,18 @@ export type WAMessage = proto.IWebMessageInfo;
 export type WAMessageContent = proto.IMessage;
 export type WAContactMessage = proto.Message.IContactMessage;
 export type WAContactsArrayMessage = proto.Message.IContactsArrayMessage;
-export type WAMessageKey = proto.IMessageKey & {
-    server_id?: string;
-};
+export type WAMessageKey = proto.IMessageKey;
 export type WATextMessage = proto.Message.IExtendedTextMessage;
 export type WAContextInfo = proto.IContextInfo;
 export type WALocationMessage = proto.Message.ILocationMessage;
 export type WAGenericMediaMessage = proto.Message.IVideoMessage | proto.Message.IImageMessage | proto.Message.IAudioMessage | proto.Message.IDocumentMessage | proto.Message.IStickerMessage;
 export import WAMessageStubType = proto.WebMessageInfo.StubType;
 export import WAMessageStatus = proto.WebMessageInfo.Status;
-export type WAMediaPayloadURL = {
+export type WAMediaUpload = Buffer | {
     url: URL | string;
-};
-export type WAMediaPayloadStream = {
+} | {
     stream: Readable;
 };
-export type WAMediaUpload = Buffer | WAMediaPayloadStream | WAMediaPayloadURL;
 /** Set of message types that are supported by the library */
 export type MessageType = keyof proto.Message;
 export type DownloadableMessage = {
@@ -69,9 +64,26 @@ type Contextable = {
 type ViewOnce = {
     viewOnce?: boolean;
 };
+type Buttonable = {
+    /** add buttons to the message  */
+    buttons?: proto.Message.ButtonsMessage.IButton[];
+};
+type Templatable = {
+    /** add buttons to the message (conflicts with normal buttons)*/
+    templateButtons?: proto.IHydratedTemplateButton[];
+    footer?: string;
+};
 type Editable = {
     edit?: WAMessageKey;
 };
+type Listable = {
+    /** Sections of the List */
+    sections?: proto.Message.ListMessage.ISection[];
+    /** Title of a List Message only */
+    title?: string;
+    /** Text of the bnutton on the list (required) */
+    buttonText?: string;
+};
 type WithDimensions = {
     width?: number;
     height?: number;
@@ -82,7 +94,6 @@ export type PollMessageOptions = {
     values: string[];
     /** 32 byte message secret to encrypt poll selections */
     messageSecret?: Uint8Array;
-    toAnnouncementGroup?: boolean;
 };
 type SharePhoneNumber = {
     sharePhoneNumber: boolean;
@@ -95,14 +106,14 @@ export type AnyMediaMessageContent = (({
     image: WAMediaUpload;
     caption?: string;
     jpegThumbnail?: string;
-} & Mentionable & Contextable & WithDimensions) | ({
+} & Mentionable & Contextable & Buttonable & Templatable & WithDimensions) | ({
     video: WAMediaUpload;
     caption?: string;
     gifPlayback?: boolean;
     jpegThumbnail?: string;
     /** if set to true, will send as a `video note` */
     ptv?: boolean;
-} & Mentionable & Contextable & WithDimensions) | {
+} & Mentionable & Contextable & Buttonable & Templatable & WithDimensions) | {
     audio: WAMediaUpload;
     /** if set to true, will send as a `voice note` */
     ptt?: boolean;
@@ -116,7 +127,7 @@ export type AnyMediaMessageContent = (({
     mimetype: string;
     fileName?: string;
     caption?: string;
-} & Contextable)) & {
+} & Contextable & Buttonable & Templatable)) & {
     mimetype?: string;
 } & Editable;
 export type ButtonReplyInfo = {
@@ -124,22 +135,15 @@ export type ButtonReplyInfo = {
     id: string;
     index: number;
 };
-export type GroupInviteInfo = {
-    inviteCode: string;
-    inviteExpiration: number;
-    text: string;
-    jid: string;
-    subject: string;
-};
 export type WASendableProduct = Omit<proto.Message.ProductMessage.IProductSnapshot, 'productImage'> & {
     productImage: WAMediaUpload;
 };
 export type AnyRegularMessageContent = (({
     text: string;
     linkPreview?: WAUrlInfo | null;
-} & Mentionable & Contextable & Editable) | AnyMediaMessageContent | ({
+} & Mentionable & Contextable & Buttonable & Templatable & Listable & Editable) | AnyMediaMessageContent | ({
     poll: PollMessageOptions;
-} & Mentionable & Contextable & Editable) | {
+} & Mentionable & Contextable & Buttonable & Templatable & Editable) | {
     contacts: {
         displayName?: string;
         contacts: proto.Message.IContactMessage[];
@@ -151,19 +155,8 @@ export type AnyRegularMessageContent = (({
 } | {
     buttonReply: ButtonReplyInfo;
     type: 'template' | 'plain';
-} | {
-    groupInvite: GroupInviteInfo;
 } | {
     listReply: Omit<proto.Message.IListResponseMessage, 'contextInfo'>;
-} | {
-    pin: WAMessageKey;
-    type: proto.PinInChat.Type;
-    /**
-     * 24 hours, 7 days, 30 days
-     */
-    time?: 86400 | 604800 | 2592000;
-} | {
-    unpin: WAMessageKey;
 } | {
     product: WASendableProduct;
     businessOwnerJid?: string;
@@ -183,8 +176,8 @@ export type GroupMetadataParticipants = Pick<GroupMetadata, 'participants'>;
 type MinimalRelayOptions = {
     /** override the message ID with a custom provided string */
     messageId?: string;
-    /** should we use group metadata cache, or fetch afresh from the server; default assumed to be "true" */
-    useCachedGroupMetadata?: boolean;
+    /** cached group metadata, use to prevent redundant requests to WA & speed up msg sending */
+    cachedGroupMetadata?: (jid: string) => Promise<GroupMetadataParticipants | undefined>;
 };
 export type MessageRelayOptions = MinimalRelayOptions & {
     /** only send to a specific participant; used when a message decryption fails for a single user */
@@ -207,6 +200,7 @@ export type MiscMessageGenerationOptions = MinimalRelayOptions & {
     timestamp?: Date;
     /** the message you want to quote */
     quoted?: WAMessage;
+    additionalNodes?: BinaryNode[];
     /** disappearing messages settings */
     ephemeralExpiration?: number | string;
     /** timeout for media upload to WA server */
@@ -243,13 +237,12 @@ export type MediaGenerationOptions = {
     mediaUploadTimeoutMs?: number;
     options?: AxiosRequestConfig;
     backgroundColor?: string;
+    font?: number;
     /** The message is for newsletter? */
     newsletter?: boolean;
-    font?: number;
 };
 export type MessageContentGenerationOptions = MediaGenerationOptions & {
     getUrlInfo?: (text: string) => Promise<WAUrlInfo | undefined>;
-    getProfilePicUrl?: (jid: string, type: 'image' | 'preview') => Promise<string | undefined>;
 };
 export type MessageGenerationOptions = MessageContentGenerationOptions & MessageGenerationOptionsFromContent;
 /**

package/lib/Types/Newsletter.d.ts

@@ -77,3 +77,16 @@ export declare enum XWAPaths {
     NEWSLETTER = "xwa2_newsletter",
     METADATA_UPDATE = "xwa2_notify_newsletter_on_metadata_update"
 }
+export declare enum QueryIds {
+    JOB_MUTATION = "7150902998257522",
+    METADATA = "6620195908089573",
+    UNFOLLOW = "7238632346214362",
+    FOLLOW = "7871414976211147",
+    UNMUTE = "7337137176362961",
+    MUTE = "25151904754424642",
+    CREATE = "6996806640408138",
+    ADMIN_COUNT = "7130823597031706",
+    CHANGE_OWNER = "7341777602580933",
+    DELETE = "8316537688363079",
+    DEMOTE = "6551828931592903"
+}

package/lib/Types/Newsletter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.XWAPaths = exports.MexOperations = void 0;
+exports.QueryIds = exports.XWAPaths = exports.MexOperations = void 0;
 var MexOperations;
 (function (MexOperations) {
     MexOperations["PROMOTE"] = "NotificationNewsletterAdminPromote";
@@ -16,3 +16,17 @@ var XWAPaths;
     XWAPaths["NEWSLETTER"] = "xwa2_newsletter";
     XWAPaths["METADATA_UPDATE"] = "xwa2_notify_newsletter_on_metadata_update";
 })(XWAPaths = exports.XWAPaths || (exports.XWAPaths = {}));
+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 = exports.QueryIds || (exports.QueryIds = {}));

package/lib/Types/Socket.d.ts

@@ -6,7 +6,6 @@ import type { Logger } from 'pino';
 import type { URL } from 'url';
 import { proto } from '../../WAProto';
 import { AuthenticationState, SignalAuthState, TransactionCapabilityOptions } from './Auth';
-import { GroupMetadata } from './GroupMetadata';
 import { MediaConnInfo } from './Message';
 import { SignalRepository } from './Signal';
 export type WAVersion = [number, number, number];
@@ -30,9 +29,7 @@ export type SocketConfig = {
     defaultQueryTimeoutMs: number | undefined;
     /** ping-pong interval for WS connection */
     keepAliveIntervalMs: number;
-    /** should baileys use the mobile api instead of the multi device api
-     * @deprecated This feature has been removed
-    */
+    /** should baileys use the mobile api instead of the multi device api */
     mobile?: boolean;
     /** proxy agent */
     agent?: Agent;
@@ -74,14 +71,10 @@ export type SocketConfig = {
     userDevicesCache?: CacheStore;
     /** cache to store call offers */
     callOfferCache?: CacheStore;
-    /** cache to track placeholder resends */
-    placeholderResendCache?: CacheStore;
     /** width for link preview images */
     linkPreviewImageThumbnailWidth: number;
     /** Should Baileys ask the phone for full history, will be received async */
     syncFullHistory: boolean;
-    /** Ignore Message when offline, default is false */
-    ignoreMsgLoading: boolean;
     /** Should baileys fire init queries automatically, default true */
     fireInitQueries: boolean;
     /**
@@ -112,7 +105,7 @@ export type SocketConfig = {
      * (solves the "this message can take a while" issue) can be retried
      * */
     getMessage: (key: proto.IMessageKey) => Promise<proto.IMessage | undefined>;
-    /** cached group metadata, use to prevent redundant requests to WA & speed up msg sending */
-    cachedGroupMetadata: (jid: string) => Promise<GroupMetadata | undefined>;
     makeSignalRepository: (auth: SignalAuthState) => SignalRepository;
+    /** Socket passthrough */
+    socket?: any;
 };

package/lib/Types/index.d.ts

@@ -15,14 +15,6 @@ import { SocketConfig } from './Socket';
 export type UserFacingSocketConfig = Partial<SocketConfig> & {
     auth: AuthenticationState;
 };
-/** Other Browser Support for Paircode */
-export type BrowsersMap = {
-    ubuntu(browser: string): [string, string, string];
-    macOS(browser: string): [string, string, string];
-    baileys(browser: string): [string, string, string];
-    windows(browser: string): [string, string, string];
-    appropriate(browser: string): [string, string, string];
-};
 export declare enum DisconnectReason {
     connectionClosed = 428,
     connectionLost = 408,

package/lib/Utils/auth-utils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initAuthCreds = exports.addTransactionCapability = exports.makeCacheableSignalKeyStore = void 0;
 const crypto_1 = require("crypto");
 const node_cache_1 = __importDefault(require("node-cache"));
+const uuid_1 = require("uuid");
 const Defaults_1 = require("../Defaults");
 const crypto_2 = require("./crypto");
 const generics_1 = require("./generics");
@@ -142,7 +143,6 @@ const addTransactionCapability = (state, logger, { maxCommitRetries, delayBetwee
                         let tries = maxCommitRetries;
                         while (tries) {
                             tries -= 1;
-                            //eslint-disable-next-line max-depth
                             try {
                                 await state.set(mutations);
                                 logger.trace({ dbQueriesInTransaction }, 'committed transaction');
@@ -191,7 +191,13 @@ const initAuthCreds = () => {
         accountSettings: {
             unarchiveChats: false
         },
+        // mobile creds
+        deviceId: Buffer.from((0, uuid_1.v4)().replace(/-/g, ''), 'hex').toString('base64url'),
+        phoneId: (0, uuid_1.v4)(),
+        identityId: (0, crypto_1.randomBytes)(20),
         registered: false,
+        backupToken: (0, crypto_1.randomBytes)(20),
+        registration: {},
         pairingCode: undefined,
         lastPropHash: undefined,
         routingInfo: undefined,

package/lib/Utils/chat-utils.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { AxiosRequestConfig } from 'axios';
 import type { Logger } from 'pino';
 import { proto } from '../../WAProto';
@@ -30,7 +29,7 @@ export declare const decodeSyncdPatch: (msg: proto.ISyncdPatch, name: WAPatchNam
         };
     };
 }>;
-export declare const extractSyncdPatches: (result: BinaryNode, options: AxiosRequestConfig<{}>) => Promise<{
+export declare const extractSyncdPatches: (result: BinaryNode, options: AxiosRequestConfig<any>) => Promise<{
     critical_block: {
         patches: proto.ISyncdPatch[];
         hasMorePatches: boolean;
@@ -57,13 +56,13 @@ export declare const extractSyncdPatches: (result: BinaryNode, options: AxiosReq
         snapshot?: proto.ISyncdSnapshot | undefined;
     };
 }>;
-export declare const downloadExternalBlob: (blob: proto.IExternalBlobReference, options: AxiosRequestConfig<{}>) => Promise<Buffer>;
-export declare const downloadExternalPatch: (blob: proto.IExternalBlobReference, options: AxiosRequestConfig<{}>) => Promise<proto.SyncdMutations>;
+export declare const downloadExternalBlob: (blob: proto.IExternalBlobReference, options: AxiosRequestConfig<any>) => Promise<Buffer>;
+export declare const downloadExternalPatch: (blob: proto.IExternalBlobReference, options: AxiosRequestConfig<any>) => Promise<proto.SyncdMutations>;
 export declare const decodeSyncdSnapshot: (name: WAPatchName, snapshot: proto.ISyncdSnapshot, getAppStateSyncKey: FetchAppStateSyncKey, minimumVersionNumber: number | undefined, validateMacs?: boolean) => Promise<{
     state: LTHashState;
     mutationMap: ChatMutationMap;
 }>;
-export declare const decodePatches: (name: WAPatchName, syncds: proto.ISyncdPatch[], initial: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, options: AxiosRequestConfig<{}>, minimumVersionNumber?: number, logger?: Logger, validateMacs?: boolean) => Promise<{
+export declare const decodePatches: (name: WAPatchName, syncds: proto.ISyncdPatch[], initial: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, options: AxiosRequestConfig<any>, minimumVersionNumber?: number, logger?: Logger, validateMacs?: boolean) => Promise<{
     state: LTHashState;
     mutationMap: ChatMutationMap;
 }>;

package/lib/Utils/chat-utils.js

@@ -305,7 +305,8 @@ const decodePatches = async (name, syncds, initial, getAppStateSyncKey, options,
         indexValueMap: { ...initial.indexValueMap }
     };
     const mutationMap = {};
-    for (const syncd of syncds) {
+    for (let i = 0; i < syncds.length; i++) {
+        const syncd = syncds[i];
         const { version, keyId, snapshotMac } = syncd;
         if (syncd.externalMutations) {
             logger === null || logger === void 0 ? void 0 : logger.trace({ name, version }, 'downloading external patch');
@@ -417,31 +418,25 @@ const chatModificationToAppPatch = (mod, jid) => {
             operation: OP.SET
         };
     }
-    else if ('deleteForMe' in mod) {
-        const { timestamp, key, deleteMedia } = mod.deleteForMe;
-        patch = {
-            syncAction: {
-                deleteMessageForMeAction: {
-                    deleteMedia,
-                    messageTimestamp: timestamp
-                }
-            },
-            index: ['deleteMessageForMe', jid, key.id, key.fromMe ? '1' : '0', '0'],
-            type: 'regular_high',
-            apiVersion: 3,
-            operation: OP.SET
-        };
-    }
     else if ('clear' in mod) {
-        patch = {
-            syncAction: {
-                clearChatAction: {} // add message range later
-            },
-            index: ['clearChat', jid, '1' /*the option here is 0 when keep starred messages is enabled*/, '0'],
-            type: 'regular_high',
-            apiVersion: 6,
-            operation: OP.SET
-        };
+        if (mod.clear === 'all') {
+            throw new boom_1.Boom('not supported');
+        }
+        else {
+            const key = mod.clear.messages[0];
+            patch = {
+                syncAction: {
+                    deleteMessageForMeAction: {
+                        deleteMedia: false,
+                        messageTimestamp: key.timestamp
+                    }
+                },
+                index: ['deleteMessageForMe', jid, key.id, key.fromMe ? '1' : '0', '0'],
+                type: 'regular_high',
+                apiVersion: 3,
+                operation: OP.SET
+            };
+        }
     }
     else if ('pin' in mod) {
         patch = {
@@ -456,17 +451,6 @@ const chatModificationToAppPatch = (mod, jid) => {
             operation: OP.SET
         };
     }
-    else if ('contact' in mod) {
-        patch = {
-            syncAction: {
-                contactAction: mod.contact || {}
-            },
-            index: ['contact', jid],
-            type: 'critical_unblock_low',
-            apiVersion: 2,
-            operation: mod.contact ? OP.SET : OP.REMOVE
-        };
-    }
     else if ('star' in mod) {
         const key = mod.star.messages[0];
         patch = {
@@ -507,22 +491,6 @@ const chatModificationToAppPatch = (mod, jid) => {
             operation: OP.SET,
         };
     }
-    else if ('addLabel' in mod) {
-        patch = {
-            syncAction: {
-                labelEditAction: {
-                    name: mod.addLabel.name,
-                    color: mod.addLabel.color,
-                    predefinedId: mod.addLabel.predefinedId,
-                    deleted: mod.addLabel.deleted
-                }
-            },
-            index: ['label_edit', mod.addLabel.id],
-            type: 'regular',
-            apiVersion: 3,
-            operation: OP.SET,
-        };
-    }
     else if ('addChatLabel' in mod) {
         patch = {
             syncAction: {

package/lib/Utils/crypto.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { KeyPair } from '../Types';
 /** prefix version byte to the pub keys, required for some curve crypto functions */
 export declare const generateSignalPubKey: (pubKey: Uint8Array | Buffer) => Uint8Array | Buffer;
@@ -39,4 +38,4 @@ export declare function hkdf(buffer: Uint8Array | Buffer, expandedLength: number
     salt?: Buffer;
     info?: string;
 }): Buffer;
-export declare function derivePairingCodeKey(pairingCode: string, salt: Buffer): Promise<Buffer>;
+export declare function derivePairingCodeKey(pairingCode: string, salt: Buffer): Buffer;

package/lib/Utils/crypto.js

@@ -30,9 +30,7 @@ exports.derivePairingCodeKey = exports.hkdf = exports.md5 = exports.sha256 = exp
 const crypto_1 = require("crypto");
 const futoin_hkdf_1 = __importDefault(require("futoin-hkdf"));
 const libsignal = __importStar(require("libsignal"));
-const util_1 = require("util");
 const Defaults_1 = require("../Defaults");
-const pbkdf2Promise = (0, util_1.promisify)(crypto_1.pbkdf2);
 /** prefix version byte to the pub keys, required for some curve crypto functions */
 const generateSignalPubKey = (pubKey) => (pubKey.length === 33
     ? pubKey
@@ -147,7 +145,7 @@ function hkdf(buffer, expandedLength, info) {
     return (0, futoin_hkdf_1.default)(!Buffer.isBuffer(buffer) ? Buffer.from(buffer) : buffer, expandedLength, info);
 }
 exports.hkdf = hkdf;
-async function derivePairingCodeKey(pairingCode, salt) {
-    return await pbkdf2Promise(pairingCode, salt, 2 << 16, 32, 'sha256');
+function derivePairingCodeKey(pairingCode, salt) {
+    return (0, crypto_1.pbkdf2Sync)(pairingCode, salt, 2 << 16, 32, 'sha256');
 }
 exports.derivePairingCodeKey = derivePairingCodeKey;

package/lib/Utils/decode-wa-message.d.ts

@@ -2,7 +2,6 @@ import { Logger } from 'pino';
 import { proto } from '../../WAProto';
 import { SignalRepository } from '../Types';
 import { BinaryNode } from '../WABinary';
-export declare const NO_MESSAGE_FOUND_ERROR_TEXT = "Message absent from node";
 /**
  * Decode the received node as a message.
  * @note this will only parse the message, not decrypt it

package/lib/Utils/decode-wa-message.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decryptMessageNode = exports.decodeMessageNode = exports.NO_MESSAGE_FOUND_ERROR_TEXT = void 0;
+exports.decryptMessageNode = exports.decodeMessageNode = void 0;
 const boom_1 = require("@hapi/boom");
 const WAProto_1 = require("../../WAProto");
 const WABinary_1 = require("../WABinary");
 const generics_1 = require("./generics");
-exports.NO_MESSAGE_FOUND_ERROR_TEXT = 'Message absent from node';
+const NO_MESSAGE_FOUND_ERROR_TEXT = 'Message absent from node';
 /**
  * Decode the received node as a message.
  * @note this will only parse the message, not decrypt it
  */
 function decodeMessageNode(stanza, meId, meLid) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     let msgType;
     let chatId;
     let author;
@@ -55,11 +55,6 @@ function decodeMessageNode(stanza, meId, meLid) {
         author = participant;
         chatId = from;
     }
-    else if ((0, WABinary_1.isJidNewsletter)(from)) {
-        msgType = 'newsletter';
-        author = from;
-        chatId = from;
-    }
     else if ((0, WABinary_1.isJidBroadcast)(from)) {
         if (!participant) {
             throw new boom_1.Boom('No participant in group message');
@@ -74,7 +69,7 @@ function decodeMessageNode(stanza, meId, meLid) {
         chatId = from;
         author = participant;
     }
-    else if ((0, WABinary_1.isJidNewsletter)(from)) {
+    else if ((0, WABinary_1.isJidNewsLetter)(from)) {
         msgType = 'newsletter';
         author = from;
         chatId = from;
@@ -82,14 +77,13 @@ function decodeMessageNode(stanza, meId, meLid) {
     else {
         throw new boom_1.Boom('Unknown message type', { data: stanza });
     }
-    const fromMe = (0, WABinary_1.isJidNewsletter)(from) ? !!((_a = stanza.attrs) === null || _a === void 0 ? void 0 : _a.is_sender) || false : ((0, WABinary_1.isLidUser)(from) ? isMeLid : isMe)(stanza.attrs.participant || stanza.attrs.from);
-    const pushname = (_b = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _b === void 0 ? void 0 : _b.notify;
+    const fromMe = (0, WABinary_1.isJidNewsLetter)(from) ? !!((_a = stanza.attrs) === null || _a === void 0 ? void 0 : _a.is_sender) : ((0, WABinary_1.isLidUser)(from) ? isMeLid : isMe)(stanza.attrs.participant || stanza.attrs.from);
+    const pushname = stanza.attrs.notify;
     const key = {
         remoteJid: chatId,
         fromMe,
         id: msgId,
-        participant,
-        server_id: (_c = stanza.attrs) === null || _c === void 0 ? void 0 : _c.server_id
+        participant
     };
     const fullMessage = {
         key,
@@ -98,7 +92,7 @@ function decodeMessageNode(stanza, meId, meLid) {
         broadcast: (0, WABinary_1.isJidBroadcast)(from)
     };
     if (msgType === 'newsletter') {
-        fullMessage.newsletterServerId = +((_d = stanza.attrs) === null || _d === void 0 ? void 0 : _d.server_id);
+        fullMessage.newsletterServerId = +((_b = stanza.attrs) === null || _b === void 0 ? void 0 : _b.server_id);
     }
     if (key.fromMe) {
         fullMessage.status = WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK;
@@ -132,7 +126,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                     }
                 }
             }
-            if ((0, WABinary_1.isJidNewsletter)(fullMessage.key.remoteJid)) {
+            if ((0, WABinary_1.isJidNewsLetter)(fullMessage.key.remoteJid)) {
                 const node = (0, WABinary_1.getBinaryNodeChild)(stanza, 'plaintext');
                 const msg = WAProto_1.proto.Message.decode(node === null || node === void 0 ? void 0 : node.content);
                 await processSenderKeyDistribution(msg);
@@ -146,7 +140,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                         const details = WAProto_1.proto.VerifiedNameCertificate.Details.decode(cert.details);
                         fullMessage.verifiedBizName = details.verifiedName;
                     }
-                    if (tag !== 'enc' && tag !== 'plaintext') {
+                    if (tag !== 'enc') {
                         continue;
                     }
                     if (!(content instanceof Uint8Array)) {
@@ -155,7 +149,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                     decryptables += 1;
                     let msgBuffer;
                     try {
-                        const e2eType = tag === 'plaintext' ? 'plaintext' : attrs.type;
+                        const e2eType = attrs.type;
                         switch (e2eType) {
                             case 'skmsg':
                                 msgBuffer = await repository.decryptGroupMessage({
@@ -173,26 +167,12 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                                     ciphertext: content
                                 });
                                 break;
-                            case 'plaintext':
-                                msgBuffer = content;
-                                break;
                             default:
                                 throw new Error(`Unknown e2e type: ${e2eType}`);
                         }
-                        let msg = WAProto_1.proto.Message.decode(e2eType !== 'plaintext' ? (0, generics_1.unpadRandomMax16)(msgBuffer) : msgBuffer);
+                        let msg = WAProto_1.proto.Message.decode((0, generics_1.unpadRandomMax16)(msgBuffer));
                         msg = ((_a = msg.deviceSentMessage) === null || _a === void 0 ? void 0 : _a.message) || msg;
-                        if (msg.senderKeyDistributionMessage) {
-                            //eslint-disable-next-line max-depth
-                            try {
-                                await repository.processSenderKeyDistributionMessage({
-                                    authorJid: author,
-                                    item: msg.senderKeyDistributionMessage
-                                });
-                            }
-                            catch (err) {
-                                logger.error({ key: fullMessage.key, err }, 'failed to decrypt message');
-                            }
-                        }
+                        await processSenderKeyDistribution(msg);
                         if (fullMessage.message) {
                             Object.assign(fullMessage.message, msg);
                         }
@@ -210,7 +190,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
             // if nothing was found to decrypt
             if (!decryptables) {
                 fullMessage.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
-                fullMessage.messageStubParameters = [exports.NO_MESSAGE_FOUND_ERROR_TEXT];
+                fullMessage.messageStubParameters = [NO_MESSAGE_FOUND_ERROR_TEXT, JSON.stringify(stanza, generics_1.BufferJSON.replacer)];
             }
         }
     };