diff --git a/LittlePaimon/config/plugin/manage.py b/LittlePaimon/config/plugin/manage.py index 03769b5..1668baa 100644 --- a/LittlePaimon/config/plugin/manage.py +++ b/LittlePaimon/config/plugin/manage.py @@ -166,5 +166,7 @@ async def _(event: MessageEvent, matcher: Matcher): user_id=event.user_id, message_type=event.message_type, time=datetime.datetime.now()) + except IgnoredException: + pass except Exception as e: logger.info('插件管理器', f'插件权限检查失败:{e}') diff --git a/LittlePaimon/plugins/Learning_Chat/handler.py b/LittlePaimon/plugins/Learning_Chat/handler.py index e38dd77..a034a56 100644 --- a/LittlePaimon/plugins/Learning_Chat/handler.py +++ b/LittlePaimon/plugins/Learning_Chat/handler.py @@ -79,7 +79,7 @@ class LearningChat: elif self.data.user_id in self.ban_users: # 发言人在屏蔽列表中,跳过 logger.debug('群聊学习', f'➤发言人{self.data.user_id}在屏蔽列表中,跳过') - elif self.to_me and '不可以' in self.data.message: + elif self.to_me and any(w in self.data.message for w in {'不可以', '达咩', '不能说这'}): # 如果是对某句话进行禁言 return Result.Ban elif self.to_me and any( diff --git a/LittlePaimon/plugins/plugin_manager/__init__.py b/LittlePaimon/plugins/plugin_manager/__init__.py index 40fa763..44fc5a7 100644 --- a/LittlePaimon/plugins/plugin_manager/__init__.py +++ b/LittlePaimon/plugins/plugin_manager/__init__.py @@ -61,7 +61,7 @@ async def _(event: GroupMessageEvent, state: T_State, match: dict = RegexDict(), state['plugin_no_exist'] = [] if any(w in match['plugin'] for w in {'all', '全部'}): state['is_all'] = True - state['plugin'] = [p for p in PluginManager.plugins.keys() if p != 'plugin_manager'] + state['plugin'] = list(PluginManager.plugins.keys()) else: state['is_all'] = False state['plugin'] = [] diff --git a/LittlePaimon/plugins/plugin_manager/draw_help.py b/LittlePaimon/plugins/plugin_manager/draw_help.py index ba915d6..cb7d0b9 100644 --- a/LittlePaimon/plugins/plugin_manager/draw_help.py +++ b/LittlePaimon/plugins/plugin_manager/draw_help.py @@ -25,7 +25,7 @@ async def draw_plugin_card(plugin: PluginInfo): async def draw_help(plugin_list: List[PluginInfo]): bg = PMImage(await load_image(RESOURCE_BASE_PATH / 'general' / 'bg.png')) - img = PMImage(size=(1080, 500 * len(plugin_list)), color=(255, 255, 255, 0), mode='RGBA') + img = PMImage(size=(1080, 1000 + 600 * len(plugin_list)), color=(255, 255, 255, 0), mode='RGBA') orange_line = await load_image(RESOURCE_BASE_PATH / 'general' / 'orange.png') orange_name_bg = await load_image(RESOURCE_BASE_PATH / 'general' / 'orange_card.png') black_line = await load_image(RESOURCE_BASE_PATH / 'general' / 'black2.png')