fix(chat): 修复并优化消息回复与ID处理逻辑
先前的消息回复机制存在多个问题:回复行为随机且不可靠,临时消息ID生成逻辑过于复杂,且在规划和执行过程中ID转换容易出错,导致回复失败。 本次提交通过以下几点进行了全面的修复与优化: - **简化ID生成**:将临时的上下文消息ID生成逻辑从“索引+随机数”简化为纯索引(如 `m1`, `m2`),使其更可预测且易于调试。 - **修正ID替换**:在 `plan_filter` 中增加了关键逻辑,确保在执行 `reply` 动作前,将计划中使用的临时 `target_message_id` 替换为真实的数据库消息ID。 - **稳定回复行为**:移除了 `action_manager` 中的随机回复判断,现在只要存在上下文消息,就会触发引用回复。同时将各 `send_api` 的 `set_reply` 参数默认值改为 `True`,使回复成为默认行为。 - **增强ID兼容性**:修复了 `napcat_adapter` 中将消息ID强制转换为整数的问题,并为 `send_api` 增加了ID回退查找,提高了对不同平台消息ID格式的兼容性。
This commit is contained in:
@@ -430,8 +430,6 @@ class ActionManager:
|
|||||||
)
|
)
|
||||||
|
|
||||||
# 根据新消息数量决定是否需要引用回复
|
# 根据新消息数量决定是否需要引用回复
|
||||||
need_reply = new_message_count >= random.randint(2, 4)
|
|
||||||
|
|
||||||
reply_text = ""
|
reply_text = ""
|
||||||
is_proactive_thinking = (message_data.get("message_type") == "proactive_thinking") if message_data else True
|
is_proactive_thinking = (message_data.get("message_type") == "proactive_thinking") if message_data else True
|
||||||
|
|
||||||
@@ -462,7 +460,7 @@ class ActionManager:
|
|||||||
text=data,
|
text=data,
|
||||||
stream_id=chat_stream.stream_id,
|
stream_id=chat_stream.stream_id,
|
||||||
reply_to_message=message_data,
|
reply_to_message=message_data,
|
||||||
set_reply=need_reply,
|
set_reply=bool(message_data),
|
||||||
typing=False,
|
typing=False,
|
||||||
)
|
)
|
||||||
first_replied = True
|
first_replied = True
|
||||||
|
|||||||
@@ -379,6 +379,11 @@ class PlanFilter:
|
|||||||
if target_message_dict:
|
if target_message_dict:
|
||||||
# 直接使用字典作为action_message,避免DatabaseMessages对象创建失败
|
# 直接使用字典作为action_message,避免DatabaseMessages对象创建失败
|
||||||
target_message_obj = target_message_dict
|
target_message_obj = target_message_dict
|
||||||
|
# 替换action_data中的临时ID为真实ID
|
||||||
|
if "target_message_id" in action_data:
|
||||||
|
real_message_id = target_message_dict.get("message_id") or target_message_dict.get("id")
|
||||||
|
if real_message_id:
|
||||||
|
action_data["target_message_id"] = real_message_id
|
||||||
else:
|
else:
|
||||||
# 如果找不到目标消息,对于reply动作来说这是必需的,应该记录警告
|
# 如果找不到目标消息,对于reply动作来说这是必需的,应该记录警告
|
||||||
if action == "reply":
|
if action == "reply":
|
||||||
|
|||||||
@@ -701,25 +701,9 @@ def assign_message_ids(messages: List[Any]) -> List[Dict[str, Any]]:
|
|||||||
"""
|
"""
|
||||||
result = []
|
result = []
|
||||||
used_ids = set()
|
used_ids = set()
|
||||||
len_i = len(messages)
|
|
||||||
if len_i > 100:
|
|
||||||
a = 10
|
|
||||||
b = 99
|
|
||||||
else:
|
|
||||||
a = 1
|
|
||||||
b = 9
|
|
||||||
|
|
||||||
for i, message in enumerate(messages):
|
for i, message in enumerate(messages):
|
||||||
# 生成唯一的简短ID
|
# 使用简单的索引作为ID
|
||||||
while True:
|
message_id = f"m{i + 1}"
|
||||||
# 使用索引+随机数生成简短ID
|
|
||||||
random_suffix = random.randint(a, b)
|
|
||||||
message_id = f"m{i + 1}{random_suffix}"
|
|
||||||
|
|
||||||
if message_id not in used_ids:
|
|
||||||
used_ids.add(message_id)
|
|
||||||
break
|
|
||||||
|
|
||||||
result.append({"id": message_id, "message": message})
|
result.append({"id": message_id, "message": message})
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ def message_dict_to_message_recv(message_dict: Dict[str, Any]) -> Optional[Messa
|
|||||||
|
|
||||||
message_info = {
|
message_info = {
|
||||||
"platform": message_dict.get("chat_info_platform", ""),
|
"platform": message_dict.get("chat_info_platform", ""),
|
||||||
"message_id": message_dict.get("message_id"),
|
"message_id": message_dict.get("message_id") or message_dict.get("chat_info_message_id"),
|
||||||
"time": message_dict.get("time"),
|
"time": message_dict.get("time"),
|
||||||
"group_info": group_info,
|
"group_info": group_info,
|
||||||
"user_info": user_info,
|
"user_info": user_info,
|
||||||
@@ -89,13 +89,13 @@ def message_dict_to_message_recv(message_dict: Dict[str, Any]) -> Optional[Messa
|
|||||||
"template_info": template_info,
|
"template_info": template_info,
|
||||||
}
|
}
|
||||||
|
|
||||||
message_dict = {
|
new_message_dict = {
|
||||||
"message_info": message_info,
|
"message_info": message_info,
|
||||||
"raw_message": message_dict.get("processed_plain_text"),
|
"raw_message": message_dict.get("processed_plain_text"),
|
||||||
"processed_plain_text": message_dict.get("processed_plain_text"),
|
"processed_plain_text": message_dict.get("processed_plain_text"),
|
||||||
}
|
}
|
||||||
|
|
||||||
message_recv = MessageRecv(message_dict)
|
message_recv = MessageRecv(new_message_dict)
|
||||||
|
|
||||||
logger.info(f"[SendAPI] 找到匹配的回复消息,发送者: {message_dict.get('user_nickname', '')}")
|
logger.info(f"[SendAPI] 找到匹配的回复消息,发送者: {message_dict.get('user_nickname', '')}")
|
||||||
return message_recv
|
return message_recv
|
||||||
@@ -248,7 +248,7 @@ async def text_to_stream(
|
|||||||
typing: bool = False,
|
typing: bool = False,
|
||||||
reply_to: str = "",
|
reply_to: str = "",
|
||||||
reply_to_message: Optional[Dict[str, Any]] = None,
|
reply_to_message: Optional[Dict[str, Any]] = None,
|
||||||
set_reply: bool = False,
|
set_reply: bool = True,
|
||||||
storage_message: bool = True,
|
storage_message: bool = True,
|
||||||
selected_expressions:List[int] = None,
|
selected_expressions:List[int] = None,
|
||||||
) -> bool:
|
) -> bool:
|
||||||
@@ -279,7 +279,7 @@ async def text_to_stream(
|
|||||||
|
|
||||||
|
|
||||||
async def emoji_to_stream(
|
async def emoji_to_stream(
|
||||||
emoji_base64: str, stream_id: str, storage_message: bool = True, set_reply: bool = False
|
emoji_base64: str, stream_id: str, storage_message: bool = True, set_reply: bool = True
|
||||||
) -> bool:
|
) -> bool:
|
||||||
"""向指定流发送表情包
|
"""向指定流发送表情包
|
||||||
|
|
||||||
@@ -297,7 +297,7 @@ async def emoji_to_stream(
|
|||||||
|
|
||||||
|
|
||||||
async def image_to_stream(
|
async def image_to_stream(
|
||||||
image_base64: str, stream_id: str, storage_message: bool = True, set_reply: bool = False
|
image_base64: str, stream_id: str, storage_message: bool = True, set_reply: bool = True
|
||||||
) -> bool:
|
) -> bool:
|
||||||
"""向指定流发送图片
|
"""向指定流发送图片
|
||||||
|
|
||||||
@@ -319,7 +319,7 @@ async def command_to_stream(
|
|||||||
stream_id: str,
|
stream_id: str,
|
||||||
storage_message: bool = True,
|
storage_message: bool = True,
|
||||||
display_message: str = "",
|
display_message: str = "",
|
||||||
set_reply: bool = False,
|
set_reply: bool = True,
|
||||||
) -> bool:
|
) -> bool:
|
||||||
"""向指定流发送命令
|
"""向指定流发送命令
|
||||||
|
|
||||||
@@ -344,7 +344,7 @@ async def custom_to_stream(
|
|||||||
typing: bool = False,
|
typing: bool = False,
|
||||||
reply_to: str = "",
|
reply_to: str = "",
|
||||||
reply_to_message: Optional[Dict[str, Any]] = None,
|
reply_to_message: Optional[Dict[str, Any]] = None,
|
||||||
set_reply: bool = False,
|
set_reply: bool = True,
|
||||||
storage_message: bool = True,
|
storage_message: bool = True,
|
||||||
show_log: bool = True,
|
show_log: bool = True,
|
||||||
) -> bool:
|
) -> bool:
|
||||||
|
|||||||
@@ -307,7 +307,7 @@ class SendHandler:
|
|||||||
original_id = id.split("-")[1]
|
original_id = id.split("-")[1]
|
||||||
msg_info_response = await self.send_message_to_napcat("get_msg", {"message_id": int(original_id)})
|
msg_info_response = await self.send_message_to_napcat("get_msg", {"message_id": int(original_id)})
|
||||||
else:
|
else:
|
||||||
msg_info_response = await self.send_message_to_napcat("get_msg", {"message_id": int(id)})
|
msg_info_response = await self.send_message_to_napcat("get_msg", {"message_id": id})
|
||||||
|
|
||||||
replied_user_id = None
|
replied_user_id = None
|
||||||
if msg_info_response and msg_info_response.get("status") == "ok":
|
if msg_info_response and msg_info_response.get("status") == "ok":
|
||||||
|
|||||||
Reference in New Issue
Block a user