fix(telegram): skip rich entity detection for oauth emails · openclaw/openclaw@51eec3a

Recent Commits to openclaw:main

keshavbotage · 2026-06-24 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1239,6 +1239,33 @@ describe("deliverReplies", () => {`
`1239`	`1239`	`expect(mockCallArg(sendRichMessage, 1, 0)).not.toHaveProperty("reply_to_message_id");`
`1240`	`1240`	`});`
`1241`	`1241`
	`1242`	`+it("skips rich entity detection for reply text with provider-prefixed email addresses", async () => {`
	`1243`	`+const runtime = createRuntime();`
	`1244`	`+const sendMessage = vi.fn().mockResolvedValue({`
	`1245`	`+message_id: 11,`
	`1246`	`+chat: { id: "123" },`
	`1247`	`+});`
	`1248`	`+const bot = createBot({ sendMessage });`
	`1249`	`+`
	`1250`	`+await deliverWith({`
	`1251`	`+replies: [`
	`1252`	`+{ text: "OAuth profile: openai:keshavbotagent@gmail.com (keshavbotagent@gmail.com)" },`
	`1253`	`+],`
	`1254`	`+ runtime,`
	`1255`	`+ bot,`
	`1256`	`+richMessages: true,`
	`1257`	`+});`
	`1258`	`+`
	`1259`	`+const raw = bot.api.raw as unknown as {`
	`1260`	`+sendRichMessage: ReturnType<typeof vi.fn>;`
	`1261`	`+};`
	`1262`	`+const richMessage = raw.sendRichMessage.mock.calls[0]?.[0]?.rich_message;`
	`1263`	`+expect(richMessage).toEqual({`
	`1264`	`+html: "OAuth profile: openai:keshavbotagent@gmail.com (keshavbotagent@gmail.com)",`
	`1265`	`+skip_entity_detection: true,`
	`1266`	`+});`
	`1267`	`+});`
	`1268`	`+`
`1242`	`1269`	`it("uses legacy reply id when selected reply target differs from quote source", async () => {`
`1243`	`1270`	`const runtime = createRuntime();`
`1244`	`1271`	`const sendMessage = vi.fn().mockResolvedValue({`

Original file line number	Diff line number	Diff line change
`@@ -690,6 +690,22 @@ describe("createTelegramDraftStream", () => {`
`690`	`690`	`expect(api.editMessageText).not.toHaveBeenCalled();`
`691`	`691`	`});`
`692`	`692`
	`693`	`+it("skips rich entity detection for draft text with provider-prefixed email addresses", async () => {`
	`694`	`+const api = createMockDraftApi();`
	`695`	`+const stream = createDraftStream(api, { richMessages: true });`
	`696`	`+`
	`697`	`+stream.update("OAuth profile: openai:keshavbotagent@gmail.com (keshavbotagent@gmail.com)");`
	`698`	`+await stream.flush();`
	`699`	`+`
	`700`	`+expect(api.raw.sendRichMessage).toHaveBeenCalledWith({`
	`701`	`+chat_id: 123,`
	`702`	`+rich_message: {`
	`703`	`+html: "OAuth profile: openai:keshavbotagent@gmail.com (keshavbotagent@gmail.com)",`
	`704`	`+skip_entity_detection: true,`
	`705`	`+},`
	`706`	`+});`
	`707`	`+});`
	`708`	`+`
`693`	`709`	`it("keeps rich preview html out of plain preview gating", async () => {`
`694`	`710`	`const api = createMockDraftApi();`
`695`	`711`	`const stream = createDraftStream(api, { richMessages: true, minInitialChars: 10 });`

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,16 @@ type TelegramApiWithRichRaw = Bot["api"] & {`
`96`	`96`	`raw?: TelegramRichRawApi;`
`97`	`97`	`};`
`98`	`98`
	`99`	`+const TELEGRAM_RICH_EMAIL_TOKEN_RE =`
	`100`	+/[A-Z0-9.!#$%&'*+/=?^_`{\|}~-]+@[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?(?:\.[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?)+/iu;
	`101`	`+`
	`102`	`+function shouldSkipTelegramRichEntityDetection(`
	`103`	`+text: string,`
	`104`	`+options?: Pick<TelegramRichMessageOptions, "skipEntityDetection">,`
	`105`	`+): boolean {`
	`106`	`+return options?.skipEntityDetection === true \|\| TELEGRAM_RICH_EMAIL_TOKEN_RE.test(text);`
	`107`	`+}`
	`108`	`+`
`99`	`109`	`export function getTelegramRichRawApi(api: Bot["api"]): TelegramRichRawApi {`
`100`	`110`	`const raw = (api as TelegramApiWithRichRaw).raw;`
`101`	`111`	`if (raw) {`
`@@ -164,15 +174,25 @@ export function buildTelegramRichMarkdown(`
`164`	`174`	`markdown: string,`
`165`	`175`	`options?: TelegramRichMessageOptions,`
`166`	`176`	`): TelegramInputRichMessage {`
`167`		`-return buildTelegramRichHtml(markdownToTelegramRichHtml(markdown, options), options);`
	`177`	`+const skipEntityDetection = shouldSkipTelegramRichEntityDetection(markdown, options);`
	`178`	`+return buildTelegramRichHtml(`
	`179`	`+markdownToTelegramRichHtml(markdown, {`
	`180`	`+ ...options,`
	`181`	`+ skipEntityDetection,`
	`182`	`+}),`
	`183`	`+{`
	`184`	`+ ...options,`
	`185`	`+ skipEntityDetection,`
	`186`	`+},`
	`187`	`+);`
`168`	`188`	`}`
`169`	`189`
`170`	`190`	`export function buildTelegramRichHtml(`
`171`	`191`	`html: string,`
`172`	`192`	`options?: TelegramRichMessageOptions,`
`173`	`193`	`): TelegramInputRichMessage {`
`174`	`194`	`const safeHtml = prepareTelegramRichHtml(html);`
`175`		`-return options?.skipEntityDetection === true`
	`195`	`+return shouldSkipTelegramRichEntityDetection(safeHtml, options)`
`176`	`196`	`? { html: safeHtml, skip_entity_detection: true }`
`177`	`197`	`: { html: safeHtml };`
`178`	`198`	`}`
`@@ -418,11 +438,14 @@ export function splitTelegramRichMessageTextChunks(params: {`
`418`	`438`	`tableMode?: MarkdownTableMode;`
`419`	`439`	`skipEntityDetection?: boolean;`
`420`	`440`	`}): TelegramRichTextChunk[] {`
	`441`	`+const skipEntityDetection = shouldSkipTelegramRichEntityDetection(params.text, {`
	`442`	`+skipEntityDetection: params.skipEntityDetection,`
	`443`	`+});`
`421`	`444`	`const renderMarkdownChunk = (chunk: string) =>`
`422`	`445`	`prepareTelegramRichHtml(`
`423`	`446`	`markdownToTelegramRichHtml(chunk, {`
`424`	`447`	`tableMode: params.tableMode,`
`425`		`-skipEntityDetection: params.skipEntityDetection,`
	`448`	`+ skipEntityDetection,`
`426`	`449`	`}),`
`427`	`450`	`);`
`428`	`451`	`const htmlChunks =`

Original file line number	Diff line number	Diff line change
`@@ -956,6 +956,33 @@ describe("sendMessageTelegram", () => {`
`956`	`956`	`expect(richMessage?.html).toContain("<table>");`
`957`	`957`	`});`
`958`	`958`
	`959`	`+it("skips rich entity detection for provider-prefixed email text", async () => {`
	`960`	`+botApi.sendMessage.mockResolvedValue({ message_id: 45, chat: { id: "123" } });`
	`961`	`+`
	`962`	`+await sendMessageTelegram(`
	`963`	`+"123",`
	`964`	`+"OAuth profile: openai:keshavbotagent@gmail.com (keshavbotagent@gmail.com)",`
	`965`	`+{`
	`966`	`+cfg: {`
	`967`	`+channels: {`
	`968`	`+telegram: {`
	`969`	`+richMessages: true,`
	`970`	`+},`
	`971`	`+},`
	`972`	`+},`
	`973`	`+token: "tok",`
	`974`	`+},`
	`975`	`+);`
	`976`	`+`
	`977`	`+expect(botRawApi.sendRichMessage).toHaveBeenCalledTimes(1);`
	`978`	`+const richMessage = botRawApi.sendRichMessage.mock.calls[0]?.[0]?.rich_message;`
	`979`	`+expect(richMessage).toEqual({`
	`980`	`+html: "OAuth profile: openai:keshavbotagent@gmail.com (keshavbotagent@gmail.com)",`
	`981`	`+skip_entity_detection: true,`
	`982`	`+});`
	`983`	`+expect(richMessage?.html).not.toContain("mailto:");`
	`984`	`+});`
	`985`	`+`
`959`	`986`	`it.each([`
`960`	`987`	`{`
`961`	`988`	`name: "list",`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main