From 12a18f09b9ce5e48730a66da968566133c6c908b Mon Sep 17 00:00:00 2001 From: tcmofashi Date: Sun, 20 Apr 2025 16:42:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=8E=B0=E5=9C=A8=E7=9A=84user=5Fi?= =?UTF-8?q?d=E5=92=8Cgroup=5Fid=E6=94=AF=E6=8C=81=E4=B8=94=E5=8D=B3?= =?UTF-8?q?=E5=B0=86=E5=8F=AA=E6=94=AF=E6=8C=81str=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/config.py | 15 ++++++++++----- src/plugins/chat/bot.py | 9 ++++++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/config/config.py b/src/config/config.py index 6c1d54250..0dae02446 100644 --- a/src/config/config.py +++ b/src/config/config.py @@ -138,7 +138,7 @@ class BotConfig: MAI_VERSION: str = mai_version # 硬编码的版本信息 # bot - BOT_QQ: Optional[int] = 114514 + BOT_QQ: Optional[str] = "114514" BOT_NICKNAME: Optional[str] = None BOT_ALIAS_NAMES: List[str] = field(default_factory=list) # 别名，可以通过这个叫它 @@ -395,7 +395,7 @@ class BotConfig: # 机器人基础配置 bot_config = parent["bot"] bot_qq = bot_config.get("qq") - config.BOT_QQ = int(bot_qq) + config.BOT_QQ = str(bot_qq) config.BOT_NICKNAME = bot_config.get("nickname", config.BOT_NICKNAME) config.BOT_ALIAS_NAMES = bot_config.get("alias_names", config.BOT_ALIAS_NAMES) @@ -624,9 +624,14 @@ class BotConfig: def groups(parent: dict): groups_config = parent["groups"] - config.talk_allowed_groups = set(groups_config.get("talk_allowed", [])) - config.talk_frequency_down_groups = set(groups_config.get("talk_frequency_down", [])) - config.ban_user_id = set(groups_config.get("ban_user_id", [])) + # config.talk_allowed_groups = set(groups_config.get("talk_allowed", [])) + config.talk_allowed_groups = set(str(group) for group in groups_config.get("talk_allowed", [])) + # config.talk_frequency_down_groups = set(groups_config.get("talk_frequency_down", [])) + config.talk_frequency_down_groups = set( + str(group) for group in groups_config.get("talk_frequency_down", []) + ) + # config.ban_user_id = set(groups_config.get("ban_user_id", [])) + config.ban_user_id = set(str(user) for user in groups_config.get("ban_user_id", [])) def platforms(parent: dict): platforms_config = parent["platforms"] diff --git a/src/plugins/chat/bot.py b/src/plugins/chat/bot.py index 9eab99c72..fde617723 100644 --- a/src/plugins/chat/bot.py +++ b/src/plugins/chat/bot.py @@ -79,10 +79,17 @@ class ChatBot: # 确保所有任务已启动 await self._ensure_started() + if message_data["message_info"]["group_info"] is not None: + message_data["message_info"]["group_info"]["group_id"] = str( + message_data["message_info"]["group_info"]["group_id"] + ) + message_data["message_info"]["group_info"]["group_id"] = str( + message_data["message_info"]["group_info"]["group_id"] + ) + logger.trace(f"处理消息:{str(message_data)[:120]}...") message = MessageRecv(message_data) groupinfo = message.message_info.group_info userinfo = message.message_info.user_info - logger.trace(f"处理消息:{str(message_data)[:120]}...") if userinfo.user_id in global_config.ban_user_id: logger.debug(f"用户{userinfo.user_id}被禁止回复")