teledzik 1.0.4 → 1.0.5

package/README.md

@@ -588,6 +588,43 @@ await ctx.sendRichMessage(msg, {
 
 ---
 
+### Universal `editRichMessage` (Omni-Format Support)
+
+Update existing messages or media captions in-place with **any** content format. It automatically detects Text vs Media (Photo/Video/Audio/Doc) and silently handles Telegram's `message is not modified` without throwing errors:
+
+```ts
+import { Telegraf, RichHTMLBuilder, Markup } from 'teledzik'
+
+bot.action('btn:update', async (ctx) => {
+  // 1. Using RichHTMLBuilder instance directly
+  const rich = new RichHTMLBuilder()
+    .heading(1, '⚡ Server Stats Updated')
+    .table([
+      ['Node', 'RAM', 'Status'],
+      ['VPS-01', '3.8 GB', 'ONLINE 🟢'],
+      ['VPS-02', '7.2 GB', 'ONLINE 🟢']
+    ], { bordered: true, striped: true, hasHeader: true })
+
+  await ctx.editRichMessage(rich, {
+    reply_markup: Markup.inlineKeyboard([
+      [Markup.button.primary('🔄 Refresh', 'btn:update')]
+    ]).reply_markup
+  })
+
+  // 2. Or using an Object
+  await ctx.editRichMessage({
+    html: '<b>New Content</b>',
+    reply_markup: { inline_keyboard: [] }
+  })
+
+  // 3. Or using Raw HTML String
+  await ctx.editRichMessage('<b>Updated via raw string</b>')
+
+  // 4. Or specifying a custom messageId
+  await ctx.editRichMessage(12345, '<b>Edit specific message ID</b>')
+})
+```
+
 ### Inline / Web App Queries
 
 Use `InputRichMessageContent` as `input_message_content` in inline query results:

package/lib/context.js

@@ -1069,12 +1069,39 @@ class Context {
         this.assert(this.chat, 'sendRichMessageDraft');
         return this.telegram.sendRichMessageDraft(this.chat.id, draftId, richMessage, extra);
     }
-    /**
-     * Edit current message with a rich message format.
-     */
-    editRichMessage(richMessage, extra) {
-        this.assert(this.msgId ?? this.inlineMessageId, 'editRichMessage');
-        return this.telegram.editRichMessage(this.chat?.id, this.msgId, this.inlineMessageId, richMessage, extra);
+    async editRichMessage(a, b, c) {
+        let targetMsgId;
+        let content;
+        let extra = {};
+        if (typeof a === 'number' ||
+            (typeof a === 'string' && !isNaN(Number(a)) && b !== undefined)) {
+            targetMsgId = a;
+            content = b;
+            extra = c || {};
+        }
+        else {
+            targetMsgId =
+                this.callbackQuery?.message?.message_id ??
+                    (this.message && 'message_id' in this.message ? this.message.message_id : undefined) ??
+                    (this.update && 'edited_message' in this.update && this.update.edited_message
+                        ? this.update.edited_message.message_id
+                        : undefined) ??
+                    this.msgId;
+            content = a;
+            extra = b || {};
+        }
+        const chatId = this.chat?.id ??
+            (this.callbackQuery?.message && 'chat' in this.callbackQuery.message
+                ? this.callbackQuery.message.chat.id
+                : undefined);
+        const inlineMsgId = this.inlineMessageId ?? extra?.inline_message_id;
+        if (!inlineMsgId && (!chatId || targetMsgId == null)) {
+            throw new Error('[teledzik] Tidak dapat menemukan chatId atau messageId dari konteks pesan saat ini.');
+        }
+        if (inlineMsgId && !extra.inline_message_id) {
+            extra.inline_message_id = inlineMsgId;
+        }
+        return this.telegram.editRichMessage(chatId, targetMsgId, content, extra);
     }
     /**
      * Enqueue a Telegram API call for the current chat to prevent 429 Too Many Requests errors.
@@ -1241,9 +1268,7 @@ const Msg = {
         return 'date' in this && this.date !== 0;
     },
     has(...keys) {
-        return keys.some((key) => 
-        // @ts-expect-error TS doesn't understand key
-        this[key] != undefined);
+        return keys.some((key) => this[key] != undefined);
     },
 };
 function getMessageFromAnySource(ctx) {

package/lib/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InputBox = exports.FormScene = exports.PaginatedBuilder = exports.sanitizeRichHtml = exports.AIStreamAdapter = exports.SmartQueue = exports.RichMessage = exports.Scenes = exports.MemorySessionStore = exports.session = exports.deunionize = exports.Format = exports.Input = exports.Markup = exports.Types = exports.Telegram = exports.TelegramError = exports.Router = exports.Composer = exports.Context = exports.Telegraf = void 0;
+exports.InputBox = exports.FormScene = exports.PaginatedBuilder = exports.sanitizeRichHtml = exports.AIStreamAdapter = exports.SmartQueue = exports.MD = exports.HTML = exports.RichMarkdownBuilder = exports.RichHTMLBuilder = exports.RichMessage = exports.Scenes = exports.MemorySessionStore = exports.session = exports.deunionize = exports.Format = exports.Input = exports.Markup = exports.Types = exports.Telegram = exports.TelegramError = exports.Router = exports.Composer = exports.Context = exports.Telegraf = void 0;
 var telegraf_1 = require("./telegraf");
 Object.defineProperty(exports, "Telegraf", { enumerable: true, get: function () { return telegraf_1.Telegraf; } });
 var context_1 = require("./context");
@@ -47,6 +47,11 @@ Object.defineProperty(exports, "session", { enumerable: true, get: function () {
 Object.defineProperty(exports, "MemorySessionStore", { enumerable: true, get: function () { return session_1.MemorySessionStore; } });
 exports.Scenes = __importStar(require("./scenes"));
 exports.RichMessage = __importStar(require("./core/types/rich-message"));
+var rich_message_1 = require("./core/types/rich-message");
+Object.defineProperty(exports, "RichHTMLBuilder", { enumerable: true, get: function () { return rich_message_1.RichHTMLBuilder; } });
+Object.defineProperty(exports, "RichMarkdownBuilder", { enumerable: true, get: function () { return rich_message_1.RichMarkdownBuilder; } });
+Object.defineProperty(exports, "HTML", { enumerable: true, get: function () { return rich_message_1.RichHTMLBuilder; } });
+Object.defineProperty(exports, "MD", { enumerable: true, get: function () { return rich_message_1.MD; } });
 var smart_queue_1 = require("./core/helpers/smart-queue");
 Object.defineProperty(exports, "SmartQueue", { enumerable: true, get: function () { return smart_queue_1.SmartQueue; } });
 var ai_stream_1 = require("./core/helpers/ai-stream");

package/lib/telegram.js

@@ -1271,18 +1271,97 @@ class Telegram extends client_1.default {
             ...extra,
         });
     }
-    /**
-     * Edit a sent rich message.
-     */
-    editRichMessage(chatId, messageId, inlineMessageId, richMessage, extra) {
-        return this.callApi('editMessageText', {
-            chat_id: chatId,
-            message_id: messageId,
-            inline_message_id: inlineMessageId,
-            text: richMessage.html ?? richMessage.markdown ?? '',
-            parse_mode: richMessage.html ? 'HTML' : richMessage.markdown ? 'MarkdownV2' : undefined,
+    async editRichMessage(chatId, messageId, contentOrInline, contentOrExtra, maybeExtra) {
+        let inlineMessageId;
+        let content;
+        let extra = {};
+        if (typeof contentOrInline === 'string' &&
+            (typeof contentOrExtra === 'object' || typeof contentOrExtra === 'string') &&
+            maybeExtra !== undefined) {
+            inlineMessageId = contentOrInline;
+            content = contentOrExtra;
+            extra = maybeExtra || {};
+        }
+        else {
+            content = contentOrInline;
+            extra = contentOrExtra || {};
+            inlineMessageId = extra?.inline_message_id;
+        }
+        let htmlText = '';
+        let replyMarkup = extra?.reply_markup;
+        // 1. Omni-format input extraction
+        if (content && 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 || content.markdown || '';
+            if (content.reply_markup) {
+                replyMarkup = replyMarkup || content.reply_markup;
+            }
+        }
+        else if (typeof content === 'string') {
+            htmlText = content;
+        }
+        // Sanitize rich HTML formatting (tables, headers, details, etc.)
+        htmlText = (0, rich_sanitizer_1.sanitizeRichHtml)(htmlText);
+        // 2. Prepare Base Payload
+        const isInline = Boolean(inlineMessageId || extra?.inline_message_id);
+        const basePayload = {
+            parse_mode: 'HTML',
             ...extra,
-        });
+        };
+        if (isInline) {
+            basePayload.inline_message_id = inlineMessageId || extra.inline_message_id;
+        }
+        else {
+            basePayload.chat_id = chatId;
+            basePayload.message_id = messageId != null ? Number(messageId) : undefined;
+        }
+        if (replyMarkup) {
+            basePayload.reply_markup = replyMarkup;
+        }
+        // 3. Execution with Auto-Detect (Text -> Caption Fallback) and Silent Error Handling
+        try {
+            return await this.callApi('editMessageText', {
+                ...basePayload,
+                text: htmlText,
+            });
+        }
+        catch (err) {
+            const desc = String(err?.description || err?.message || '');
+            // Fallback: If target is a Media message (Photo, Video, Audio, Document, Animation)
+            if (desc.includes('no text in the message') ||
+                desc.includes('there is no text in the message to edit') ||
+                desc.includes('message to edit not found')) {
+                try {
+                    return await this.callApi('editMessageCaption', {
+                        ...basePayload,
+                        caption: htmlText,
+                    });
+                }
+                catch (captionErr) {
+                    const capDesc = String(captionErr?.description || captionErr?.message || '');
+                    if (capDesc.includes('message is not modified')) {
+                        return false;
+                    }
+                    throw captionErr;
+                }
+            }
+            // Gracefully handle 'message is not modified'
+            if (desc.includes('message is not modified')) {
+                return false;
+            }
+            throw err;
+        }
     }
 }
 exports.Telegram = Telegram;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teledzik",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Modern Telegram Bot Framework",
   "keywords": [
     "telekaf",
@@ -12,7 +12,7 @@
     "botapi",
     "bot framework",
     "rich messages",
-    "bot api 1.0.1"
+    "bot api 1.0.5"
   ],
   "homepage": "https://telegraf.js.org",
   "bugs": {

package/src/context.ts

@@ -1407,17 +1407,61 @@ export class Context<U extends Deunionize<tg.Update> = tg.Update> {
   }
 
   /**
-   * Edit current message with a rich message format.
-   */
-  editRichMessage(richMessage: tg.InputRichMessage, extra?: object) {
-    this.assert(this.msgId ?? this.inlineMessageId, 'editRichMessage')
-    return this.telegram.editRichMessage(
-      this.chat?.id,
-      this.msgId,
-      this.inlineMessageId,
-      richMessage,
-      extra
-    )
+   * Universal Context shortcut to edit message with Omni-Format support (RichHTMLBuilder, Object, or String),
+   * auto-detection of Text vs Media Caption, and silent 'not modified' error handling.
+   */
+  editRichMessage(
+    content: tg.RichContentInput,
+    extra?: tg.EditRichOptions
+  ): Promise<any>
+  editRichMessage(
+    messageId: number | string,
+    content: tg.RichContentInput,
+    extra?: tg.EditRichOptions
+  ): Promise<any>
+  async editRichMessage(a: any, b?: any, c?: any): Promise<any> {
+    let targetMsgId: number | string | undefined
+    let content: any
+    let extra: any = {}
+
+    if (
+      typeof a === 'number' ||
+      (typeof a === 'string' && !isNaN(Number(a)) && b !== undefined)
+    ) {
+      targetMsgId = a
+      content = b
+      extra = c || {}
+    } else {
+      targetMsgId =
+        this.callbackQuery?.message?.message_id ??
+        (this.message && 'message_id' in this.message ? this.message.message_id : undefined) ??
+        (this.update && 'edited_message' in this.update && this.update.edited_message
+          ? this.update.edited_message.message_id
+          : undefined) ??
+        this.msgId
+      content = a
+      extra = b || {}
+    }
+
+    const chatId =
+      this.chat?.id ??
+      (this.callbackQuery?.message && 'chat' in this.callbackQuery.message
+        ? this.callbackQuery.message.chat.id
+        : undefined)
+
+    const inlineMsgId = this.inlineMessageId ?? extra?.inline_message_id
+
+    if (!inlineMsgId && (!chatId || targetMsgId == null)) {
+      throw new Error(
+        '[teledzik] Tidak dapat menemukan chatId atau messageId dari konteks pesan saat ini.'
+      )
+    }
+
+    if (inlineMsgId && !extra.inline_message_id) {
+      extra.inline_message_id = inlineMsgId
+    }
+
+    return this.telegram.editRichMessage(chatId, targetMsgId, content, extra)
   }
 
   /**
@@ -1650,18 +1694,14 @@ interface Msg {
   ): this is MaybeMessage<Keyed<tg.Message, Ks[number]>>
 }
 
-const Msg: Msg = {
-  isAccessible() {
+const Msg = {
+  isAccessible(this: any) {
     return 'date' in this && this.date !== 0
   },
-  has(...keys) {
-    return keys.some(
-      (key) =>
-        // @ts-expect-error TS doesn't understand key
-        this[key] != undefined
-    )
+  has(this: any, ...keys: string[]) {
+    return keys.some((key) => this[key] != undefined)
   },
-}
+} as Msg
 
 export type MaybeMessage<
   M extends tg.MaybeInaccessibleMessage = tg.MaybeInaccessibleMessage,

package/src/core/types/rich-message.ts

@@ -32,6 +32,21 @@ export interface InputRichMessageContent {
   rich_message: InputRichMessage
 }
 
+export interface EditRichOptions {
+  reply_markup?: any
+  disable_web_page_preview?: boolean
+  link_preview_options?: any
+  inline_message_id?: string
+  [key: string]: any
+}
+
+export type RichContentInput =
+  | string
+  | { html?: string; text?: string; caption?: string; markdown?: string; reply_markup?: any }
+  | { build(): string | InputRichMessage | { html?: string; text?: string; reply_markup?: any } }
+  | InputRichMessage
+
+
 // ---------------------------------------------------------------------------
 // HTML Builder
 // ---------------------------------------------------------------------------

package/src/index.ts

@@ -16,6 +16,7 @@ export { session, MemorySessionStore, SessionStore } from './session'
 
 export * as Scenes from './scenes'
 export * as RichMessage from './core/types/rich-message'
+export { RichHTMLBuilder, RichMarkdownBuilder, RichHTMLBuilder as HTML, MD } from './core/types/rich-message'
 
 export { SmartQueue } from './core/helpers/smart-queue'
 export { AIStreamAdapter } from './core/helpers/ai-stream'

package/src/telegram.ts

@@ -1680,23 +1680,127 @@ export class Telegram extends ApiClient {
   }
 
   /**
-   * Edit a sent rich message.
+   * Universal editRichMessage to update text or media captions in-place with Omni-Format support.
+   * Auto-detects Text vs Media Caption and gracefully handles 'message is not modified'.
    */
-  editRichMessage(
+  async editRichMessage(
     chatId: number | string | undefined,
-    messageId: number | undefined,
+    messageId: number | string | undefined,
+    content: any,
+    extra?: any
+  ): Promise<any>
+  async editRichMessage(
+    chatId: number | string | undefined,
+    messageId: number | string | undefined,
     inlineMessageId: string | undefined,
-    richMessage: tg.InputRichMessage,
-    extra?: object
-  ) {
-    return this.callApi('editMessageText' as never, {
-      chat_id: chatId,
-      message_id: messageId,
-      inline_message_id: inlineMessageId,
-      text: richMessage.html ?? richMessage.markdown ?? '',
-      parse_mode: richMessage.html ? 'HTML' : richMessage.markdown ? 'MarkdownV2' : undefined,
+    content: any,
+    extra?: any
+  ): Promise<any>
+  async editRichMessage(
+    chatId: number | string | undefined,
+    messageId: number | string | undefined,
+    contentOrInline: any,
+    contentOrExtra?: any,
+    maybeExtra?: any
+  ): Promise<any> {
+    let inlineMessageId: string | undefined
+    let content: any
+    let extra: any = {}
+
+    if (
+      typeof contentOrInline === 'string' &&
+      (typeof contentOrExtra === 'object' || typeof contentOrExtra === 'string') &&
+      maybeExtra !== undefined
+    ) {
+      inlineMessageId = contentOrInline
+      content = contentOrExtra
+      extra = maybeExtra || {}
+    } else {
+      content = contentOrInline
+      extra = contentOrExtra || {}
+      inlineMessageId = extra?.inline_message_id
+    }
+
+    let htmlText = ''
+    let replyMarkup = extra?.reply_markup
+
+    // 1. Omni-format input extraction
+    if (content && 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 || content.markdown || ''
+      if (content.reply_markup) {
+        replyMarkup = replyMarkup || content.reply_markup
+      }
+    } else if (typeof content === 'string') {
+      htmlText = content
+    }
+
+    // Sanitize rich HTML formatting (tables, headers, details, etc.)
+    htmlText = sanitizeRichHtml(htmlText)
+
+    // 2. Prepare Base Payload
+    const isInline = Boolean(inlineMessageId || extra?.inline_message_id)
+    const basePayload: any = {
+      parse_mode: 'HTML',
       ...extra,
-    } as never)
+    }
+
+    if (isInline) {
+      basePayload.inline_message_id = inlineMessageId || extra.inline_message_id
+    } else {
+      basePayload.chat_id = chatId
+      basePayload.message_id = messageId != null ? Number(messageId) : undefined
+    }
+
+    if (replyMarkup) {
+      basePayload.reply_markup = replyMarkup
+    }
+
+    // 3. Execution with Auto-Detect (Text -> Caption Fallback) and Silent Error Handling
+    try {
+      return await this.callApi('editMessageText' as never, {
+        ...basePayload,
+        text: htmlText,
+      } as never)
+    } catch (err: any) {
+      const desc = String(err?.description || err?.message || '')
+
+      // Fallback: If target is a Media message (Photo, Video, Audio, Document, Animation)
+      if (
+        desc.includes('no text in the message') ||
+        desc.includes('there is no text in the message to edit') ||
+        desc.includes('message to edit not found')
+      ) {
+        try {
+          return await this.callApi('editMessageCaption' as never, {
+            ...basePayload,
+            caption: htmlText,
+          } as never)
+        } catch (captionErr: any) {
+          const capDesc = String(captionErr?.description || captionErr?.message || '')
+          if (capDesc.includes('message is not modified')) {
+            return false
+          }
+          throw captionErr
+        }
+      }
+
+      // Gracefully handle 'message is not modified'
+      if (desc.includes('message is not modified')) {
+        return false
+      }
+
+      throw err
+    }
   }
 }
 

package/typings/context.d.ts

@@ -591,9 +591,11 @@ export declare class Context<U extends Deunionize<tg.Update> = tg.Update> {
      */
     sendRichMessageDraft(draftId: number, richMessage: tg.InputRichMessage, extra?: tt.ExtraSendRichMessageDraft): Promise<never>;
     /**
-     * Edit current message with a rich message format.
+     * Universal Context shortcut to edit message with Omni-Format support (RichHTMLBuilder, Object, or String),
+     * auto-detection of Text vs Media Caption, and silent 'not modified' error handling.
      */
-    editRichMessage(richMessage: tg.InputRichMessage, extra?: object): Promise<never>;
+    editRichMessage(content: tg.RichContentInput, extra?: tg.EditRichOptions): Promise<any>;
+    editRichMessage(messageId: number | string, content: tg.RichContentInput, extra?: tg.EditRichOptions): Promise<any>;
     /**
      * Enqueue a Telegram API call for the current chat to prevent 429 Too Many Requests errors.
      */

package/typings/core/types/rich-message.d.ts

@@ -24,6 +24,26 @@ export interface InputRichMessage {
 export interface InputRichMessageContent {
     rich_message: InputRichMessage;
 }
+export interface EditRichOptions {
+    reply_markup?: any;
+    disable_web_page_preview?: boolean;
+    link_preview_options?: any;
+    inline_message_id?: string;
+    [key: string]: any;
+}
+export type RichContentInput = string | {
+    html?: string;
+    text?: string;
+    caption?: string;
+    markdown?: string;
+    reply_markup?: any;
+} | {
+    build(): string | InputRichMessage | {
+        html?: string;
+        text?: string;
+        reply_markup?: any;
+    };
+} | InputRichMessage;
 /**
  * Fluent builder for Rich Messages using HTML format.
  *

package/typings/index.d.ts

@@ -13,6 +13,7 @@ export { deunionize } from './core/helpers/deunionize';
 export { session, MemorySessionStore, SessionStore } from './session';
 export * as Scenes from './scenes';
 export * as RichMessage from './core/types/rich-message';
+export { RichHTMLBuilder, RichMarkdownBuilder, RichHTMLBuilder as HTML, MD } from './core/types/rich-message';
 export { SmartQueue } from './core/helpers/smart-queue';
 export { AIStreamAdapter } from './core/helpers/ai-stream';
 export { sanitizeRichHtml } from './core/helpers/rich-sanitizer';

package/typings/telegram.d.ts

@@ -690,8 +690,10 @@ export declare class Telegram extends ApiClient {
      */
     sendRichMessageDraft(chatId: number, draftId: number, richMessage: tg.InputRichMessage, extra?: tt.ExtraSendRichMessageDraft): Promise<never>;
     /**
-     * Edit a sent rich message.
+     * Universal editRichMessage to update text or media captions in-place with Omni-Format support.
+     * Auto-detects Text vs Media Caption and gracefully handles 'message is not modified'.
      */
-    editRichMessage(chatId: number | string | undefined, messageId: number | undefined, inlineMessageId: string | undefined, richMessage: tg.InputRichMessage, extra?: object): Promise<never>;
+    editRichMessage(chatId: number | string | undefined, messageId: number | string | undefined, content: any, extra?: any): Promise<any>;
+    editRichMessage(chatId: number | string | undefined, messageId: number | string | undefined, inlineMessageId: string | undefined, content: any, extra?: any): Promise<any>;
 }
 export default Telegram;