diff --git a/zhenxun/builtin_plugins/admin/ban/__init__.py b/zhenxun/builtin_plugins/admin/ban/__init__.py index 0fab59b88..fcca32200 100644 --- a/zhenxun/builtin_plugins/admin/ban/__init__.py +++ b/zhenxun/builtin_plugins/admin/ban/__init__.py @@ -220,7 +220,9 @@ async def _( await MessageUtils.build_message("权限不足捏...").finish(reply_to=True) user_id = user.result if gid := session.id3 or session.id2: + u_d = user_id if group_id.available: + u_d = gid gid = group_id.result if await BanManage.unban( user_id, gid, session, session.id1 in bot.config.superusers @@ -234,7 +236,7 @@ async def _( await MessageUtils.build_message( [ "将 ", - At(flag="user", target=user_id) if isinstance(user.result, At) else user_id, # type: ignore + At(flag="user", target=user_id) if isinstance(user.result, At) else u_d, # type: ignore f" 从黑屋中拉了出来并急救了一下!", ] ).finish(reply_to=True) diff --git a/zhenxun/builtin_plugins/help/__init__.py b/zhenxun/builtin_plugins/help/__init__.py index f274c484b..69a981a33 100644 --- a/zhenxun/builtin_plugins/help/__init__.py +++ b/zhenxun/builtin_plugins/help/__init__.py @@ -30,7 +30,7 @@ extra=PluginExtraData( author="HibiKier", version="0.1", - plugin_type=PluginType.HIDDEN, + plugin_type=PluginType.DEPENDANT, configs=[ RegisterConfig( key="type", diff --git a/zhenxun/builtin_plugins/help/_utils.py b/zhenxun/builtin_plugins/help/_utils.py index 2de661fbd..3f4f891d8 100644 --- a/zhenxun/builtin_plugins/help/_utils.py +++ b/zhenxun/builtin_plugins/help/_utils.py @@ -49,7 +49,7 @@ async def sort_type(self): self._data = await PluginInfo.filter( menu_type__not="", load_status=True, - plugin_type__in=[PluginType.NORMAL, PluginType.HIDDEN], + plugin_type__in=[PluginType.NORMAL, PluginType.DEPENDANT], ) if not self._sort_data: for plugin in self._data: diff --git a/zhenxun/builtin_plugins/help_help.py b/zhenxun/builtin_plugins/help_help.py index 33a149986..d472440b4 100644 --- a/zhenxun/builtin_plugins/help_help.py +++ b/zhenxun/builtin_plugins/help_help.py @@ -24,7 +24,7 @@ extra=PluginExtraData( author="HibiKier", version="0.1", - plugin_type=PluginType.HIDDEN, + plugin_type=PluginType.DEPENDANT, ).dict(), ) diff --git a/zhenxun/builtin_plugins/hooks/__init__.py b/zhenxun/builtin_plugins/hooks/__init__.py index 80aa71819..3ad29d71f 100644 --- a/zhenxun/builtin_plugins/hooks/__init__.py +++ b/zhenxun/builtin_plugins/hooks/__init__.py @@ -40,4 +40,13 @@ type=int, ) +Config.add_plugin_config( + "hook", + "IS_SEND_TIP_MESSAGE", + True, + help="是否发送阻断时提示消息", + default_value=True, + type=bool, +) + nonebot.load_plugins(str(Path(__file__).parent.resolve())) diff --git a/zhenxun/builtin_plugins/hooks/_auth_checker.py b/zhenxun/builtin_plugins/hooks/_auth_checker.py index 03c0bd908..4aaa3f19c 100644 --- a/zhenxun/builtin_plugins/hooks/_auth_checker.py +++ b/zhenxun/builtin_plugins/hooks/_auth_checker.py @@ -25,6 +25,8 @@ from zhenxun.utils.message import MessageUtils from zhenxun.utils.utils import CountLimiter, FreqLimiter, UserBlockLimiter +base_config = Config.get("hook") + class Limit(BaseModel): @@ -181,6 +183,23 @@ def __init__(self): self._flmt_s = FreqLimiter(check_notice_info_cd) self._flmt_c = FreqLimiter(check_notice_info_cd) + def is_send_limit_message(self, plugin: PluginInfo, sid: str) -> bool: + """是否发送提示消息 + + 参数: + plugin: PluginInfo + + 返回: + bool: 是否发送提示消息 + """ + if not base_config.get("IS_SEND_TIP_MESSAGE"): + return False + if plugin.plugin_type == PluginType.DEPENDANT: + return False + if not self._flmt_s.check(sid): + return False + return True + async def auth( self, matcher: Matcher, @@ -217,8 +236,8 @@ async def auth( ) return if plugin := await PluginInfo.get_or_none(module_path=module_path): - if plugin.plugin_type == PluginType.HIDDEN and plugin.name != "帮助": - logger.debug("插件为HIDDEN且不是帮助功能，已跳过...") + if plugin.plugin_type == PluginType.HIDDEN: + logger.debug("插件为HIDDEN，已跳过...") return try: cost_gold = await self.auth_cost(user, plugin, session) @@ -301,11 +320,12 @@ async def auth_plugin( channel_id = None if user_id: if group_id: + sid = group_id or user_id if await GroupConsole.is_super_block_plugin( group_id, plugin.module, channel_id ): """超级用户群组插件状态""" - if self._flmt_s.check(group_id or user_id) and not is_poke: + if self.is_send_limit_message(plugin, sid) and not is_poke: self._flmt_s.start_cd(group_id or user_id) await MessageUtils.build_message( "超级管理员禁用了该群此功能..." @@ -320,7 +340,7 @@ async def auth_plugin( group_id, plugin.module, channel_id ): """群组插件状态""" - if self._flmt_s.check(group_id or user_id) and not is_poke: + if self.is_send_limit_message(plugin, sid) and not is_poke: self._flmt_s.start_cd(group_id or user_id) await MessageUtils.build_message("该群未开启此功能...").send( reply_to=True @@ -334,7 +354,7 @@ async def auth_plugin( if not plugin.status and plugin.block_type == BlockType.GROUP: """全局群组禁用""" try: - if self._flmt_c.check(group_id) and not is_poke: + if self.is_send_limit_message(plugin, sid) and not is_poke: self._flmt_c.start_cd(group_id) await MessageUtils.build_message( "该功能在群组中已被禁用..." @@ -350,10 +370,11 @@ async def auth_plugin( ) raise IgnoredException("该插件在群组中已被禁用...") else: + sid = user_id if not plugin.status and plugin.block_type == BlockType.PRIVATE: """全局私聊禁用""" try: - if self._flmt_c.check(user_id) and not is_poke: + if self.is_send_limit_message(plugin, sid) and not is_poke: self._flmt_c.start_cd(user_id) await MessageUtils.build_message( "该功能在私聊中已被禁用..." @@ -378,7 +399,7 @@ async def auth_plugin( "HOOK", session=session, ) - if self._flmt_s.check(group_id or user_id) and not is_poke: + if self.is_send_limit_message(plugin, sid) and not is_poke: self._flmt_s.start_cd(group_id or user_id) await MessageUtils.build_message("全局未开启此功能...").send() raise IgnoredException("全局未开启此功能...") diff --git a/zhenxun/builtin_plugins/hooks/chkdsk_hook.py b/zhenxun/builtin_plugins/hooks/chkdsk_hook.py index 5c19636df..512465152 100644 --- a/zhenxun/builtin_plugins/hooks/chkdsk_hook.py +++ b/zhenxun/builtin_plugins/hooks/chkdsk_hook.py @@ -69,7 +69,7 @@ async def _(matcher: Matcher, bot: Bot, session: EventSession, state: T_State): module = plugin.module_name if metadata := plugin.metadata: extra = metadata.extra - if extra.get("plugin_type") == PluginType.HIDDEN: + if extra.get("plugin_type") in [PluginType.HIDDEN, PluginType.DEPENDANT]: return else: return diff --git a/zhenxun/builtin_plugins/init/init_plugin.py b/zhenxun/builtin_plugins/init/init_plugin.py index f65913e12..8a65e27b8 100644 --- a/zhenxun/builtin_plugins/init/init_plugin.py +++ b/zhenxun/builtin_plugins/init/init_plugin.py @@ -49,8 +49,9 @@ async def _handle_setting( if metadata.type == "library": extra_data.plugin_type = PluginType.HIDDEN if ( - extra_data.plugin_type == PluginType.HIDDEN - and extra_data.plugin_type != "功能" + extra_data.plugin_type + == PluginType.HIDDEN + # and extra_data.plugin_type != "功能" ): extra_data.menu_type = "" plugin_list.append( @@ -119,15 +120,26 @@ async def _(): create_list.append(plugin) else: plugin.id = module2id[plugin.module_path] + await plugin.save( + update_fields=[ + "name", + "author", + "version", + "admin_level", + "plugin_type", + ] + ) update_list.append(plugin) if create_list: await PluginInfo.bulk_create(create_list, 10) if update_list: - await PluginInfo.bulk_update( - update_list, - ["name", "author", "version", "admin_level"], - 10, - ) + # TODO: 批量更新无法更新plugin_type: tortoise.exceptions.OperationalError: column "superuser" does not exist + pass + # await PluginInfo.bulk_update( + # update_list, + # ["name", "author", "version", "admin_level", "plugin_type"], + # 10, + # ) if limit_list: limit_create = [] plugins = [] diff --git a/zhenxun/builtin_plugins/scripts.py b/zhenxun/builtin_plugins/scripts.py index d8abefe25..3059f8702 100644 --- a/zhenxun/builtin_plugins/scripts.py +++ b/zhenxun/builtin_plugins/scripts.py @@ -1,6 +1,7 @@ from asyncio.exceptions import TimeoutError import nonebot +import ujson as json from nonebot.drivers import Driver from nonebot_plugin_apscheduler import scheduler @@ -8,12 +9,6 @@ from zhenxun.services.log import logger from zhenxun.utils.http_utils import AsyncHttpx -try: - import ujson as json -except ModuleNotFoundError: - import json - - driver: Driver = nonebot.get_driver() diff --git a/zhenxun/plugins/about.py b/zhenxun/plugins/about.py index 7c3b923e7..f2bcbdb6d 100644 --- a/zhenxun/plugins/about.py +++ b/zhenxun/plugins/about.py @@ -10,7 +10,7 @@ from zhenxun.utils.message import MessageUtils __plugin_meta__ = PluginMetadata( - name="识番", + name="关于", description="想要更加了解真寻吗", usage=""" 指令： diff --git a/zhenxun/plugins/black_word/black_watch.py b/zhenxun/plugins/black_word/black_watch.py index be081a123..133352a64 100644 --- a/zhenxun/plugins/black_word/black_watch.py +++ b/zhenxun/plugins/black_word/black_watch.py @@ -21,7 +21,8 @@ extra=PluginExtraData( author="HibiKier", version="0.1", - plugin_type=PluginType.HIDDEN, + menu_type="其他", + plugin_type=PluginType.DEPENDANT, ).dict(), ) diff --git a/zhenxun/plugins/fudu.py b/zhenxun/plugins/fudu.py index 6b1348a0f..b81a07472 100644 --- a/zhenxun/plugins/fudu.py +++ b/zhenxun/plugins/fudu.py @@ -27,7 +27,7 @@ author="HibiKier", version="0.1", menu_type="其他", - plugin_type=PluginType.HIDDEN, + plugin_type=PluginType.DEPENDANT, tasks=[Task(module="fudu", name="复读")], configs=[ RegisterConfig( diff --git a/zhenxun/plugins/mute/mute_message.py b/zhenxun/plugins/mute/mute_message.py index c2c476f0c..ec655ccf9 100644 --- a/zhenxun/plugins/mute/mute_message.py +++ b/zhenxun/plugins/mute/mute_message.py @@ -7,6 +7,7 @@ from zhenxun.configs.config import NICKNAME from zhenxun.configs.utils import PluginExtraData +from zhenxun.models.ban_console import BanConsole from zhenxun.services.log import logger from zhenxun.utils.enum import PluginType from zhenxun.utils.image_utils import get_download_image_hash @@ -23,7 +24,7 @@ author="HibiKier", version="0.1", menu_type="其他", - plugin_type=PluginType.HIDDEN, + plugin_type=PluginType.DEPENDANT, ).dict(), ) @@ -35,6 +36,8 @@ async def _(bot: Bot, session: EventSession, message: UniMsg): group_id = session.id2 if not session.id1 or not group_id: return + if await BanConsole.is_ban(session.id1, group_id): + return plain_text = message.extract_plain_text() image_list = [m.url for m in message if isinstance(m, alcImage) and m.url] img_hash = "" diff --git a/zhenxun/plugins/parse_bilibili/__init__.py b/zhenxun/plugins/parse_bilibili/__init__.py index 510ff435d..791c56f0a 100644 --- a/zhenxun/plugins/parse_bilibili/__init__.py +++ b/zhenxun/plugins/parse_bilibili/__init__.py @@ -28,7 +28,8 @@ extra=PluginExtraData( author="leekooyo", version="0.1", - plugin_type=PluginType.HIDDEN, + plugin_type=PluginType.DEPENDANT, + menu_type="其他", configs=[ RegisterConfig( module="_task", diff --git a/zhenxun/plugins/poke/__init__.py b/zhenxun/plugins/poke/__init__.py index 9dc3d1d8b..38dafc824 100644 --- a/zhenxun/plugins/poke/__init__.py +++ b/zhenxun/plugins/poke/__init__.py @@ -24,7 +24,7 @@ author="HibiKier", version="0.1", menu_type="其他", - plugin_type=PluginType.HIDDEN, + plugin_type=PluginType.DEPENDANT, ).dict(), ) diff --git a/zhenxun/plugins/web_ui/api/tabs/plugin_manage/__init__.py b/zhenxun/plugins/web_ui/api/tabs/plugin_manage/__init__.py index b2a90577c..2608eb0cc 100644 --- a/zhenxun/plugins/web_ui/api/tabs/plugin_manage/__init__.py +++ b/zhenxun/plugins/web_ui/api/tabs/plugin_manage/__init__.py @@ -72,7 +72,7 @@ async def _() -> Result: load_status=True, ).count() plugin_count.other = await DbPluginInfo.filter( - plugin_type=PluginType.HIDDEN, load_status=True + plugin_type__in=[PluginType.HIDDEN, PluginType.DEPENDANT], load_status=True ).count() return Result.ok(plugin_count) diff --git a/zhenxun/plugins/word_bank/_data_source.py b/zhenxun/plugins/word_bank/_data_source.py index c9a53a1ba..c4ed9b124 100644 --- a/zhenxun/plugins/word_bank/_data_source.py +++ b/zhenxun/plugins/word_bank/_data_source.py @@ -226,7 +226,7 @@ async def show_word( problem, _problem_list = await WordBank.get_problem_all_answer( problem, # type: ignore index, - group_id if group_id is None else None, + group_id if group_id is not None else None, word_scope, ) if not _problem_list: @@ -248,7 +248,8 @@ async def show_word( # __text = (m.data["image"], 30, 30) __text = "[图片]" _text.append(__text) - msg_list.append("".join(str(_text))) + _text = "".join(_text) + msg_list.append(_text) column_name = ["序号", "回答内容"] data_list = [] for index, msg in enumerate(msg_list): diff --git a/zhenxun/plugins/word_bank/message_handle.py b/zhenxun/plugins/word_bank/message_handle.py index a9bf624a7..07a4b518f 100644 --- a/zhenxun/plugins/word_bank/message_handle.py +++ b/zhenxun/plugins/word_bank/message_handle.py @@ -15,7 +15,7 @@ description="", usage="""""", extra=PluginExtraData( - author="HibiKier", version="0.1", plugin_type=PluginType.HIDDEN + author="HibiKier", version="0.1", plugin_type=PluginType.DEPENDANT ).dict(), ) @@ -28,4 +28,4 @@ async def _(session: EventSession, state: T_State): gid = session.id3 or session.id2 if result := await WordBank.get_answer(gid, problem): await result.send() - logger.info(f" 触发词条 {problem}", "词条检测", session=session) + logger.info(f"触发词条 {problem}", "词条检测", session=session) diff --git a/zhenxun/plugins/word_bank/word_handle.py b/zhenxun/plugins/word_bank/word_handle.py index 0f70a44af..39894a459 100644 --- a/zhenxun/plugins/word_bank/word_handle.py +++ b/zhenxun/plugins/word_bank/word_handle.py @@ -322,4 +322,8 @@ async def _( None, index.result if index.available else None, group_id, word_scope ) await result.send() - logger.info(f"查看词条回答: {problem}", arparma.header_result, session=session) + logger.info( + f"查看词条回答: {problem.result if problem.available else index.result}", + arparma.header_result, + session=session, + ) diff --git a/zhenxun/utils/enum.py b/zhenxun/utils/enum.py index bf6c5daa6..86d41d13b 100644 --- a/zhenxun/utils/enum.py +++ b/zhenxun/utils/enum.py @@ -31,10 +31,17 @@ class PluginType(StrEnum): """ SUPERUSER = "SUPERUSER" + """超级用户""" ADMIN = "ADMIN" + """管理员""" SUPER_AND_ADMIN = "ADMIN_SUPER" + """管理员以及超级用户""" NORMAL = "NORMAL" + """普通插件""" + DEPENDANT = "DEPENDANT" + """依赖插件，一般为没有主动触发命令的插件，受权限控制""" HIDDEN = "HIDDEN" + """隐藏插件，一般为没有主动触发命令的插件，不受权限控制，如消息统计""" class BlockType(StrEnum):