fb-messenger-e2ee 0.1.4 → 0.1.5

package/dist/index.cjs

@@ -3976,8 +3976,8 @@ init_cjs_shims();
 var MessageBuilder = class {
   content;
   replyTo;
-  setReply(id, senderJid) {
-    this.replyTo = { id, senderJid };
+  setReply(replyTo) {
+    this.replyTo = replyTo;
     return this;
   }
   getReply() {
@@ -4201,7 +4201,7 @@ function encodeMessageApplication(consumerAppBytes, replyTo) {
   const appPayload = new ProtoWriter().bytes(4, payloadSubProto).build();
   let metadataWriter = new ProtoWriter().bytes(8, frankingKey).varint(9, 0);
   if (replyTo) {
-    const quoted = new ProtoWriter().string(1, replyTo.id).string(2, replyTo.senderJid).build();
+    const quoted = new ProtoWriter().string(1, replyTo.messageId).string(2, replyTo.chatJid).string(3, replyTo.senderJid).build();
     metadataWriter = metadataWriter.bytes(10, quoted);
   }
   const metadata = metadataWriter.build();
@@ -5573,7 +5573,16 @@ var E2EEClient = class {
   async buildDMTextFanoutPayloads(opts) {
     const builder = new MessageBuilder().setText(opts.text);
     if (opts.replyToId && opts.replyToSenderJid) {
-      builder.setReply(opts.replyToId, opts.replyToSenderJid);
+      const replyTo = {
+        messageId: opts.replyToId,
+        // chatJid = remoteJID: the thread/chat that holds the quoted message
+        // For DM, this is the peer's bare JID (toJid).
+        chatJid: opts.toJid,
+        // senderJid = participant: who sent the original message.
+        // Caller must supply the correct sender JID via replyToSenderJid.
+        senderJid: opts.replyToSenderJid
+      };
+      builder.setReply(replyTo);
     }
     const consumerApp = builder.build();
     const { messageApp, frankingTag } = encodeMessageApplication(consumerApp, builder.getReply());
@@ -5608,7 +5617,14 @@ var E2EEClient = class {
   async encryptGroupText(groupJid, selfJid, text, messageId, replyToId, replyToSenderJid) {
     const builder = new MessageBuilder().setText(text);
     if (replyToId && replyToSenderJid) {
-      builder.setReply(replyToId, replyToSenderJid);
+      const replyTo = {
+        messageId: replyToId,
+        // chatJid = remoteJID: for a group message, this is the group JID
+        chatJid: groupJid,
+        // participant: the specific member who sent the original message
+        senderJid: replyToSenderJid
+      };
+      builder.setReply(replyTo);
     }
     const consumerApp = builder.build();
     const { messageApp, frankingTag } = encodeMessageApplication(consumerApp, builder.getReply());
@@ -8208,15 +8224,25 @@ var ClientController = class {
     if (this.e2eeConnected && isE2EE) {
       let messageId;
       if (isGroup) {
-        messageId = await this.sendE2EEGroupText(input.threadId, input.text, input.replyToMessageId);
+        messageId = await this.sendE2EEGroupText(
+          input.threadId,
+          input.text,
+          input.replyToMessageId,
+          input.replyToSenderJid
+        );
       } else {
-        messageId = await this.sendE2EEText(input.threadId, input.text, input.replyToMessageId);
+        messageId = await this.sendE2EEText(
+          input.threadId,
+          input.text,
+          input.replyToMessageId,
+          input.replyToSenderJid
+        );
       }
       return { messageId, timestampMs: now() };
     }
     return this.messagingService.sendText(this.requireApi(), input);
   }
-  async sendE2EEText(threadId, text, replyToMessageId) {
+  async sendE2EEText(threadId, text, replyToMessageId, replyToSenderJid) {
     if (!this.e2eeSocket) throw new Error("E2EE not connected");
     const e2eeClient = this.e2eeService.getClient();
     const selfJid = this.getSelfE2EEJid();
@@ -8228,7 +8254,9 @@ var ClientController = class {
       text,
       isGroup: false,
       replyToId: replyToMessageId,
-      replyToSenderJid: replyToMessageId ? toJid : void 0
+      // For DM: participant = sender of original msg. If caller knows who sent it, use that;
+      // otherwise fall back to the peer's JID (correct for messages they sent to us).
+      replyToSenderJid: replyToMessageId ? replyToSenderJid ?? toJid : void 0
     });
     const participantNodes = [];
     const deviceJids = uniqueJids(await this.e2eeHandler.getDeviceList([toJid, toBareMessengerJid(selfJid)]));
@@ -8274,7 +8302,7 @@ var ClientController = class {
     logger.info("ClientController", `E2EE DM message sent to ${toJid} with ${participantNodes.length} devices`);
     return messageId;
   }
-  async sendE2EEGroupText(groupJid, text, replyToMessageId) {
+  async sendE2EEGroupText(groupJid, text, replyToMessageId, replyToSenderJid) {
     if (!this.e2eeSocket) throw new Error("E2EE not connected");
     const e2eeClient = this.e2eeService.getClient();
     const selfJid = this.getSelfE2EEJid();
@@ -8290,7 +8318,8 @@ var ClientController = class {
       text,
       messageId,
       replyToMessageId,
-      void 0
+      replyToSenderJid
+      // pass through — undefined when not replying
     );
     const participantNodes = [];
     for (const deviceJid of deviceJids) {
@@ -8630,7 +8659,11 @@ var ClientController = class {
     const consumerApp = buildMessage(media.mediaFields);
     const { messageApp, frankingTag } = e2eeClient.buildMessageApplication(
       consumerApp,
-      input.replyToMessageId ? { id: input.replyToMessageId, senderJid: toJid } : void 0
+      input.replyToMessageId ? {
+        messageId: input.replyToMessageId,
+        chatJid: toJid,
+        senderJid: input.replyToSenderJid ?? toJid
+      } : void 0
     );
     const devicePayload = e2eeClient.buildMessageTransport({ messageApp });
     const selfDevicePayload = e2eeClient.buildMessageTransport({