gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(chat): 增强对自我身份的识别，支持将机器人用户标记为"SELF"

Browse Source
This commit is contained in:
Windpicker-owo
2025-11-05 14:45:36 +08:00
parent 08595da791
commit b950ddba13
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/chat/message_receive/storage.py
View File

@@ -12,6 +12,7 @@ from src.common.data_models.database_data_model import DatabaseMessages
from src.common.database.core import get_db_session from src.common.database.core import get_db_session
from src.common.database.core.models import Images, Messages from src.common.database.core.models import Images, Messages
from src.common.logger import get_logger from src.common.logger import get_logger
from src.config.config import global_config
from .chat_stream import ChatStream from .chat_stream import ChatStream
from .message import MessageSending from .message import MessageSending
@@ -275,6 +276,9 @@ class MessageStorageBatcher:
user_platform = user_info_dict.get("platform") user_platform = user_info_dict.get("platform")
user_id = user_info_dict.get("user_id") user_id = user_info_dict.get("user_id")
# 将机器人自己的user_id标记为"SELF"，增强对自我身份的识别
if user_id == global_config.bot.qq_account:
user_id = "SELF"
user_nickname = user_info_dict.get("user_nickname") user_nickname = user_info_dict.get("user_nickname")
user_cardname = user_info_dict.get("user_cardname") user_cardname = user_info_dict.get("user_cardname")
@@ -612,6 +616,9 @@ class MessageStorage:
user_platform = user_info_dict.get("platform") user_platform = user_info_dict.get("platform")
user_id = user_info_dict.get("user_id") user_id = user_info_dict.get("user_id")
# 将机器人自己的user_id标记为"SELF"，增强对自我身份的识别
if user_id == global_config.bot.qq_account:
user_id = "SELF"
user_nickname = user_info_dict.get("user_nickname") user_nickname = user_info_dict.get("user_nickname")
user_cardname = user_info_dict.get("user_cardname") user_cardname = user_info_dict.get("user_cardname")

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

