vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 14:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix WhatsApp media sends when mediaUrl is empty but mediaUrls is populated (#64394)

Browse Source 
* Fix WhatsApp media fallback

Accept the first mediaUrls entry when mediaUrl is empty so outbound WhatsApp sends do not silently downgrade media messages to text.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* chore(changelog): credit WhatsApp mediaUrls fallback

* fix(changelog): restore 2026.4.10 release block

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Vincent Koc <vincentkoc@ieee.org>
This commit is contained in:
eric-fr4
2026-04-12 12:58:40 -03:00
committed by GitHub
parent 2de988ae4b
commit ad826ea450
3 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/whatsapp/src/send.test.ts
View File

@@ -221,6 +221,26 @@ describe("web outbound", () => {
expect(sendMessage).toHaveBeenLastCalledWith("+1555", "pic", buf, "image/jpeg");
});
it("falls back to the first mediaUrls entry when mediaUrl is omitted", async () => {
const buf = Buffer.from("img");
loadWebMediaMock.mockResolvedValueOnce({
buffer: buf,
contentType: "image/jpeg",
kind: "image",
});
await sendMessageWhatsApp("+1555", "pic", {
verbose: false,
mediaUrls: [" ", " /tmp/pic.jpg "],
});
expect(loadWebMediaMock).toHaveBeenCalledWith(
"/tmp/pic.jpg",
expect.objectContaining({
hostReadCapability: false,
}),
);
expect(sendMessage).toHaveBeenLastCalledWith("+1555", "pic", buf, "image/jpeg");
});
it("maps other kinds to document with filename", async () => {
const buf = Buffer.from("pdf");
loadWebMediaMock.mockResolvedValueOnce({

21
extensions/whatsapp/src/send.ts
View File

@@ -35,6 +35,7 @@ export async function sendMessageWhatsApp(
verbose: boolean;
cfg?: OpenClawConfig;
mediaUrl?: string;
mediaUrls?: readonly string[];
mediaAccess?: {
localRoots?: readonly string[];
readFile?: (filePath: string) => Promise<Buffer>;
@@ -47,7 +48,13 @@ export async function sendMessageWhatsApp(
): Promise<{ messageId: string; toJid: string }> {
let text = body.trimStart();
const jid = toWhatsappJid(to);
if (!text && !options.mediaUrl) {
const mediaUrls = Array.isArray(options.mediaUrls)
? options.mediaUrls
.map((entry) => (typeof entry === "string" ? entry.trim() : ""))
.filter(Boolean)
: [];
const primaryMediaUrl = options.mediaUrl?.trim() || mediaUrls[0];
if (!text && !primaryMediaUrl) {
return { messageId: "", toJid: jid };
}
const correlationId = generateSecureUuid();
@@ -81,8 +88,8 @@ export async function sendMessageWhatsApp(
let mediaBuffer: Buffer | undefined;
let mediaType: string | undefined;
let documentFileName: string | undefined;
if (options.mediaUrl) {
const media = await loadOutboundMediaFromUrl(options.mediaUrl, {
if (primaryMediaUrl) {
const media = await loadOutboundMediaFromUrl(primaryMediaUrl, {
maxBytes: resolveWhatsAppMediaMaxBytes(account),
mediaAccess: options.mediaAccess,
mediaLocalRoots: options.mediaLocalRoots,
@@ -106,8 +113,8 @@ export async function sendMessageWhatsApp(
documentFileName = media.fileName;
}
}
outboundLog.info(`Sending message -> ${redactedJid}${options.mediaUrl ? " (media)" : ""}`);
logger.info({ jid: redactedJid, hasMedia: Boolean(options.mediaUrl) }, "sending message");
outboundLog.info(`Sending message -> ${redactedJid}${primaryMediaUrl ? " (media)" : ""}`);
logger.info({ jid: redactedJid, hasMedia: Boolean(primaryMediaUrl) }, "sending message");
await active.sendComposingTo(to);
const hasExplicitAccountId = Boolean(options.accountId?.trim());
const accountId = hasExplicitAccountId ? resolvedAccountId : undefined;
@@ -125,13 +132,13 @@ export async function sendMessageWhatsApp(
const messageId = (result as { messageId?: string })?.messageId ?? "unknown";
const durationMs = Date.now() - startedAt;
outboundLog.info(
`Sent message ${messageId} -> ${redactedJid}${options.mediaUrl ? " (media)" : ""} (${durationMs}ms)`,
`Sent message ${messageId} -> ${redactedJid}${primaryMediaUrl ? " (media)" : ""} (${durationMs}ms)`,
);
logger.info({ jid: redactedJid, messageId }, "sent message");
return { messageId, toJid: jid };
} catch (err) {
logger.error(
{ err: String(err), to: redactedTo, hasMedia: Boolean(options.mediaUrl) },
{ err: String(err), to: redactedTo, hasMedia: Boolean(primaryMediaUrl) },
"failed to send via web session",
);
throw err;