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

refactor: 现在的user_id和group_id支持且即将只支持str格式

Browse Source
This commit is contained in:
tcmofashi
2025-04-20 16:42:49 +08:00
parent 7b4fc71342
commit 12a18f09b9
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/config/config.py
View File

@@ -138,7 +138,7 @@ class BotConfig:
MAI_VERSION: str = mai_version # 硬编码的版本信息 MAI_VERSION: str = mai_version # 硬编码的版本信息
# bot # bot
BOT_QQ: Optional[int] = 114514 BOT_QQ: Optional[str] = "114514"
BOT_NICKNAME: Optional[str] = None BOT_NICKNAME: Optional[str] = None
BOT_ALIAS_NAMES: List[str] = field(default_factory=list) # 别名，可以通过这个叫它 BOT_ALIAS_NAMES: List[str] = field(default_factory=list) # 别名，可以通过这个叫它
@@ -395,7 +395,7 @@ class BotConfig:
# 机器人基础配置 # 机器人基础配置
bot_config = parent["bot"] bot_config = parent["bot"]
bot_qq = bot_config.get("qq") 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_NICKNAME = bot_config.get("nickname", config.BOT_NICKNAME)
config.BOT_ALIAS_NAMES = bot_config.get("alias_names", config.BOT_ALIAS_NAMES) config.BOT_ALIAS_NAMES = bot_config.get("alias_names", config.BOT_ALIAS_NAMES)
@@ -624,9 +624,14 @@ class BotConfig:
def groups(parent: dict): def groups(parent: dict):
groups_config = parent["groups"] groups_config = parent["groups"]
config.talk_allowed_groups = set(groups_config.get("talk_allowed", [])) # config.talk_allowed_groups = set(groups_config.get("talk_allowed", []))
config.talk_frequency_down_groups = set(groups_config.get("talk_frequency_down", [])) config.talk_allowed_groups = set(str(group) for group in groups_config.get("talk_allowed", []))
config.ban_user_id = set(groups_config.get("ban_user_id", [])) # 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): def platforms(parent: dict):
platforms_config = parent["platforms"] platforms_config = parent["platforms"]

9
src/plugins/chat/bot.py
View File

@@ -79,10 +79,17 @@ class ChatBot:
# 确保所有任务已启动 # 确保所有任务已启动
await self._ensure_started() 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) message = MessageRecv(message_data)
groupinfo = message.message_info.group_info groupinfo = message.message_info.group_info
userinfo = message.message_info.user_info userinfo = message.message_info.user_info
logger.trace(f"处理消息:{str(message_data)[:120]}...")
if userinfo.user_id in global_config.ban_user_id: if userinfo.user_id in global_config.ban_user_id:
logger.debug(f"用户{userinfo.user_id}被禁止回复") logger.debug(f"用户{userinfo.user_id}被禁止回复")