fix(telegram): preserve attachment captions#7020
Merged
Soulter merged 2 commits intoAstrBotDevs:masterfrom Mar 27, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Hey - I've left some high level feedback:
- Consider passing
messageandupdateas parameters into_apply_captioninstead of relying on closure variables to make the helper side effects clearer and easier to reuse or refactor later. - In
_apply_caption,caption_entitiesare processed even ifcaptionis falsy; adding a guard so entities are only handled whenmessage.message_stris set would avoid relying on Telegram always sending a caption alongside caption entities.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- Consider passing `message` and `update` as parameters into `_apply_caption` instead of relying on closure variables to make the helper side effects clearer and easier to reuse or refactor later.
- In `_apply_caption`, `caption_entities` are processed even if `caption` is falsy; adding a guard so entities are only handled when `message.message_str` is set would avoid relying on Telegram always sending a caption alongside caption entities.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors the Telegram adapter to consistently handle captions and mentions across various media types, including photos, documents, and videos, by introducing a centralized _apply_caption helper function. It also includes updates to the test mocks and new unit tests for document and video captions. A review comment suggests improving the robustness of the caption entity processing by explicitly checking for the existence of the caption before slicing and using the original caption string for more reliable entity extraction.
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Soulter
approved these changes
Mar 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
这次 PR 修复了 Telegram 附件消息 caption 处理不一致的问题。
之前
photo会保留 caption,但document和video不会,导致用户在 Telegram 中给文件或视频填写的说明文字不会进入message_str和Comp.Plain(...),上层依赖这些字段的逻辑拿不到用户说明。Changes
document和video消息补上 caption 注入message.message_strComp.Plain(...)caption_entities中mention的处理行为一致ContextTypes.DEFAULT_TYPEValidation
已执行:
ruff check astrbot/core/platform/sources/telegram/tg_adapter.py tests/test_telegram_adapter.py tests/fixtures/mocks/telegram.pypython -m pytest tests/test_telegram_adapter.py -q结果:
2 passedScope
这次只改了:
astrbot/core/platform/sources/telegram/tg_adapter.pytests/fixtures/mocks/telegram.pytests/test_telegram_adapter.pyCloses #7000
Checklist / 检查清单
😊 If there are new features added in the PR, I have discussed it with the authors through issues/emails, etc.
/ 如果 PR 中有新加入的功能,已经通过 Issue / 邮件等方式和作者讨论过。
👀 My changes have been well-tested, and "Verification Steps" and "Screenshots" have been provided above.
/ 我的更改经过了良好的测试,并已在上方提供了“验证步骤”和“运行截图”。
🤓 I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations in
requirements.txtandpyproject.toml./ 我确保没有引入新依赖库,或者引入了新依赖库的同时将其添加到
requirements.txt和pyproject.toml文件相应位置。😮 My changes do not introduce malicious code.
/ 我的更改没有引入恶意代码。
Summary by Sourcery
Ensure Telegram adapter preserves and propagates captions for media messages while adding coverage for these behaviors.
Bug Fixes:
Enhancements:
Tests: