feat(satori): 添加对合并转发消息功能的支持 #3050
Open
+275
−100
Conversation
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
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey there - I've reviewed your changes - here's some feedback:
- You’ve introduced a lot of near-identical logic between the instance and static conversion methods—consider consolidating them into one reusable conversion function or a type→handler registry to eliminate duplication.
- The send and send_with_adapter methods share almost identical loops for building
content_parts—extract that into a single helper to keep your code DRY and easier to maintain. - Instead of special-casing Node/Nodes in the loop, consider folding their conversion into your main
_convert_component_to_satoripipeline so the send methods can treat all components uniformly.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- You’ve introduced a lot of near-identical logic between the instance and static conversion methods—consider consolidating them into one reusable conversion function or a type→handler registry to eliminate duplication.
- The send and send_with_adapter methods share almost identical loops for building `content_parts`—extract that into a single helper to keep your code DRY and easier to maintain.
- Instead of special-casing Node/Nodes in the loop, consider folding their conversion into your main `_convert_component_to_satori` pipeline so the send methods can treat all components uniformly.
## Individual Comments
### Comment 1
<location> `astrbot/core/platform/sources/satori/satori_event.py:188-197` </location>
<code_context>
+ async def _convert_component_to_satori(self, component) -> str:
</code_context>
<issue_to_address>
**suggestion:** The method returns an empty string for unhandled component types, which may silently drop unknown components.
Consider adding a warning or error log when an unrecognized component type is encountered to improve maintainability and debugging.
Suggested implementation:
```python
async def _convert_component_to_satori(self, component) -> str:
"""将单个消息组件转换为 Satori 格式"""
try:
if isinstance(component, Plain):
text = (
component.text.replace("&", "&")
.replace("<", "<")
.replace(">", ">")
)
return text
# Add a warning log for unrecognized component types
logger.warning(f"Unrecognized component type encountered: {type(component).__name__}")
return ""
```
If `logger` is not already imported in this file, you should add:
```python
from astrbot.core.utils import logger
```
or the appropriate import statement for your project's logger at the top of the file.
</issue_to_address>
### Comment 2
<location> `astrbot/core/platform/sources/satori/satori_event.py:262-268` </location>
<code_context>
+ content = "[转发消息]"
+
+ # 构建 Satori 格式的转发节点
+ author_attrs = []
+ if node.uin:
+ author_attrs.append(f'id="{node.uin}"')
+ if node.name:
+ author_attrs.append(f'name="{node.name}"')
+
+ author_attr_str = " ".join(author_attrs)
+
+ return f'<message><author {author_attr_str}/>{content}</message>'
</code_context>
<issue_to_address>
**issue (bug_risk):** Author attributes are concatenated without escaping, which may cause issues if values contain special characters.
Escape attribute values to prevent malformed XML when special characters are present.
</issue_to_address>
### Comment 3
<location> `astrbot/core/platform/sources/satori/satori_event.py:365-372` </location>
<code_context>
+ logger.error(f"转换转发节点失败: {e}")
+ return ""
+
+ async def _convert_nodes_to_satori(self, nodes: Nodes) -> str:
+ """将多个转发节点转换为 Satori 格式的合并转发"""
+ try:
+ node_parts = []
+
+ for node in nodes.nodes:
+ node_content = await self._convert_node_to_satori(node)
+ if node_content:
</code_context>
<issue_to_address>
**suggestion:** No handling for empty nodes list in _convert_nodes_to_satori.
Returning an empty string when nodes.nodes is empty could lead to confusion. Please add explicit handling for this case or log a warning to improve clarity.
```suggestion
async def _convert_nodes_to_satori(self, nodes: Nodes) -> str:
"""将多个转发节点转换为 Satori 格式的合并转发"""
try:
if not nodes.nodes:
logger.warning("尝试转换空的转发节点列表")
return ""
node_parts = []
for node in nodes.nodes:
node_content = await self._convert_node_to_satori(node)
if node_content:
```
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Comment on lines
+188
to
+197
| async def _convert_component_to_satori(self, component) -> str: | ||
| """将单个消息组件转换为 Satori 格式""" | ||
| try: | ||
| if isinstance(component, Plain): | ||
| text = ( | ||
| component.text.replace("&", "&") | ||
| .replace("<", "<") | ||
| .replace(">", ">") | ||
| ) | ||
| return text |
There was a problem hiding this comment.
suggestion: The method returns an empty string for unhandled component types, which may silently drop unknown components.
Consider adding a warning or error log when an unrecognized component type is encountered to improve maintainability and debugging.
Suggested implementation:
async def _convert_component_to_satori(self, component) -> str:
"""将单个消息组件转换为 Satori 格式"""
try:
if isinstance(component, Plain):
text = (
component.text.replace("&", "&")
.replace("<", "<")
.replace(">", ">")
)
return text
# Add a warning log for unrecognized component types
logger.warning(f"Unrecognized component type encountered: {type(component).__name__}")
return ""If logger is not already imported in this file, you should add:
from astrbot.core.utils import loggeror the appropriate import statement for your project's logger at the top of the file.
Comment on lines
+365
to
+372
| async def _convert_nodes_to_satori(self, nodes: Nodes) -> str: | ||
| """将多个转发节点转换为 Satori 格式的合并转发""" | ||
| try: | ||
| node_parts = [] | ||
|
|
||
| for node in nodes.nodes: | ||
| node_content = await self._convert_node_to_satori(node) | ||
| if node_content: |
There was a problem hiding this comment.
suggestion: No handling for empty nodes list in _convert_nodes_to_satori.
Returning an empty string when nodes.nodes is empty could lead to confusion. Please add explicit handling for this case or log a warning to improve clarity.
Suggested change
| async def _convert_nodes_to_satori(self, nodes: Nodes) -> str: | |
| """将多个转发节点转换为 Satori 格式的合并转发""" | |
| try: | |
| node_parts = [] | |
| for node in nodes.nodes: | |
| node_content = await self._convert_node_to_satori(node) | |
| if node_content: | |
| async def _convert_nodes_to_satori(self, nodes: Nodes) -> str: | |
| """将多个转发节点转换为 Satori 格式的合并转发""" | |
| try: | |
| if not nodes.nodes: | |
| logger.warning("尝试转换空的转发节点列表") | |
| return "" | |
| node_parts = [] | |
| for node in nodes.nodes: | |
| node_content = await self._convert_node_to_satori(node) | |
| if node_content: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Motivation / 动机
支持合并转发功能，在 Satori 适配器中添加对
Forward、Node、Nodes消息组件的支持。当前适配器缺少对这些组件的处理，导致发送合并转发消息时失败。
Modifications / 改动点
修改文件:
astrbot/core/platform/sources/satori/satori_event.py主要改动:
Forward、Node、Nodes组件类_convert_component_to_satori()和_convert_component_to_satori_static()_convert_node_to_satori()和_convert_node_to_satori_static()_convert_nodes_to_satori()和_convert_nodes_to_satori_static()send_with_adapter()和send()方法以支持转发组件支持的功能:
<message id="123456789" forward/><message forward><message><author id="123" name="用户"/>{内容}</message>...</message><message><author id="123" name="Alice"/>{内容}</message>Compatibility & Breaking Changes / 兼容性与破坏性变更
兼容性说明: 此变更完全向后兼容，只是新增功能，不会影响现有代码的正常运行。
Checklist / 检查清单
requirements.txt和pyproject.toml文件相应位置。/ I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations inrequirements.txtandpyproject.toml.Summary by Sourcery
在 Satori 适配器中启用合并转发消息，通过引入 Forward、Node 和 Nodes 转换，并整合组件到 Satori 的格式化逻辑
New Features:
Enhancements:
Original summary in English
Summary by Sourcery
Enable merged forwarding messages in the Satori adapter by introducing Forward, Node, and Nodes conversions and consolidating component-to-Satori formatting logic
New Features:
Enhancements: