From dd45e13cb1195207e4d52164f6e92055d21f03ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=85=E8=86=80?= Date: Fri, 23 Oct 2026 23:23:05 +0800 Subject: [PATCH] fix(telegram): keep editable messages as text Guessing photo versus text from message content makes later edits use the wrong API and a smaller caption budget. Always send text and use the avatar as a link preview. --- server/lib/drivers/telegram/index.ts | 46 +++++++++++++++------------- tests/telegram.test.ts | 15 +++++++-- 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/server/lib/drivers/telegram/index.ts b/server/lib/drivers/telegram/index.ts index d3560b9..0e22eb8 100644 --- a/server/lib/drivers/telegram/index.ts +++ b/server/lib/drivers/telegram/index.ts @@ -1,7 +1,7 @@ import MarkdownIt from "markdown-it"; import type { RouteTarget, Env, NeutralMessage } from "../../types"; import type { PlatformDriver, SendResult } from "../types"; -import { sendMessage, sendPhoto, editMessageText, editMessageCaption } from "./rest"; +import { sendMessage, editMessageText } from "./rest"; import { renderNeutralMessage } from "./render"; const markdown = new MarkdownIt({ html: false, linkify: false, breaks: false, typographer: false }); @@ -23,6 +23,19 @@ function richHeaderUrl(message: NeutralMessage, avatar: string, host: string): s return `${host.replace(/\/+$/, "")}/api/richheader?${params.toString()}`; } +/** + * The avatar shown above the text as a link preview: the rich-header card + * when a host serves it, the plain (small) avatar image otherwise. Messages + * are always text messages (never photos with captions), so every edit is an + * `editMessageText` with the full 4096-character budget. + */ +function previewUrl(message: NeutralMessage, env: Env): string | undefined { + const avatar = message.author?.iconUrl; + if (!avatar) return undefined; + const richHeaderHost = env.TELEGRAM_RICH_HEADER_HOST ?? env.BASE_URL; + return richHeaderHost ? richHeaderUrl(message, avatar, richHeaderHost) : smallAvatar(avatar); +} + export class TelegramDriver implements PlatformDriver { readonly id = "telegram"; @@ -33,16 +46,7 @@ export class TelegramDriver implements PlatformDriver { } const token = env.TELEGRAM_TOKEN ?? ""; const text = renderNeutralMessage(message); - const avatar = message.author?.iconUrl; - const richHeaderHost = env.TELEGRAM_RICH_HEADER_HOST ?? env.BASE_URL; - if (avatar && richHeaderHost) { - const rhUrl = richHeaderUrl(message, avatar, richHeaderHost); - return sendMessage(token, chatId, text, target.topicId, rhUrl); - } - if (avatar) { - return sendPhoto(token, chatId, smallAvatar(avatar), text, target.topicId); - } - return sendMessage(token, chatId, text, target.topicId); + return sendMessage(token, chatId, text, target.topicId, previewUrl(message, env)); } async edit( @@ -57,15 +61,15 @@ export class TelegramDriver implements PlatformDriver { } const token = env.TELEGRAM_TOKEN ?? ""; const text = renderNeutralMessage(message); - const avatar = message.author?.iconUrl; - const richHeaderHost = env.TELEGRAM_RICH_HEADER_HOST ?? env.BASE_URL; - if (avatar && richHeaderHost) { - const rhUrl = richHeaderUrl(message, avatar, richHeaderHost); - return editMessageText(token, chatId, messageId, text, target.topicId, rhUrl); - } - if (avatar) { - return editMessageCaption(token, chatId, messageId, text, target.topicId); - } - return editMessageText(token, chatId, messageId, text, target.topicId); + // A photo sent by an older version has no text to edit; Telegram's error + // then makes dispatch send a fresh message instead. + return editMessageText( + token, + chatId, + messageId, + text, + target.topicId, + previewUrl(message, env), + ); } } diff --git a/tests/telegram.test.ts b/tests/telegram.test.ts index 911da95..bd3012c 100644 --- a/tests/telegram.test.ts +++ b/tests/telegram.test.ts @@ -224,9 +224,11 @@ describe("TelegramDriver", () => { ); }); - it("sends a small avatar photo (s=64) when the author has an icon", async () => { + it("shows a small avatar (s=64) as the link preview of a text message", async () => { let capturedInit: RequestInit | undefined; + let capturedUrl = ""; mockFetch((url, init) => { + capturedUrl = url; capturedInit = init; return new Response(JSON.stringify({ ok: true, result: { message_id: 9 } }), { status: 200 }); }); @@ -242,8 +244,15 @@ describe("TelegramDriver", () => { ); expect(result.ok).toBe(true); - const body = JSON.parse(String(capturedInit!.body)) as Record; - expect(body.photo).toBe("https://avatars.githubusercontent.com/u/1?v=4&s=64"); + // A text message (never a captioned photo), so later edits keep the full + // 4096-character budget. + expect(capturedUrl).toContain("/sendMessage"); + const body = JSON.parse(String(capturedInit!.body)) as { + link_preview_options?: { url?: string }; + }; + expect(body.link_preview_options?.url).toBe( + "https://avatars.githubusercontent.com/u/1?v=4&s=64", + ); }); it("sends a plain message when the author has no icon", async () => {