opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: send chunk param mismatched, in edit msg use HTML parse mode too

Browse source
This commit is contained in:
Aleksandr Bortnikov 2026-03-18 12:26:07 +03:00
parent 7fc601b351
commit 5188bc778c
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
pkg/channels/telegram/telegram.go
View file

@ -203,7 +203,14 @@ func (c *TelegramChannel) Send(ctx context.Context, msg bus.OutboundMessage) err
continue continue
} }
if err := c.sendChunk(ctx, chatID, threadID, content, chunk, replyToID, useMarkdownV2); err != nil { if err := c.sendChunk(ctx, sendChunkParams{
chatID: chatID,
threadID: threadID,
content: content,
replyToID: replyToID,
mdFallback: chunk,
useMarkdownV2: useMarkdownV2,
}); err != nil {
return err return err
} }
// Only the first chunk should be a reply; subsequent chunks are normal messages. // Only the first chunk should be a reply; subsequent chunks are normal messages.
@ -213,25 +220,31 @@ func (c *TelegramChannel) Send(ctx context.Context, msg bus.OutboundMessage) err
return nil return nil
} }
type sendChunkParams struct {
chatID int64
threadID int
content string
replyToID string
mdFallback string
useMarkdownV2 bool
}
// sendChunk sends a single HTML/MarkdownV2 message, falling back to the original // sendChunk sends a single HTML/MarkdownV2 message, falling back to the original
// markdown as plain text on parse failure so users never see raw HTML/MarkdownV2 tags. // markdown as plain text on parse failure so users never see raw HTML/MarkdownV2 tags.
func (c *TelegramChannel) sendChunk( func (c *TelegramChannel) sendChunk(
ctx context.Context, ctx context.Context,
chatID int64, params sendChunkParams,
threadID int,
content, replyToID, mdFallback string,
useMarkdownV2 bool,
) error { ) error {
tgMsg := tu.Message(tu.ID(chatID), content) tgMsg := tu.Message(tu.ID(params.chatID), params.content)
tgMsg.MessageThreadID = threadID tgMsg.MessageThreadID = params.threadID
if useMarkdownV2 { if params.useMarkdownV2 {
tgMsg.WithParseMode(telego.ModeMarkdownV2) tgMsg.WithParseMode(telego.ModeMarkdownV2)
} else { } else {
tgMsg.WithParseMode(telego.ModeHTML) tgMsg.WithParseMode(telego.ModeHTML)
} }
if replyToID != "" { if params.replyToID != "" {
if mid, parseErr := strconv.Atoi(replyToID); parseErr == nil { if mid, parseErr := strconv.Atoi(params.replyToID); parseErr == nil {
tgMsg.ReplyParameters = &telego.ReplyParameters{ tgMsg.ReplyParameters = &telego.ReplyParameters{
MessageID: mid, MessageID: mid,
} }
@ -239,9 +252,9 @@ func (c *TelegramChannel) sendChunk(
} }
if _, err := c.bot.SendMessage(ctx, tgMsg); err != nil { if _, err := c.bot.SendMessage(ctx, tgMsg); err != nil {
logParseFailed(err, useMarkdownV2) logParseFailed(err, params.useMarkdownV2)
tgMsg.Text = mdFallback tgMsg.Text = params.mdFallback
tgMsg.ParseMode = "" tgMsg.ParseMode = ""
if _, err = c.bot.SendMessage(ctx, tgMsg); err != nil { if _, err = c.bot.SendMessage(ctx, tgMsg); err != nil {
return fmt.Errorf("telegram send: %w", channels.ErrTemporary) return fmt.Errorf("telegram send: %w", channels.ErrTemporary)
@ -298,8 +311,12 @@ func (c *TelegramChannel) EditMessage(ctx context.Context, chatID string, messag
return err return err
} }
parsedContent := parseContent(content, useMarkdownV2) parsedContent := parseContent(content, useMarkdownV2)
editMsg := tu.EditMessageText(tu.ID(cid), mid, parsedContent). editMsg := tu.EditMessageText(tu.ID(cid), mid, parsedContent)
WithParseMode(telego.ModeMarkdownV2) if useMarkdownV2 {
editMsg.WithParseMode(telego.ModeMarkdownV2)
} else {
editMsg.WithParseMode(telego.ModeHTML)
}
_, err = c.bot.EditMessageText(ctx, editMsg) _, err = c.bot.EditMessageText(ctx, editMsg)
if err != nil { if err != nil {
logParseFailed(err, useMarkdownV2) logParseFailed(err, useMarkdownV2)