@manybot/manybot 5.9.1 → 5.10.0

package/dist/drivers/baileys/api/index.js

@@ -178,6 +178,37 @@ function getMsgSenderPn(msg) {
         return normalizeJid(msg.chatId);
     return null;
 }
+/**
+ * Split a quoted message's `contextInfo.participant` into `fromLid`/`fromPn`
+ * the same way the adapter's `toBotMessage()` splits `key.participant` /
+ * `key.participantAlt` via `splitLidPn()` — see the comment there. Unlike
+ * the key, `contextInfo` carries only a single `participant` field (no
+ * companion "Alt"), and it holds whichever form matches the chat's current
+ * addressing mode: under the modern default "lid" mode that's the @lid
+ * form, under legacy "pn" mode it's the phone-number form. Blindly
+ * assigning it to `fromPn` (as the quoted-message synthetic used to)
+ * leaves `fromLid` unset — so `getMsgSender()` (which only reads
+ * `participantAlt`/`fromLid`) falls through to `null` — while
+ * `getMsgSenderPn()` happily normalizes and returns the @lid value
+ * verbatim, since it never checks the suffix. Route by suffix here, and
+ * fill in the other side from the store's learned LID<->PN mapping when
+ * one is known.
+ */
+function splitQuotedParticipant(store, participant) {
+    if (!participant)
+        return {};
+    if (participant.endsWith("@lid")) {
+        const resolved = store.resolveJid(participant);
+        return {
+            fromLid: participant,
+            fromPn: resolved !== participant ? resolved : undefined,
+        };
+    }
+    return {
+        fromLid: store.resolvePn(participant) ?? undefined,
+        fromPn: participant,
+    };
+}
 /** Quoted-message metadata as the rest of the api uses it. */
 function getQuotedContext(msg) {
     if (!msg.quotedKey)
@@ -935,16 +966,33 @@ export function buildMessageContext(msg, contract, store, guardOptions = {}) {
     const quotedRaw = contextInfo?.quotedMessage
         ? (() => {
             const decoded = decodeContent(contextInfo.quotedMessage);
+            const { fromLid: quotedFromLid, fromPn: quotedFromPn } = splitQuotedParticipant(store, contextInfo.participant);
+            // contextInfo itself never carries the quoted message's original
+            // send time (WhatsApp's ContextInfo proto has no timestamp field —
+            // only stanzaId/participant/quotedMessage). Best-effort recover it
+            // from the message store, keyed by the same chatId+stanzaId, when
+            // the original is still cached (it usually is, since a reply
+            // almost always quotes a recent message in the same chat). Stays
+            // 0 — same as before — only when the original has aged out of the
+            // store's per-chat cap or the chat history hasn't been seen yet.
+            const quotedOriginal = contextInfo.stanzaId
+                ? store.messages.get(msg.chatId)?.get(contextInfo.stanzaId)
+                : undefined;
+            const quotedTimestamp = quotedOriginal
+                ? Number(quotedOriginal.messageTimestamp ?? 0) * 1000
+                : 0;
             return {
                 id: contextInfo.stanzaId ?? "",
                 chatId: msg.chatId,
                 fromMe: false,
                 type: decoded.type,
                 contentHash: "",
-                timestamp: 0,
+                timestamp: quotedTimestamp,
                 body: decoded.body,
                 mimetype: decoded.mimetype,
-                fromPn: contextInfo.participant ?? undefined,
+                fromLid: quotedFromLid,
+                fromPn: quotedFromPn,
+                participantAlt: quotedFromLid,
                 pushName: lookupPushName(contextInfo.participant),
                 _raw: {
                     contextInfo: {
@@ -962,16 +1010,27 @@ export function buildMessageContext(msg, contract, store, guardOptions = {}) {
             // key-only synthetic so hasReply()/getReply() still work, but
             // hasMedia/downloadMedia on the result will degrade gracefully
             // (type=other, mimetype=undefined).
-            ? {
-                id: msg.quotedKey.id ?? "",
-                chatId: msg.chatId,
-                fromMe: false,
-                type: "other",
-                contentHash: "",
-                timestamp: 0,
-                fromPn: msg.quotedKey.participant ?? undefined,
-                pushName: lookupPushName(msg.quotedKey.participant),
-            }
+            ? (() => {
+                const { fromLid: quotedFromLid, fromPn: quotedFromPn } = splitQuotedParticipant(store, msg.quotedKey.participant);
+                const quotedOriginal = msg.quotedKey.id
+                    ? store.messages.get(msg.chatId)?.get(msg.quotedKey.id)
+                    : undefined;
+                const quotedTimestamp = quotedOriginal
+                    ? Number(quotedOriginal.messageTimestamp ?? 0) * 1000
+                    : 0;
+                return {
+                    id: msg.quotedKey.id ?? "",
+                    chatId: msg.chatId,
+                    fromMe: false,
+                    type: "other",
+                    contentHash: "",
+                    timestamp: quotedTimestamp,
+                    fromLid: quotedFromLid,
+                    fromPn: quotedFromPn,
+                    participantAlt: quotedFromLid,
+                    pushName: lookupPushName(msg.quotedKey.participant),
+                };
+            })()
             : null;
     return {
         id: msg.id,
@@ -1818,50 +1877,69 @@ function buildAdminApi(contract, store, chatJid) {
             },
         };
     }
+    /**
+     * Same `.to(target)` shape as `createTargetableAction`, for group-level
+     * ops that take no `memberIds` (setSubject/setDescription/setProfilePic/
+     * revokeInvite) — no participant resolution needed, just a group jid.
+     */
+    function createTargetableGroupAction(action) {
+        const executeCurrent = async () => {
+            requireChat();
+            return action(chatJid);
+        };
+        return {
+            async to(targetJid) {
+                await getGroup(targetJid);
+                return action(targetJid);
+            },
+            then(onfulfilled, onrejected) {
+                return executeCurrent().then(onfulfilled, onrejected);
+            },
+            catch(onrejected) {
+                return executeCurrent().catch(onrejected);
+            },
+            finally(onfinally) {
+                return executeCurrent().finally(onfinally);
+            },
+        };
+    }
+    function isSelf(u) {
+        const n = normalizeJid(u);
+        return (botJid && n === botJid) || (botLid && n === botLid) || false;
+    }
     return {
         /** @param {string|string[]} memberIds — JID (@s.whatsapp.net/@lid), this framework's @c.us form, or a bare phone number */
         add(memberIds) {
             return createTargetableAction((jid, users) => runParticipantsUpdate(jid, users, "add"), memberIds, "newMember");
         },
         /** @param {string|string[]} memberIds — JID (@s.whatsapp.net/@lid), this framework's @c.us form, or a bare phone number */
-        async kick(memberIds) {
-            requireChat();
-            const users = await resolveTargets(chatJid, Array.isArray(memberIds) ? memberIds : [memberIds]);
-            if (users.some((u) => {
-                const n = normalizeJid(u);
-                return (botJid && n === botJid) || (botLid && n === botLid);
-            })) {
-                throw new Error(t("driver.cannotKickSelf"));
-            }
-            return runParticipantsUpdate(chatJid, users, "remove");
+        kick(memberIds) {
+            return createTargetableAction(async (jid, users) => {
+                if (users.some(isSelf))
+                    throw new Error(t("driver.cannotKickSelf"));
+                return runParticipantsUpdate(jid, users, "remove");
+            }, memberIds);
         },
         /** @param {string|string[]} memberIds — JID (@s.whatsapp.net/@lid), this framework's @c.us form, or a bare phone number */
-        async promote(memberIds) {
-            requireChat();
-            const users = await resolveTargets(chatJid, Array.isArray(memberIds) ? memberIds : [memberIds]);
-            return runParticipantsUpdate(chatJid, users, "promote");
+        promote(memberIds) {
+            return createTargetableAction((jid, users) => runParticipantsUpdate(jid, users, "promote"), memberIds);
         },
         /** @param {string|string[]} memberIds — JID (@s.whatsapp.net/@lid), this framework's @c.us form, or a bare phone number */
-        async demote(memberIds) {
-            requireChat();
-            const users = await resolveTargets(chatJid, Array.isArray(memberIds) ? memberIds : [memberIds]);
-            return runParticipantsUpdate(chatJid, users, "demote");
+        demote(memberIds) {
+            return createTargetableAction((jid, users) => runParticipantsUpdate(jid, users, "demote"), memberIds);
         },
         /** @param {string} name */
-        async setSubject(name) {
-            requireChat();
-            return contract.groupUpdateSubject(chatJid, name);
+        setSubject(name) {
+            return createTargetableGroupAction((jid) => contract.groupUpdateSubject(jid, name));
         },
         /** @param {string} text */
-        async setDescription(text) {
-            requireChat();
-            return contract.groupUpdateDescription(chatJid, text);
+        setDescription(text) {
+            return createTargetableGroupAction((jid) => contract.groupUpdateDescription(jid, text));
         },
         /** @param {string|Buffer} source */
-        async setProfilePic(source) {
-            requireChat();
+        setProfilePic(source) {
             const buffer = Buffer.isBuffer(source) ? source : readFileSync(source);
-            return contract.updateProfilePicture(chatJid, buffer);
+            return createTargetableGroupAction((jid) => contract.updateProfilePicture(jid, buffer));
         },
         async getInviteLink(groupId) {
             const jid = groupId ?? chatJid;
@@ -1870,9 +1948,8 @@ function buildAdminApi(contract, store, chatJid) {
             const code = await contract.groupInviteCode(jid);
             return `https://chat.whatsapp.com/${code}`;
         },
-        async revokeInvite() {
-            requireChat();
-            return contract.groupRevokeInvite(chatJid);
+        revokeInvite() {
+            return createTargetableGroupAction((jid) => contract.groupRevokeInvite(jid));
         },
     };
 }

package/dist/kernel/pluginApi.test.js

@@ -25,6 +25,10 @@ function createMockContract() {
         deletes: [],
         blockUpdates: [],
         groupParticipantUpdates: [],
+        subjectUpdates: [],
+        descriptionUpdates: [],
+        profilePicUpdates: [],
+        revokeInvites: [],
         nameUpdates: [],
         statusUpdates: [],
     };
@@ -189,11 +193,20 @@ function createMockContract() {
             calls.groupParticipantUpdates.push({ jid, users, action });
             return users.map((u) => ({ status: "200", jid: u }));
         },
-        groupUpdateSubject: async () => { },
-        groupUpdateDescription: async () => { },
+        groupUpdateSubject: async (jid, subject) => {
+            calls.subjectUpdates.push({ jid, subject });
+        },
+        groupUpdateDescription: async (jid, description) => {
+            calls.descriptionUpdates.push({ jid, description });
+        },
         groupInviteCode: async () => "mock-invite-code-123",
-        groupRevokeInvite: async () => "mock-new-invite-code-456",
-        updateProfilePicture: async () => { },
+        groupRevokeInvite: async (jid) => {
+            calls.revokeInvites.push(jid);
+            return "mock-new-invite-code-456";
+        },
+        updateProfilePicture: async (jid) => {
+            calls.profilePicUpdates.push({ jid });
+        },
         updateProfileName: async (name) => {
             calls.nameUpdates.push(name);
         },
@@ -301,6 +314,44 @@ describe("kernel/pluginApi — buildSetupApi with Mock WaContract", () => {
         assert.equal(calls.groupParticipantUpdates[0].action, "add");
         assert.equal(calls.groupParticipantUpdates[0].jid, "120363000000000@g.us");
     });
+    test("setup admin.kick/promote/demote().to() target the explicit group", async () => {
+        const ctx = buildSetupApi(mockContract, store, pluginRegistry, "test_plugin");
+        const groupJid = "120363000000000@g.us";
+        await ctx.admin.promote("5516777777777@s.whatsapp.net").to(groupJid);
+        assert.equal(calls.groupParticipantUpdates.at(-1)?.action, "promote");
+        assert.equal(calls.groupParticipantUpdates.at(-1)?.jid, groupJid);
+        await ctx.admin.demote("5516777777777@s.whatsapp.net").to(groupJid);
+        assert.equal(calls.groupParticipantUpdates.at(-1)?.action, "demote");
+        assert.equal(calls.groupParticipantUpdates.at(-1)?.jid, groupJid);
+        await ctx.admin.kick("5516777777777@s.whatsapp.net").to(groupJid);
+        assert.equal(calls.groupParticipantUpdates.at(-1)?.action, "remove");
+        assert.equal(calls.groupParticipantUpdates.at(-1)?.jid, groupJid);
+        // self-kick guard still applies when targeting an explicit group
+        await assert.rejects(async () => { await ctx.admin.kick("5516999999999@s.whatsapp.net").to(groupJid); });
+    });
+    test("setup admin.setSubject/setDescription/setProfilePic/revokeInvite().to() target the explicit group", async () => {
+        const ctx = buildSetupApi(mockContract, store, pluginRegistry, "test_plugin");
+        const groupJid = "120363000000000@g.us";
+        await ctx.admin.setSubject("New Subject").to(groupJid);
+        assert.deepEqual(calls.subjectUpdates, [{ jid: groupJid, subject: "New Subject" }]);
+        await ctx.admin.setDescription("New Description").to(groupJid);
+        assert.deepEqual(calls.descriptionUpdates, [{ jid: groupJid, description: "New Description" }]);
+        await ctx.admin.setProfilePic(Buffer.from("pic-data")).to(groupJid);
+        assert.deepEqual(calls.profilePicUpdates, [{ jid: groupJid }]);
+        const invite = await ctx.admin.revokeInvite().to(groupJid);
+        assert.match(String(invite), /mock-new-invite-code-456/);
+        assert.deepEqual(calls.revokeInvites, [groupJid]);
+    });
+    test("setup admin.* without .to() throws (no current chat bound)", async () => {
+        const ctx = buildSetupApi(mockContract, store, pluginRegistry, "test_plugin");
+        await assert.rejects(async () => { await ctx.admin.kick("5516777777777@s.whatsapp.net"); }, /runtime group context/);
+        await assert.rejects(async () => { await ctx.admin.promote("5516777777777@s.whatsapp.net"); }, /runtime group context/);
+        await assert.rejects(async () => { await ctx.admin.demote("5516777777777@s.whatsapp.net"); }, /runtime group context/);
+        await assert.rejects(async () => { await ctx.admin.setSubject("X"); }, /runtime group context/);
+        await assert.rejects(async () => { await ctx.admin.setDescription("X"); }, /runtime group context/);
+        await assert.rejects(async () => { await ctx.admin.setProfilePic(Buffer.from("x")); }, /runtime group context/);
+        await assert.rejects(async () => { await ctx.admin.revokeInvite(); }, /runtime group context/);
+    });
 });
 describe("kernel/pluginApi — buildApi (Runtime) with Mock WaContract", () => {
     let store;
@@ -371,7 +422,7 @@ describe("kernel/pluginApi — buildApi (Runtime) with Mock WaContract", () => {
         await ctx.admin.kick("5516777777777@s.whatsapp.net");
         assert.equal(calls.groupParticipantUpdates.length, 2);
         assert.equal(calls.groupParticipantUpdates[1].action, "remove");
-        await assert.rejects(() => ctx.admin.kick("5516999999999@s.whatsapp.net"));
+        await assert.rejects(async () => { await ctx.admin.kick("5516999999999@s.whatsapp.net"); });
         assert.equal(calls.groupParticipantUpdates.length, 2);
         const inviteLink = await ctx.admin.getInviteLink();
         assert.match(inviteLink, /chat\.whatsapp\.com\/mock-invite-code-123/);

package/package.json

@@ -5,7 +5,7 @@
     "name": "SyntaxError!",
     "email": "me@stxerr.dev"
   },
-  "version": "5.9.1",
+  "version": "5.10.0",
   "license": "GPL-3.0-only",
   "private": false,
   "engines": {