teledzik 1.0.6 → 1.0.7

package/lib/core/helpers/rich-sanitizer.js

@@ -1,12 +1,7 @@
 "use strict";
-/**
- * Converts Rich HTML strings (containing unsupported Telegram HTML tags like
- * <table>, <ul>, <ol>, <li>, <details>, <h1>-<h6>, <aside>, <p>, <hr>, etc.)
- * into standard Telegram HTML compatible with parse_mode: 'HTML' (editMessageText/sendMessage).
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sanitizeRichHtml = void 0;
-function convertTableToText(tableHtml) {
+function formatTableToCard(tableHtml) {
     const rows = [];
     const rowMatches = tableHtml.match(/<tr[^>]*>([\s\S]*?)<\/tr>/gi) || [];
     for (const row of rowMatches) {
@@ -21,45 +16,37 @@ function convertTableToText(tableHtml) {
     }
     if (rows.length === 0)
         return '';
-    // Calculate column widths
-    const colWidths = [];
-    rows.forEach((r) => {
-        r.forEach((c, idx) => {
-            const textLen = c.replace(/<[^>]+>/g, '').length;
-            colWidths[idx] = Math.max(colWidths[idx] || 0, textLen);
+    // Header vs Row handling (Format sebagai Kartu Elegan)
+    const isKeyValue = rows.length > 1 && rows.every((r) => r.length === 2);
+    let cardText = '';
+    if (isKeyValue) {
+        const lines = rows.slice(1).map((r) => `• <b>${r[0]}:</b> ${r[1]}`);
+        cardText = `<blockquote>\n${lines.join('\n')}\n</blockquote>\n\n`;
+    }
+    else {
+        const lines = rows.map((r, idx) => {
+            if (idx === 0)
+                return `<b>${r.join(' │ ')}</b>`;
+            return `${r.join(' │ ')}`;
         });
-    });
-    // Format table rows
-    const formattedRows = rows.map((r, rowIdx) => {
-        const line = r
-            .map((c, colIdx) => {
-            const textLen = c.replace(/<[^>]+>/g, '').length;
-            const pad = ' '.repeat(Math.max(0, (colWidths[colIdx] || 0) - textLen));
-            return `${c}${pad}`;
-        })
-            .join(' │ ');
-        if (rowIdx === 0 && rows.length > 1) {
-            const sep = colWidths.map((w) => '─'.repeat(w)).join('─┼─');
-            return `${line}\n${sep}`;
-        }
-        return line;
-    });
-    return `<pre>\n${formattedRows.join('\n')}\n</pre>\n\n`;
+        cardText = `<blockquote>\n${lines.join('\n')}\n</blockquote>\n\n`;
+    }
+    return cardText;
 }
 function sanitizeRichHtml(html) {
     if (!html)
         return html;
     let result = html;
-    // 1. Convert Tables: <table>...</table> -> <pre>formatted table</pre>
-    result = result.replace(/<table[^>]*>([\s\S]*?)<\/table>/gi, (_, content) => convertTableToText(content));
-    // 2. Convert Details / Expandable: <details><summary>Title</summary>Content</details>
+    // 1. Convert Tables to Clean Modern Cards
+    result = result.replace(/<table[^>]*>([\s\S]*?)<\/table>/gi, (_, content) => formatTableToCard(content));
+    // 2. Convert Details to Telegram Native Expandable Blockquotes
     result = result.replace(/<details[^>]*>\s*<summary[^>]*>(.*?)<\/summary>([\s\S]*?)<\/details>/gi, (_, title, body) => {
-        return `<b>▶ ${title.trim()}</b>\n<blockquote>${body.trim()}</blockquote>\n\n`;
+        return `<blockquote expandable><b>▶ ${title.trim()}</b>\n${body.trim()}</blockquote>\n\n`;
     });
-    // 3. Convert Headings
-    result = result.replace(/<h1[^>]*>([\s\S]*?)<\/h1>/gi, (_, c) => `<b>${c.trim().toUpperCase()}</b>\n\n`);
+    // 3. Clean Headings
+    result = result.replace(/<h1[^>]*>([\s\S]*?)<\/h1>/gi, (_, c) => `<b>${c.trim()}</b>\n\n`);
     result = result.replace(/<h[2-6][^>]*>([\s\S]*?)<\/h[2-6]>/gi, (_, c) => `<b>${c.trim()}</b>\n\n`);
-    // 4. Convert Task Lists & Unordered/Ordered Lists
+    // 4. Task Lists & Bullet Lists
     result = result.replace(/<ul[^>]*>([\s\S]*?)<\/ul>/gi, (_, listContent) => {
         return (listContent
             .replace(/<li[^>]*>\s*<input[^>]*type="checkbox"[^>]*checked[^>]*>\s*([\s\S]*?)<\/li>/gi, '☑ $1\n')
@@ -73,29 +60,24 @@ function sanitizeRichHtml(html) {
             .replace(/<li[^>]*>([\s\S]*?)<\/li>/gi, (_match, item) => `${index++}. ${item.trim()}\n`)
             .trim() + '\n\n');
     });
-    // 5. Convert Pull Quotes / Asides
+    // 5. Clean Blockquotes & Dividers
     result = result.replace(/<aside[^>]*>([\s\S]*?)(?:<cite[^>]*>([\s\S]*?)<\/cite>)?<\/aside>/gi, (_, quote, cite) => {
         return `<blockquote>${quote.trim()}${cite ? `\n— <i>${cite.trim()}</i>` : ''}</blockquote>\n\n`;
     });
-    // 6. Convert Special Bot API 10.1 tags
     result = result.replace(/<tg-thinking[^>]*>([\s\S]*?)<\/tg-thinking>/gi, (_, c) => `<blockquote>💭 <i>${c.trim()}</i></blockquote>\n\n`);
     result = result.replace(/<tg-math-block[^>]*>([\s\S]*?)<\/tg-math-block>/gi, (_, c) => `<pre><code>${c.trim()}</code></pre>\n\n`);
     result = result.replace(/<tg-reference[^>]*>([\s\S]*?)<\/tg-reference>/gi, (_, c) => `<i>${c.trim()}</i>`);
     result = result.replace(/<mark[^>]*>([\s\S]*?)<\/mark>/gi, (_, c) => `<b>[${c.trim()}]</b>`);
-    // 7. Convert Figures & Captions
     result = result.replace(/<figure[^>]*>[\s\S]*?<figcaption[^>]*>([\s\S]*?)<\/figcaption><\/figure>/gi, (_, cap) => `\n<i>📷 ${cap.trim()}</i>\n`);
-    // 8. Convert Paragraphs & Linebreaks
     result = result.replace(/<p[^>]*>([\s\S]*?)<\/p>/gi, (_, c) => `${c.trim()}\n\n`);
     result = result.replace(/<footer[^>]*>([\s\S]*?)<\/footer>/gi, (_, c) => `<i>${c.trim()}</i>\n`);
     result = result.replace(/<br\s*\/?>/gi, '\n');
-    result = result.replace(/<hr\s*\/?>/gi, '──────────\n');
-    // 9. Strip unsupported media & sub/sup tags but keep text
+    result = result.replace(/<hr\s*\/?>/gi, '\n');
+    // Strip unsupported tags
     result = result.replace(/<sub[^>]*>([\s\S]*?)<\/sub>/gi, '$1');
     result = result.replace(/<sup[^>]*>([\s\S]*?)<\/sup>/gi, '$1');
     result = result.replace(/<tg-(map|collage|slideshow)[^>]*>([\s\S]*?)<\/tg-\1>/gi, '$2');
     result = result.replace(/<(img|video|audio|tg-map)[^>]*\/?>/gi, '');
-    // 10. Clean up extra newlines (> 2 consecutive newlines)
-    result = result.replace(/\n{3,}/g, '\n\n');
-    return result.trim();
+    return result.replace(/\n{3,}/g, '\n\n').trim();
 }
 exports.sanitizeRichHtml = sanitizeRichHtml;

package/lib/telegram.js

@@ -1272,22 +1272,66 @@ class Telegram extends client_1.default {
         });
     }
     /**
-     * Edit a rich message in-place while preserving 100% Native Rich UI layout (tables, headings, cards).
-     * @see https://core.telegram.org/bots/api#editrichmessage
-     */
-    async editRichMessage(chatId, messageId, richMessage, extra) {
+     * Universal in-place message editor with Modern Rich UI formatting.
+     */
+    async editRichMessage(chatId, messageId, content, extra) {
+        let htmlText = '';
+        let replyMarkup = extra?.reply_markup;
+        if (typeof content?.build === 'function') {
+            const built = content.build();
+            if (typeof built === 'object' && built !== null) {
+                htmlText = built.html || built.text || built.caption || '';
+                if (built.reply_markup) {
+                    replyMarkup = replyMarkup || built.reply_markup;
+                }
+            }
+            else {
+                htmlText = String(built || '');
+            }
+        }
+        else if (typeof content === 'object' && content !== null) {
+            htmlText = content.html || content.text || content.caption || '';
+            if (content.reply_markup) {
+                replyMarkup = replyMarkup || content.reply_markup;
+            }
+        }
+        else if (typeof content === 'string') {
+            htmlText = content;
+        }
+        // Format ke Telegram Modern HTML
+        htmlText = (0, rich_sanitizer_1.sanitizeRichHtml)(htmlText);
         const payload = {
             chat_id: chatId,
             message_id: Number(messageId),
-            rich_message: typeof richMessage?.build === 'function' ? richMessage.build() : richMessage,
+            text: htmlText,
+            parse_mode: 'HTML',
             ...extra,
         };
+        if (replyMarkup)
+            payload.reply_markup = replyMarkup;
         try {
-            return await this.callApi('editRichMessage', payload);
+            return await this.callApi('editMessageText', payload);
         }
         catch (err) {
             const desc = String(err?.description || err?.message || '');
-            // Silent ignore jika konten pesan tidak mengalami perubahan
+            // Fallback jika pesan berupa Media (Foto/Video)
+            if (desc.includes('no text in the message') || desc.includes('message to edit not found')) {
+                try {
+                    return await this.callApi('editMessageCaption', {
+                        chat_id: chatId,
+                        message_id: Number(messageId),
+                        caption: htmlText,
+                        parse_mode: 'HTML',
+                        reply_markup: replyMarkup,
+                        ...extra,
+                    });
+                }
+                catch (captionErr) {
+                    if (String(captionErr?.description).includes('message is not modified'))
+                        return false;
+                    throw captionErr;
+                }
+            }
             if (desc.includes('message is not modified')) {
                 return false;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teledzik",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Modern Telegram Bot Framework",
   "keywords": [
     "telekaf",

package/src/core/helpers/rich-sanitizer.ts

@@ -1,13 +1,6 @@
-/**
- * Converts Rich HTML strings (containing unsupported Telegram HTML tags like
- * <table>, <ul>, <ol>, <li>, <details>, <h1>-<h6>, <aside>, <p>, <hr>, etc.)
- * into standard Telegram HTML compatible with parse_mode: 'HTML' (editMessageText/sendMessage).
- */
-
-function convertTableToText(tableHtml: string): string {
+function formatTableToCard(tableHtml: string): string {
   const rows: string[][] = []
   const rowMatches = tableHtml.match(/<tr[^>]*>([\s\S]*?)<\/tr>/gi) || []
-
   for (const row of rowMatches) {
     const cells: string[] = []
     const cellMatches = row.match(/<(th|td)[^>]*>([\s\S]*?)<\/\1>/gi) || []
@@ -17,56 +10,41 @@ function convertTableToText(tableHtml: string): string {
     }
     if (cells.length > 0) rows.push(cells)
   }
-
   if (rows.length === 0) return ''
 
-  // Calculate column widths
-  const colWidths: number[] = []
-  rows.forEach((r) => {
-    r.forEach((c, idx) => {
-      const textLen = c.replace(/<[^>]+>/g, '').length
-      colWidths[idx] = Math.max(colWidths[idx] || 0, textLen)
+  // Header vs Row handling (Format sebagai Kartu Elegan)
+  const isKeyValue = rows.length > 1 && rows.every((r) => r.length === 2)
+  let cardText = ''
+  if (isKeyValue) {
+    const lines = rows.slice(1).map((r) => `• <b>${r[0]}:</b> ${r[1]}`)
+    cardText = `<blockquote>\n${lines.join('\n')}\n</blockquote>\n\n`
+  } else {
+    const lines = rows.map((r, idx) => {
+      if (idx === 0) return `<b>${r.join(' │ ')}</b>`
+      return `${r.join(' │ ')}`
     })
-  })
-
-  // Format table rows
-  const formattedRows = rows.map((r, rowIdx) => {
-    const line = r
-      .map((c, colIdx) => {
-        const textLen = c.replace(/<[^>]+>/g, '').length
-        const pad = ' '.repeat(Math.max(0, (colWidths[colIdx] || 0) - textLen))
-        return `${c}${pad}`
-      })
-      .join(' │ ')
-
-    if (rowIdx === 0 && rows.length > 1) {
-      const sep = colWidths.map((w) => '─'.repeat(w)).join('─┼─')
-      return `${line}\n${sep}`
-    }
-    return line
-  })
-
-  return `<pre>\n${formattedRows.join('\n')}\n</pre>\n\n`
+    cardText = `<blockquote>\n${lines.join('\n')}\n</blockquote>\n\n`
+  }
+  return cardText
 }
 
 export function sanitizeRichHtml(html: string): string {
   if (!html) return html
-
   let result = html
 
-  // 1. Convert Tables: <table>...</table> -> <pre>formatted table</pre>
-  result = result.replace(/<table[^>]*>([\s\S]*?)<\/table>/gi, (_, content) => convertTableToText(content))
+  // 1. Convert Tables to Clean Modern Cards
+  result = result.replace(/<table[^>]*>([\s\S]*?)<\/table>/gi, (_, content) => formatTableToCard(content))
 
-  // 2. Convert Details / Expandable: <details><summary>Title</summary>Content</details>
+  // 2. Convert Details to Telegram Native Expandable Blockquotes
   result = result.replace(/<details[^>]*>\s*<summary[^>]*>(.*?)<\/summary>([\s\S]*?)<\/details>/gi, (_, title, body) => {
-    return `<b>▶ ${title.trim()}</b>\n<blockquote>${body.trim()}</blockquote>\n\n`
+    return `<blockquote expandable><b>▶ ${title.trim()}</b>\n${body.trim()}</blockquote>\n\n`
   })
 
-  // 3. Convert Headings
-  result = result.replace(/<h1[^>]*>([\s\S]*?)<\/h1>/gi, (_, c) => `<b>${c.trim().toUpperCase()}</b>\n\n`)
+  // 3. Clean Headings
+  result = result.replace(/<h1[^>]*>([\s\S]*?)<\/h1>/gi, (_, c) => `<b>${c.trim()}</b>\n\n`)
   result = result.replace(/<h[2-6][^>]*>([\s\S]*?)<\/h[2-6]>/gi, (_, c) => `<b>${c.trim()}</b>\n\n`)
 
-  // 4. Convert Task Lists & Unordered/Ordered Lists
+  // 4. Task Lists & Bullet Lists
   result = result.replace(/<ul[^>]*>([\s\S]*?)<\/ul>/gi, (_, listContent) => {
     return (
       listContent
@@ -86,34 +64,28 @@ export function sanitizeRichHtml(html: string): string {
     )
   })
 
-  // 5. Convert Pull Quotes / Asides
+  // 5. Clean Blockquotes & Dividers
   result = result.replace(/<aside[^>]*>([\s\S]*?)(?:<cite[^>]*>([\s\S]*?)<\/cite>)?<\/aside>/gi, (_, quote, cite) => {
     return `<blockquote>${quote.trim()}${cite ? `\n— <i>${cite.trim()}</i>` : ''}</blockquote>\n\n`
   })
 
-  // 6. Convert Special Bot API 10.1 tags
   result = result.replace(/<tg-thinking[^>]*>([\s\S]*?)<\/tg-thinking>/gi, (_, c) => `<blockquote>💭 <i>${c.trim()}</i></blockquote>\n\n`)
   result = result.replace(/<tg-math-block[^>]*>([\s\S]*?)<\/tg-math-block>/gi, (_, c) => `<pre><code>${c.trim()}</code></pre>\n\n`)
   result = result.replace(/<tg-reference[^>]*>([\s\S]*?)<\/tg-reference>/gi, (_, c) => `<i>${c.trim()}</i>`)
   result = result.replace(/<mark[^>]*>([\s\S]*?)<\/mark>/gi, (_, c) => `<b>[${c.trim()}]</b>`)
 
-  // 7. Convert Figures & Captions
   result = result.replace(/<figure[^>]*>[\s\S]*?<figcaption[^>]*>([\s\S]*?)<\/figcaption><\/figure>/gi, (_, cap) => `\n<i>📷 ${cap.trim()}</i>\n`)
 
-  // 8. Convert Paragraphs & Linebreaks
   result = result.replace(/<p[^>]*>([\s\S]*?)<\/p>/gi, (_, c) => `${c.trim()}\n\n`)
   result = result.replace(/<footer[^>]*>([\s\S]*?)<\/footer>/gi, (_, c) => `<i>${c.trim()}</i>\n`)
   result = result.replace(/<br\s*\/?>/gi, '\n')
-  result = result.replace(/<hr\s*\/?>/gi, '──────────\n')
+  result = result.replace(/<hr\s*\/?>/gi, '\n')
 
-  // 9. Strip unsupported media & sub/sup tags but keep text
+  // Strip unsupported tags
   result = result.replace(/<sub[^>]*>([\s\S]*?)<\/sub>/gi, '$1')
   result = result.replace(/<sup[^>]*>([\s\S]*?)<\/sup>/gi, '$1')
   result = result.replace(/<tg-(map|collage|slideshow)[^>]*>([\s\S]*?)<\/tg-\1>/gi, '$2')
   result = result.replace(/<(img|video|audio|tg-map)[^>]*\/?>/gi, '')
 
-  // 10. Clean up extra newlines (> 2 consecutive newlines)
-  result = result.replace(/\n{3,}/g, '\n\n')
-
-  return result.trim()
+  return result.replace(/\n{3,}/g, '\n\n').trim()
 }

package/src/telegram.ts

@@ -1680,26 +1680,69 @@ export class Telegram extends ApiClient {
   }
 
   /**
-   * Edit a rich message in-place while preserving 100% Native Rich UI layout (tables, headings, cards).
-   * @see https://core.telegram.org/bots/api#editrichmessage
+   * Universal in-place message editor with Modern Rich UI formatting.
    */
   async editRichMessage(
     chatId: number | string,
     messageId: number | string,
-    richMessage: any,
+    content: any,
     extra?: any
   ): Promise<any> {
+    let htmlText = ''
+    let replyMarkup = extra?.reply_markup
+
+    if (typeof content?.build === 'function') {
+      const built = content.build()
+      if (typeof built === 'object' && built !== null) {
+        htmlText = built.html || built.text || built.caption || ''
+        if (built.reply_markup) {
+          replyMarkup = replyMarkup || built.reply_markup
+        }
+      } else {
+        htmlText = String(built || '')
+      }
+    } else if (typeof content === 'object' && content !== null) {
+      htmlText = content.html || content.text || content.caption || ''
+      if (content.reply_markup) {
+        replyMarkup = replyMarkup || content.reply_markup
+      }
+    } else if (typeof content === 'string') {
+      htmlText = content
+    }
+
+    // Format ke Telegram Modern HTML
+    htmlText = sanitizeRichHtml(htmlText)
+
     const payload: Record<string, any> = {
       chat_id: chatId,
       message_id: Number(messageId),
-      rich_message: typeof richMessage?.build === 'function' ? richMessage.build() : richMessage,
+      text: htmlText,
+      parse_mode: 'HTML',
       ...extra,
     }
+
+    if (replyMarkup) payload.reply_markup = replyMarkup
+
     try {
-      return await this.callApi('editRichMessage' as never, payload as never)
+      return await this.callApi('editMessageText' as never, payload as never)
     } catch (err: any) {
       const desc = String(err?.description || err?.message || '')
-      // Silent ignore jika konten pesan tidak mengalami perubahan
+      // Fallback jika pesan berupa Media (Foto/Video)
+      if (desc.includes('no text in the message') || desc.includes('message to edit not found')) {
+        try {
+          return await this.callApi('editMessageCaption' as never, {
+            chat_id: chatId,
+            message_id: Number(messageId),
+            caption: htmlText,
+            parse_mode: 'HTML',
+            reply_markup: replyMarkup,
+            ...extra,
+          } as never)
+        } catch (captionErr: any) {
+          if (String(captionErr?.description).includes('message is not modified')) return false
+          throw captionErr
+        }
+      }
       if (desc.includes('message is not modified')) {
         return false
       }

package/typings/core/helpers/rich-sanitizer.d.ts

@@ -1,6 +1 @@
-/**
- * Converts Rich HTML strings (containing unsupported Telegram HTML tags like
- * <table>, <ul>, <ol>, <li>, <details>, <h1>-<h6>, <aside>, <p>, <hr>, etc.)
- * into standard Telegram HTML compatible with parse_mode: 'HTML' (editMessageText/sendMessage).
- */
 export declare function sanitizeRichHtml(html: string): string;

package/typings/telegram.d.ts

@@ -690,9 +690,8 @@ export declare class Telegram extends ApiClient {
      */
     sendRichMessageDraft(chatId: number, draftId: number, richMessage: tg.InputRichMessage, extra?: tt.ExtraSendRichMessageDraft): Promise<never>;
     /**
-     * Edit a rich message in-place while preserving 100% Native Rich UI layout (tables, headings, cards).
-     * @see https://core.telegram.org/bots/api#editrichmessage
+     * Universal in-place message editor with Modern Rich UI formatting.
      */
-    editRichMessage(chatId: number | string, messageId: number | string, richMessage: any, extra?: any): Promise<any>;
+    editRichMessage(chatId: number | string, messageId: number | string, content: any, extra?: any): Promise<any>;
 }
 export default Telegram;