@@ -44,8 +44,8 @@ def replace_user_references_sync(
if name_resolver is None: if name_resolver is None:
def default_resolver(platform: str, user_id: str) -> str: def default_resolver(platform: str, user_id: str) -> str:
# 检查是否是机器人自己 # 检查是否是机器人自己（支持SELF标记或直接比对QQ号）
if replace_bot_name and user_id == global_config.bot.qq_account: if replace_bot_name and (user_id == "SELF" or user_id == global_config.bot.qq_account):
return f"{global_config.bot.nickname}(你)" return f"{global_config.bot.nickname}(你)"
# 同步函数中无法使用异步的 get_value，直接返回 user_id # 同步函数中无法使用异步的 get_value，直接返回 user_id
# 建议调用方使用 replace_user_references_async 以获取完整的用户名 # 建议调用方使用 replace_user_references_async 以获取完整的用户名
@@ -60,8 +60,8 @@ def replace_user_references_sync(
aaa = match[1] aaa = match[1]
bbb = match[2] bbb = match[2]
try: try:
# 检查是否是机器人自己 # 检查是否是机器人自己（支持SELF标记或直接比对QQ号）
if replace_bot_name and bbb == global_config.bot.qq_account: if replace_bot_name and (bbb == "SELF" or bbb == global_config.bot.qq_account):
reply_person_name = f"{global_config.bot.nickname}(你)" reply_person_name = f"{global_config.bot.nickname}(你)"
else: else:
reply_person_name = name_resolver(platform, bbb) or aaa reply_person_name = name_resolver(platform, bbb) or aaa
@@ -81,8 +81,8 @@ def replace_user_references_sync(
aaa = m.group(1) aaa = m.group(1)
bbb = m.group(2) bbb = m.group(2)
try: try:
# 检查是否是机器人自己 # 检查是否是机器人自己（支持SELF标记或直接比对QQ号）
if replace_bot_name and bbb == global_config.bot.qq_account: if replace_bot_name and (bbb == "SELF" or bbb == global_config.bot.qq_account):
at_person_name = f"{global_config.bot.nickname}(你)" at_person_name = f"{global_config.bot.nickname}(你)"
else: else:
at_person_name = name_resolver(platform, bbb) or aaa at_person_name = name_resolver(platform, bbb) or aaa
@@ -118,8 +118,8 @@ async def replace_user_references_async(
""" """
if name_resolver is None: if name_resolver is None:
async def default_resolver(platform: str, user_id: str) -> str: async def default_resolver(platform: str, user_id: str) -> str:
# 检查是否是机器人自己 # 检查是否是机器人自己（支持SELF标记或直接比对QQ号）
if replace_bot_name and user_id == global_config.bot.qq_account: if replace_bot_name and (user_id == "SELF" or user_id == global_config.bot.qq_account):
return f"{global_config.bot.nickname}(你)" return f"{global_config.bot.nickname}(你)"
person_id = PersonInfoManager.get_person_id(platform, user_id) person_id = PersonInfoManager.get_person_id(platform, user_id)
person_info = await person_info_manager.get_values(person_id, ["person_name"]) person_info = await person_info_manager.get_values(person_id, ["person_name"])
@@ -134,8 +134,8 @@ async def replace_user_references_async(
aaa = match.group(1) aaa = match.group(1)
bbb = match.group(2) bbb = match.group(2)
try: try:
# 检查是否是机器人自己 # 检查是否是机器人自己（支持SELF标记或直接比对QQ号）
if replace_bot_name and bbb == global_config.bot.qq_account: if replace_bot_name and (bbb == "SELF" or bbb == global_config.bot.qq_account):
reply_person_name = f"{global_config.bot.nickname}(你)" reply_person_name = f"{global_config.bot.nickname}(你)"
else: else:
reply_person_name = await name_resolver(platform, bbb) or aaa reply_person_name = await name_resolver(platform, bbb) or aaa
@@ -155,8 +155,8 @@ async def replace_user_references_async(
aaa = m.group(1) aaa = m.group(1)
bbb = m.group(2) bbb = m.group(2)
try: try:
# 检查是否是机器人自己 # 检查是否是机器人自己（支持SELF标记或直接比对QQ号）
if replace_bot_name and bbb == global_config.bot.qq_account: if replace_bot_name and (bbb == "SELF" or bbb == global_config.bot.qq_account):
at_person_name = f"{global_config.bot.nickname}(你)" at_person_name = f"{global_config.bot.nickname}(你)"
else: else:
at_person_name = await name_resolver(platform, bbb) or aaa at_person_name = await name_resolver(platform, bbb) or aaa
@@ -637,12 +637,14 @@ async def _build_readable_messages_internal(
if not all([platform, user_id, timestamp is not None]): if not all([platform, user_id, timestamp is not None]):
continue continue
person = Person(platform=platform, user_id=user_id)
# 根据 replace_bot_name 参数决定是否替换机器人名称 # 根据 replace_bot_name 参数决定是否替换机器人名称
person_name: str person_name: str
if replace_bot_name and user_id == global_config.bot.qq_account: # 检查是否是机器人自己（支持SELF标记或直接比对QQ号）
if replace_bot_name and (user_id == "SELF" or user_id == global_config.bot.qq_account):
person_name = f"{global_config.bot.nickname}(你)" person_name = f"{global_config.bot.nickname}(你)"
else: else:
person_id = PersonInfoManager.get_person_id(platform, user_id)
person_info_manager = get_person_info_manager()
person_name = await person_info_manager.get_value(person_id, "person_name") # type: ignore person_name = await person_info_manager.get_value(person_id, "person_name") # type: ignore
# 如果 person_name 未设置，则使用消息中的 nickname 或默认名称 # 如果 person_name 未设置，则使用消息中的 nickname 或默认名称
@@ -654,8 +656,8 @@ async def _build_readable_messages_internal(
else: else:
person_name = "某人" person_name = "某人"
# 在用户名后面添加 QQ 号, 但机器人本体不用 # 在用户名后面添加 QQ 号, 但机器人本体不用（包括SELF标记）
if user_id != global_config.bot.qq_account: if user_id != global_config.bot.qq_account and user_id != "SELF":
person_name = f"{person_name}({user_id})" person_name = f"{person_name}({user_id})"
# 使用独立函数处理用户引用格式 # 使用独立函数处理用户引用格式