diff --git a/LittlePaimon/plugins/NoticeAndRequest/__init__.py b/LittlePaimon/plugins/NoticeAndRequest/__init__.py index 0eca58e..6e8e0f3 100644 --- a/LittlePaimon/plugins/NoticeAndRequest/__init__.py +++ b/LittlePaimon/plugins/NoticeAndRequest/__init__.py @@ -3,10 +3,10 @@ import random import datetime from typing import Dict -from nonebot import on_command, on_regex, on_notice, on_request +from nonebot import on_command, on_notice, on_request from nonebot.rule import Rule from nonebot.permission import SUPERUSER -from nonebot.params import CommandArg, ArgPlainText, RegexDict +from nonebot.params import CommandArg, ArgPlainText from nonebot.adapters.onebot.v11 import Bot, Message, MessageEvent, PrivateMessageEvent, FriendRequestEvent, \ GroupRequestEvent, \ RequestEvent, NoticeEvent, \ @@ -149,11 +149,11 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent): done[f'new_group_{event.group_id}'] = datetime.datetime.now() await asyncio.sleep(random.randint(10, 20)) await bot.send_group_msg(group_id=event.group_id, message=format_message(config.new_group)) - elif str(event.group_id) not in config.group_ban: + elif event.group_id not in config.group_ban: done[f'new_member_{event.group_id}_{event.user_id}'] = datetime.datetime.now() await asyncio.sleep(random.randint(10, 20)) - if str(event.group_id) in config.group_greet: - msg = config.group_greet[str(event.group_id)] + if event.group_id in config.group_greet: + msg = config.group_greet[event.group_id] else: msg = config.group_greet['默认'] await bot.send_group_msg(group_id=event.group_id, message=format_message(msg, user_id=event.user_id)) diff --git a/LittlePaimon/plugins/NoticeAndRequest/config.py b/LittlePaimon/plugins/NoticeAndRequest/config.py index 5f4decd..dee3ecd 100644 --- a/LittlePaimon/plugins/NoticeAndRequest/config.py +++ b/LittlePaimon/plugins/NoticeAndRequest/config.py @@ -1,4 +1,4 @@ -from typing import Dict +from typing import Dict, Union from LittlePaimon.config import GREET_CONFIG, GREET_CONFIG_DEFAULT from LittlePaimon.utils.files import load_yaml, save_yaml @@ -13,7 +13,7 @@ class GreetConfig: data = {} self.new_friend: str = data.get('新好友见面语', '旅行者你好呀,这里是{nickname},对我说“help”查看帮助吧~') self.new_group: str = data.get('新群见面语', '旅行者们大家好呀,这里是{nickname},对我说“help”查看帮助吧~') - self.group_greet: Dict[str, str] = data.get('群新人欢迎语', {'默认': '欢迎新旅行者~{at_user}'}) + self.group_greet: Dict[Union[str, int], str] = data.get('群新人欢迎语', {'默认': '欢迎新旅行者~{at_user}'}) self.group_ban = data.get('群欢迎语禁用列表', []) self.save() diff --git a/LittlePaimon/plugins/Paimon_Info/__init__.py b/LittlePaimon/plugins/Paimon_Info/__init__.py index 2c7400b..4090edd 100644 --- a/LittlePaimon/plugins/Paimon_Info/__init__.py +++ b/LittlePaimon/plugins/Paimon_Info/__init__.py @@ -47,7 +47,7 @@ sy = on_command('sy', aliases={'深渊战报', '深渊信息'}, priority=10, blo 'pm_usage': 'sy(uid)(本期|上期)', 'pm_priority': 3 }) -ysc = on_command('ysc', aliases={'角色图'}, priority=10, block=True, state={ +ysc = on_command('ysc', aliases={'角色图', '角色卡片'}, priority=10, block=True, state={ 'pm_name': 'ysc', 'pm_description': '随机角色同人图+角色信息卡片', 'pm_usage': 'ysc(uid)<角色名>',