@vanzxy/baileys 1.5.0 → 1.5.1

package/lib/Utils/MessageBuilder.js

@@ -2679,26 +2679,107 @@ class AIRich extends BaseBuilder {
 	// the two calls expect different option shapes, so the fallback now only forwards `quoted`
 	// (the one option that clearly applies to both) instead of blindly spreading everything.
 	/** Build and send this AI-rich message. @param {string} jid Destination chat/group jid. @param {boolean} [skipImageFallback] Skip auto-resending inline images as a plain imageMessage. */
-	async send(jid, { forwarded, notification, includesUnifiedResponse, includesSubmessages, skipImageFallback = false, quoted, ...options } = {}) {
-		const msg = await this.build({ forwarded, notification, includesUnifiedResponse, includesSubmessages, quoted, ...options });
-
-		if (!skipImageFallback && this._mediaFallbacks.length) {
-			const fallbacks = await waitAllPromises(this._mediaFallbacks);
-			for (const item of fallbacks) {
-				try {
-					const media = Buffer.isBuffer(item.url) ? item.url : { url: item.url };
-					const content = { [item.type]: media };
-					if (item.caption) content.caption = item.caption;
-					if (item.mimetype) content.mimetype = item.mimetype;
-					if (item.fileName) content.fileName = item.fileName;
-					await this.#client.sendMessage(jid, content, quoted ? { quoted } : {});
-				} catch (err) {
-					this.#client.logger?.warn?.({ err, url: item.url, type: item.type }, 'AIRich media fallback failed, continuing with rich card');
-				}
-			}
-		}
-		return await this.#client.relayMessage(jid, msg, { ...options });
-	}
+\tasync send(jid, {
+\t\tforwarded,
+\t\tnotification,
+\t\tincludesUnifiedResponse,
+\t\tincludesSubmessages,
+\t\tskipImageFallback = false,
+\t\tnativeFallback = true,
+\t\tquoted,
+\t\t...options
+\t} = {}) {
+\t\tconst msg = await this.build({ forwarded, notification, includesUnifiedResponse, includesSubmessages, quoted, ...options });
+\t\tconst sendOptions = quoted ? { quoted } : {};
+
+\t\t// Native fallback is enabled by default because stock/third-party WhatsApp clients
+\t\t// do not reliably render botForwardedMessage.richResponseMessage. The rich payload
+\t\t// remains available through build()/relayMessage(), while send() uses ordinary WA
+\t\t// message types that are known to render immediately.
+\t\tif (nativeFallback) {
+\t\t\tconst sent = [];
+
+\t\t\t// 1) Send real WhatsApp media first. addImage()/addVideo()/addInlineImage()
+\t\t\t// already populate this queue with resolved URLs/buffers.
+\t\t\tif (!skipImageFallback && this._mediaFallbacks.length) {
+\t\t\t\tconst fallbacks = await waitAllPromises(this._mediaFallbacks);
+\t\t\t\tfor (const item of fallbacks) {
+\t\t\t\t\ttry {
+\t\t\t\t\t\tconst media = Buffer.isBuffer(item.url) ? item.url : { url: item.url };
+\t\t\t\t\t\tconst content = { [item.type]: media };
+\t\t\t\t\t\tif (item.caption) content.caption = item.caption;
+\t\t\t\t\t\tif (item.mimetype) content.mimetype = item.mimetype;
+\t\t\t\t\t\tif (item.fileName) content.fileName = item.fileName;
+\t\t\t\t\t\tsent.push(await this.#client.sendMessage(jid, content, sendOptions));
+\t\t\t\t\t} catch (err) {
+\t\t\t\t\t\tthis.#client.logger?.warn?.(
+\t\t\t\t\t\t\t{ err, url: item.url, type: item.type },
+\t\t\t\t\t\t\t'AIRich native media fallback failed'
+\t\t\t\t\t\t);
+\t\t\t\t\t}
+\t\t\t\t}
+\t\t\t}
+
+\t\t\t// 2) Convert AIRich submessages into ordinary WhatsApp text. This preserves
+\t\t\t// every primitive's readable content even when the AI-only rich renderer is absent.
+\t\t\tconst lines = [];
+\t\t\tfor (const sub of await waitAllPromises(this._submessages)) {
+\t\t\t\tif (!sub) continue;
+
+\t\t\t\tif (typeof sub.messageText === 'string' && sub.messageText.trim()) {
+\t\t\t\t\tconst t = sub.messageText.trim();
+
+\t\t\t\t\t// Media primitives already have a native media message above; don't emit
+\t\t\t\t\t// their internal placeholder text as a duplicate.
+\t\t\t\t\tif (
+\t\t\t\t\t\tt === '[ Video tidak dapat dimuat ]' ||
+\t\t\t\t\t\tt === '[ Postingan tidak dapat dimuat ]' ||
+\t\t\t\t\t\tt === '[ Produk tidak dapat dimuat ]' ||
+\t\t\t\t\t\tt === '[ Sedang diproses... ]'
+\t\t\t\t\t) continue;
+
+\t\t\t\t\tlines.push(t);
+\t\t\t\t\tcontinue;
+\t\t\t\t}
+
+\t\t\t\tif (sub.codeMetadata) {
+\t\t\t\t\tconst blocks = sub.codeMetadata.codeBlocks ?? [];
+\t\t\t\t\tconst code = Array.isArray(blocks)
+\t\t\t\t\t\t? blocks.map((b) => typeof b === 'string' ? b : (b?.value ?? '')).join('')
+\t\t\t\t\t\t: String(blocks);
+\t\t\t\t\tlines.push('```' + (sub.codeMetadata.codeLanguage || '') + '\\n' + code + '\\n```');
+\t\t\t\t\tcontinue;
+\t\t\t\t}
+
+\t\t\t\tif (sub.tableMetadata?.rows) {
+\t\t\t\t\tconst rows = sub.tableMetadata.rows;
+\t\t\t\t\tif (Array.isArray(rows)) {
+\t\t\t\t\t\tlines.push(rows.map((row) => {
+\t\t\t\t\t\t\tconst cells = Array.isArray(row) ? row : row?.cells;
+\t\t\t\t\t\t\treturn Array.isArray(cells)
+\t\t\t\t\t\t\t\t? cells.map((c) => typeof c === 'string' ? c : (c?.text ?? c?.value ?? '')).join(' | ')
+\t\t\t\t\t\t\t\t: String(row);
+\t\t\t\t\t\t}).join('\\n'));
+\t\t\t\t\t}
+\t\t\t\t\tcontinue;
+\t\t\t\t}
+
+\t\t\t\tif (sub.latexMetadata?.text) {
+\t\t\t\t\tlines.push(sub.latexMetadata.text);
+\t\t\t\t}
+\t\t\t}
+
+\t\t\tconst text = lines.join('\\n\\n').trim();
+\t\t\tif (text) {
+\t\t\t\tsent.push(await this.#client.sendMessage(jid, { text }, sendOptions));
+\t\t\t}
+
+\t\t\tif (sent.length) return sent.length === 1 ? sent[0] : sent;
+\t\t}
+
+\t\t// Explicit compatibility mode: preserve the original AIRich rich payload.
+\t\treturn await this.#client.relayMessage(jid, msg, { ...options });
+\t}
 
 	/** Tokenize `code` into `{ type, value }` spans for syntax highlighting. Covers JS/TS/Python/Java and more; unsupported languages fall back to a single plain-text token. */
 	static tokenizer(code, lang = 'javascript') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanzxy/baileys",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Enhanced Baileys fork by Vanzxy — based on @itsliaaa/baileys + @whiskeysockets/baileys with fixes for audio group status and clean media without newsletter button.",
   "type": "module",
   "module": "./lib/index.js",