BruceSun
/
MaiBot
mirror of https://github.com/Mai-with-u/MaiBot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix expression learner text fallback

pull/1322/head
magisk317 2025-10-26 10:55:22 +08:00
parent c5b9bc4927
commit c1f69d65bb
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/chat/utils/chat_message_builder.py
View File

@ -983,8 +983,8 @@ async def build_bare_messages(messages: List[DatabaseMessages]) -> str:
output_lines = [] output_lines = []
for msg in messages: for msg in messages:
# 获取纯文本内容 # 获取纯文本内容，优先使用processed_plain_text，回退到display_message
content = msg.processed_plain_text or "" content = msg.processed_plain_text or getattr(msg, "display_message", None) or ""
# 处理图片ID # 处理图片ID
pic_pattern = r"\[picid:[^\]]+\]" pic_pattern = r"\[picid:[^\]]+\]"

11
src/express/expression_learner.py
View File

@ -438,7 +438,12 @@ class ExpressionLearner:
continue continue
prev_original_idx = bare_lines[pos - 1][0] prev_original_idx = bare_lines[pos - 1][0]
up_content = filter_message_content(random_msg[prev_original_idx].processed_plain_text or "") source_content = (
random_msg[prev_original_idx].processed_plain_text
or getattr(random_msg[prev_original_idx], "display_message", None)
or ""
)
up_content = filter_message_content(source_content)
if not up_content: if not up_content:
# 上一句为空，跳过该表达 # 上一句为空，跳过该表达
continue continue
@ -493,8 +498,8 @@ class ExpressionLearner:
bare_lines: List[Tuple[int, str]] = [] bare_lines: List[Tuple[int, str]] = []
for idx, msg in enumerate(messages): for idx, msg in enumerate(messages):
content = msg.processed_plain_text or "" raw_content = msg.processed_plain_text or getattr(msg, "display_message", None) or ""
content = filter_message_content(content) content = filter_message_content(raw_content)
# 即使content为空也要记录，防止错位 # 即使content为空也要记录，防止错位
bare_lines.append((idx, content)) bare_lines.append((idx, content))