zapo-js 1.8.0 → 1.8.2

package/dist/message/primitives/incoming.d.ts

@@ -24,6 +24,23 @@ interface WaIncomingMessageAckHandlerOptions {
     readonly emitUnhandledStanza?: (event: WaIncomingUnhandledStanzaEvent) => void;
     readonly emitDecryptedPayload?: (build: () => WaIncomingDecryptedPayloadEvent) => void;
 }
+/**
+ * Resolves who authored a {@link proto.IWebMessageInfo}. The top-level
+ * `participant` wins over `key.participant` - history sync carries the group
+ * sender in the former and leaves the latter empty on a large share of records.
+ * A self-sent group/broadcast message with neither falls back to this account,
+ * preferring `originalSelfAuthorUserJidString` over `meJid` (the current account
+ * user JID) so a message authored under a previous identity keeps its author.
+ *
+ * The participant fields are read whatever the thread type is, matching how
+ * WhatsApp Web builds the author: only the self-sent fallback is gated on
+ * group/broadcast. A 1:1 record normally carries neither, so this returns
+ * `undefined` there and the caller supplies the thread JID instead.
+ *
+ * `threadJid` overrides `key.remoteJid` for carriers that know the thread out
+ * of band, such as a group history bundle whose records may omit it.
+ */
+export declare function resolveWebMessageInfoAuthor(webMessageInfo: proto.IWebMessageInfo, meJid?: string | null, threadJid?: string): string | undefined;
 /**
  * Rebuilds a `message` event from a recovered {@link proto.IWebMessageInfo}
  * (placeholder resend). `meJid` is the current account user JID, used as the

package/dist/message/primitives/incoming.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveWebMessageInfoAuthor = resolveWebMessageInfoAuthor;
 exports.buildRecoveredIncomingEvent = buildRecoveredIncomingEvent;
 exports.handleIncomingMessageAck = handleIncomingMessageAck;
 const context_info_1 = require("../context-info");
@@ -129,6 +130,32 @@ function buildIncomingEventRawNode(node) {
         content: children
     };
 }
+/**
+ * Resolves who authored a {@link proto.IWebMessageInfo}. The top-level
+ * `participant` wins over `key.participant` - history sync carries the group
+ * sender in the former and leaves the latter empty on a large share of records.
+ * A self-sent group/broadcast message with neither falls back to this account,
+ * preferring `originalSelfAuthorUserJidString` over `meJid` (the current account
+ * user JID) so a message authored under a previous identity keeps its author.
+ *
+ * The participant fields are read whatever the thread type is, matching how
+ * WhatsApp Web builds the author: only the self-sent fallback is gated on
+ * group/broadcast. A 1:1 record normally carries neither, so this returns
+ * `undefined` there and the caller supplies the thread JID instead.
+ *
+ * `threadJid` overrides `key.remoteJid` for carriers that know the thread out
+ * of band, such as a group history bundle whose records may omit it.
+ */
+function resolveWebMessageInfoAuthor(webMessageInfo, meJid, threadJid) {
+    const key = webMessageInfo.key ?? {};
+    const chatJid = threadJid ?? key.remoteJid ?? undefined;
+    const isGroupOrBroadcast = chatJid ? (0, jid_1.isGroupJid)(chatJid) || (0, jid_1.isBroadcastJid)(chatJid) : false;
+    const rawSelfAuthor = webMessageInfo.originalSelfAuthorUserJidString ?? meJid ?? undefined;
+    const selfAuthor = key.fromMe === true && isGroupOrBroadcast && rawSelfAuthor
+        ? (0, jid_1.toUserJid)(rawSelfAuthor)
+        : undefined;
+    return webMessageInfo.participant ?? key.participant ?? selfAuthor ?? undefined;
+}
 /**
  * Rebuilds a `message` event from a recovered {@link proto.IWebMessageInfo}
  * (placeholder resend). `meJid` is the current account user JID, used as the
@@ -141,9 +168,7 @@ function buildRecoveredIncomingEvent(webMessageInfo, meJid) {
     const fromMe = key.fromMe === true;
     const isGroup = chatJid ? (0, jid_1.isGroupJid)(chatJid) : false;
     const isBroadcast = chatJid ? (0, jid_1.isBroadcastJid)(chatJid) : false;
-    const rawSelfAuthor = webMessageInfo.originalSelfAuthorUserJidString ?? meJid ?? undefined;
-    const selfAuthor = fromMe && (isGroup || isBroadcast) && rawSelfAuthor ? (0, jid_1.toUserJid)(rawSelfAuthor) : undefined;
-    const participant = webMessageInfo.participant ?? key.participant ?? selfAuthor;
+    const participant = resolveWebMessageInfoAuthor(webMessageInfo, meJid);
     const pushName = webMessageInfo.pushName ?? undefined;
     const rawSender = fromMe ? undefined : isGroup || isBroadcast ? participant : chatJid;
     const sender = rawSender ? (0, jid_1.parseJidFull)(rawSender) : null;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "zapo-js",
-    "version": "1.8.0",
+    "version": "1.8.2",
     "description": "High-performance WhatsApp Web TypeScript library",
     "license": "MIT",
     "author": "vinikjkkj <contact@vinicius.email> (https://github.com/vinikjkkj)",