版本更新 (#1666)

* ✨ 父级插件加载

* ✅ 添加测试：更新与添加插件 (#1594)

* ✅ 测试更新与添加插件

* ✅ Sourcery建议

* 👷 添加pytest

* 🎨 优化代码

* 🐛 bug修复

* 🐛修复添加插件返回403的问题 (#1595)

* 完善测试方法
* vscode测试配置
* 重构插件安装过程

* 🎨 修改readme

* Update README.md

* 🐛 修改bug与版本锁定

* 🐛 修复超级用户对群组功能开关

* 🐛 修复插件商店检查插件更新问题 (#1597)

* 🐛 修复插件商店检查插件更新问题

* 🐛 恶意命令检测问题

* 🐛 增加插件状态检查 (#1598)

* ✅ 优化测试用例

* 🐛 更改插件更新与安装逻辑

* 🐛 修复更新群组成员信息

* 🎨 代码优化

* 🚀 更新Dockerfile (#1599)

* 🎨 更新requirements

* ➕ 添加依赖aiocache

* ⚡ 添加github镜像

* ✨ 添加仓库目录多获取渠道

* 🐛 修复测试用例

* ✨ 添加API缓存

* 🎨 采取Sourcery建议

* 🐛 文件下载逻辑修改

* 🎨 优化代码

* 🐛 修复插件开关有时出现错误

* ✨ 重构自检ui

* 🐛 自检html修正

* 修复签到逻辑bug，并使代码更灵活以适应签到好感度等级配置 (#1606)

* 修复签到功能已知问题

* 修复签到功能已知问题

* 修改参数名称

* 修改uid判断

---------

Co-authored-by: HibiKier <45528451+HibiKier@users.noreply.github.com>

* 🎨 代码结构优化

* 🐛 私聊时修改插件时删除私聊帮助

* 🐛 过滤父插件

* 🐛 修复自检在ARM上的问题 (#1607)

* 🐛 修复自检在ARM上的问题

* ✅ 优化测试

* ✨ 支持mysql，psql，sqlite随机函数

* 🔧 VSCode配置修改

* 🔧 VSCode配置修改

* ✨ 添加金币排行

Co-Authored-By: HibiKier <45528451+HibiKier@users.noreply.github.com>

* 📝 修改README

Co-Authored-By: HibiKier <45528451+HibiKier@users.noreply.github.com>

* 🔨 提取GitHub相关操作 (#1609)

* 🔨 提取GitHub相关操作

* 🔨 重构API策略

* ✨ 签到/金币排行限制最大数量 (#1616)

* ✨ 签到/金币排行限制最大数量

* 🐛 修复超级用户id获取问题

* 🐛 修复路径解压与挂载 (#1619)

* 🐛 修复功能少时zhenxun帮助图片排序问题 (#1620)

* 🐛 签到文本适应 (#1622)

* 🐛 好感度排行提供默认值 (#1624)

* 🎈 优先使用github api (#1625)

* ✨ 重构帮助，限制普通用户查询管理插件 (#1626)

* 🐛 修复群权限与插件等级匹配 (#1627)

* ✨ 当管理员尝试ban真寻时将被反杀 (#1628)

* ✨ 群组发言时间检测提供开关配置 (#1630)

* 🐳 chore: 支持自动修改版本号 (#1629)

* 🎈 perf(github_utils): 支持github url下载遍历 (#1632)

* 🎈 perf(github_utils): 支持github url下载遍历

* 🐞 fix(http_utils): 修复一些下载问题

* 🦄 refactor(http_utils): 部分重构

* chore(version): Update version to v0.2.2-e6f17c4

---------

Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com>

* 🧪 test(auto_update): 修复测试用例 (#1633)

* 🐛 修复商店商品为空时报错 (#1634)

* 🐛 修复群权限与插件等级匹配 (#1635)

* ✨ message_build支持AtAll (#1639)

* 🎈 perf: 使用commit号下载插件 (#1641)

* 🎈 perf: 使用commit号下载插件

* chore(version): Update version to v0.2.2-f9c7360

---------

Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com>

* 🐳 chore: 修改运行检查触发路径 (#1642)

* 🐳 chore: 修改运行检查触发路径

* 🐳 chore: 添加tests目录

* ✨ 重构qq群事件处理 (#1643)

* 🐛 签到名称自适应 (#1644)

* 🎨  更新README (#1645)

* 🐛 fix(http_utils): 流式下载Content-Length错误 (#1647)

* 🐛 修复群组中帮助功能状态显示问题 (#1650)

* 🐛 修复群欢迎消息设置 (#1651)

* 🐛 修复webui下载后首次启动错误 (#1652)

* 🐛 修复webui下载后首次启动错误

* chore(version): Update version to v0.2.2-4a8ef85

---------

Co-authored-by: HibiKier <HibiKier@users.noreply.github.com>

* ✨ 移除默认图片文件夹：爬 (#1653)

* ✨ 安装/移除插件提供插件安装/卸载方法用于插件初始化 (#1654)

* ✨ 新增超级用户与管理员帮助模板 (#1655)

* ✨ 新增个人信息命令 (#1657)

* ✨ 修改个人信息菜单名称 (#1658)

* ✨ 新增插件商店api (#1659)

* ✨ 新增插件商店api

* chore(version): Update version to v0.2.2-7e15f20

---------

Co-authored-by: HibiKier <HibiKier@users.noreply.github.com>

* ✨ 将cd，block，count限制复原配置文件 (#1662)

* 🎨 修改README (#1663)

* 🎨 修改版本号 (#1664)

* 🎨 修改requirements (#1665)

---------

Co-authored-by: AkashiCoin <l1040186796@gmail.com>
Co-authored-by: fanyinrumeng <42991257+fanyinrumeng@users.noreply.github.com>
Co-authored-by: AkashiCoin <i@loli.vet>
Co-authored-by: Elaga <1728903318@qq.com>
Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com>
Co-authored-by: HibiKier <HibiKier@users.noreply.github.com>

zhenxun/builtin_plugins/hooks/_auth_checker.py

@@ -1,35 +1,34 @@
-from nonebot.adapters import Bot, Event
-from nonebot.adapters.onebot.v11 import PokeNotifyEvent
-from nonebot.exception import IgnoredException
-from nonebot.matcher import Matcher
-from nonebot_plugin_alconna import At, UniMsg
-from nonebot_plugin_session import EventSession
 from pydantic import BaseModel
+from nonebot.matcher import Matcher
+from nonebot.adapters import Bot, Event
+from nonebot_plugin_alconna import At, UniMsg
+from nonebot.exception import IgnoredException
 from tortoise.exceptions import IntegrityError
+from nonebot_plugin_session import EventSession
+from nonebot.adapters.onebot.v11 import PokeNotifyEvent
 
+from zhenxun.services.log import logger
 from zhenxun.configs.config import Config
-from zhenxun.models.group_console import GroupConsole
+from zhenxun.utils.message import MessageUtils
 from zhenxun.models.level_user import LevelUser
 from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.models.plugin_limit import PluginLimit
 from zhenxun.models.user_console import UserConsole
-from zhenxun.services.log import logger
+from zhenxun.utils.exception import InsufficientGold
+from zhenxun.models.group_console import GroupConsole
+from zhenxun.utils.utils import FreqLimiter, CountLimiter, UserBlockLimiter
 from zhenxun.utils.enum import (
     BlockType,
     GoldHandle,
+    PluginType,
     LimitWatchType,
     PluginLimitType,
-    PluginType,
 )
-from zhenxun.utils.exception import InsufficientGold
-from zhenxun.utils.message import MessageUtils
-from zhenxun.utils.utils import CountLimiter, FreqLimiter, UserBlockLimiter
 
 base_config = Config.get("hook")
 
 
 class Limit(BaseModel):
-
     limit: PluginLimit
     limiter: FreqLimiter | UserBlockLimiter | CountLimiter
 
@@ -38,12 +37,11 @@ class Limit(BaseModel):
 
 
 class LimitManage:
+    add_module = []  # noqa: RUF012
 
-    add_module = []
-
-    cd_limit: dict[str, Limit] = {}
-    block_limit: dict[str, Limit] = {}
-    count_limit: dict[str, Limit] = {}
+    cd_limit: dict[str, Limit] = {}  # noqa: RUF012
+    block_limit: dict[str, Limit] = {}  # noqa: RUF012
+    count_limit: dict[str, Limit] = {}  # noqa: RUF012
 
     @classmethod
     def add_limit(cls, limit: PluginLimit):
@@ -90,7 +88,7 @@ class LimitManage:
     @classmethod
     async def check(
         cls,
-        module: str,
+        module_path: str,
         user_id: str,
         group_id: str | None,
         channel_id: str | None,
@@ -108,17 +106,17 @@ class LimitManage:
         异常:
             IgnoredException: IgnoredException
         """
-        if limit_model := cls.cd_limit.get(module):
+        if limit_model := cls.cd_limit.get(module_path):
             await cls.__check(limit_model, user_id, group_id, channel_id, session)
-        if limit_model := cls.block_limit.get(module):
+        if limit_model := cls.block_limit.get(module_path):
             await cls.__check(limit_model, user_id, group_id, channel_id, session)
-        if limit_model := cls.count_limit.get(module):
+        if limit_model := cls.count_limit.get(module_path):
             await cls.__check(limit_model, user_id, group_id, channel_id, session)
 
     @classmethod
     async def __check(
         cls,
-        limit_model: Limit,
+        limit_model: Limit | None,
         user_id: str,
         group_id: str | None,
         channel_id: str | None,
@@ -136,33 +134,34 @@ class LimitManage:
         异常:
             IgnoredException: IgnoredException
         """
-        if limit_model:
-            limit = limit_model.limit
-            limiter = limit_model.limiter
-            is_limit = (
-                LimitWatchType.ALL
-                or (group_id and limit.watch_type == LimitWatchType.GROUP)
-                or (not group_id and limit.watch_type == LimitWatchType.USER)
+        if not limit_model:
+            return
+        limit = limit_model.limit
+        limiter = limit_model.limiter
+        is_limit = (
+            LimitWatchType.ALL
+            or (group_id and limit.watch_type == LimitWatchType.GROUP)
+            or (not group_id and limit.watch_type == LimitWatchType.USER)
+        )
+        key_type = user_id
+        if group_id and limit.watch_type == LimitWatchType.GROUP:
+            key_type = channel_id or group_id
+        if is_limit and not limiter.check(key_type):
+            if limit.result:
+                await MessageUtils.build_message(limit.result).send()
+            logger.debug(
+                f"{limit.module}({limit.limit_type}) 正在限制中...",
+                "HOOK",
+                session=session,
             )
-            key_type = user_id
-            if group_id and limit.watch_type == LimitWatchType.GROUP:
-                key_type = channel_id or group_id
-            if is_limit and not limiter.check(key_type):
-                if limit.result:
-                    await MessageUtils.build_message(limit.result).send()
-                logger.debug(
-                    f"{limit.module}({limit.limit_type}) 正在限制中...",
-                    "HOOK",
-                    session=session,
-                )
-                raise IgnoredException(f"{limit.module} 正在限制中...")
-            else:
-                if isinstance(limiter, FreqLimiter):
-                    limiter.start_cd(key_type)
-                if isinstance(limiter, UserBlockLimiter):
-                    limiter.set_true(key_type)
-                if isinstance(limiter, CountLimiter):
-                    limiter.increase(key_type)
+            raise IgnoredException(f"{limit.module} 正在限制中...")
+        else:
+            if isinstance(limiter, FreqLimiter):
+                limiter.start_cd(key_type)
+            if isinstance(limiter, UserBlockLimiter):
+                limiter.set_true(key_type)
+            if isinstance(limiter, CountLimiter):
+                limiter.increase(key_type)
 
 
 class IsSuperuserException(Exception):
@@ -196,11 +195,7 @@ class AuthChecker:
             return False
         if plugin.plugin_type == PluginType.DEPENDANT:
             return False
-        if not self._flmt_s.check(sid):
-            return False
-        if plugin.module == "ai":
-            return False
-        return True
+        return plugin.module != "ai" if self._flmt_s.check(sid) else False
 
     async def auth(
         self,
@@ -255,7 +250,7 @@ class AuthChecker:
                     await self.auth_limit(plugin, session)
                 except IsSuperuserException:
                     logger.debug(
-                        f"超级用户或被ban跳过权限检测...", "HOOK", session=session
+                        "超级用户或被ban跳过权限检测...", "HOOK", session=session
                     )
                 except IgnoredException:
                     is_ignore = True
@@ -296,12 +291,14 @@ class AuthChecker:
         if not group_id:
             group_id = channel_id
             channel_id = None
-        limit_list: list[PluginLimit] = await plugin.plugin_limit.all()  # type: ignore
+        limit_list: list[PluginLimit] = await plugin.plugin_limit.filter(
+            status=True
+        ).all()  # type: ignore
         for limit in limit_list:
             LimitManage.add_limit(limit)
         if user_id:
             await LimitManage.check(
-                plugin.module, user_id, group_id, channel_id, session
+                plugin.module_path, user_id, group_id, channel_id, session
             )
 
     async def auth_plugin(
@@ -313,14 +310,13 @@ class AuthChecker:
             plugin: PluginInfo
             session: EventSession
         """
-        user_id = session.id1
         group_id = session.id3
         channel_id = session.id2
-        is_poke = isinstance(event, PokeNotifyEvent)
         if not group_id:
             group_id = channel_id
             channel_id = None
-        if user_id:
+        if user_id := session.id1:
+            is_poke = isinstance(event, PokeNotifyEvent)
             if group_id:
                 sid = group_id or user_id
                 if await GroupConsole.is_super_block_plugin(
@@ -393,9 +389,8 @@ class AuthChecker:
                     raise IgnoredException("该插件在私聊中已被禁用...")
             if not plugin.status and plugin.block_type == BlockType.ALL:
                 """全局状态"""
-                if group_id:
-                    if await GroupConsole.is_super_group(group_id):
-                        raise IsSuperuserException()
+                if group_id and await GroupConsole.is_super_group(group_id):
+                    raise IsSuperuserException()
                 logger.debug(
                     f"{plugin.name}({plugin.module}) 全局未开启此功能...",
                     "HOOK",
@@ -414,9 +409,8 @@ class AuthChecker:
             session: EventSession
         """
         user_id = session.id1
-        group_id = session.id3 or session.id2
         if user_id and plugin.admin_level:
-            if group_id:
+            if group_id := session.id3 or session.id2:
                 if not await LevelUser.check_level(
                     user_id, group_id, plugin.admin_level
                 ):
@@ -426,7 +420,8 @@ class AuthChecker:
                             await MessageUtils.build_message(
                                 [
                                     At(flag="user", target=user_id),
-                                    f"你的权限不足喔，该功能需要的权限等级: {plugin.admin_level}",
+                                    f"你的权限不足喔，"
+                                    f"该功能需要的权限等级: {plugin.admin_level}",
                                 ]
                             ).send(reply_to=True)
                     except Exception as e:
@@ -439,22 +434,21 @@ class AuthChecker:
                         session=session,
                     )
                     raise IgnoredException("管理员权限不足...")
-            else:
-                if not await LevelUser.check_level(user_id, None, plugin.admin_level):
-                    try:
-                        await MessageUtils.build_message(
-                            f"你的权限不足喔，该功能需要的权限等级: {plugin.admin_level}"
-                        ).send()
-                    except Exception as e:
-                        logger.error(
-                            "auth_admin 发送消息失败", "HOOK", session=session, e=e
-                        )
-                    logger.debug(
-                        f"{plugin.name}({plugin.module}) 管理员权限不足...",
-                        "HOOK",
-                        session=session,
+            elif not await LevelUser.check_level(user_id, None, plugin.admin_level):
+                try:
+                    await MessageUtils.build_message(
+                        f"你的权限不足喔，该功能需要的权限等级: {plugin.admin_level}"
+                    ).send()
+                except Exception as e:
+                    logger.error(
+                        "auth_admin 发送消息失败", "HOOK", session=session, e=e
                     )
-                    raise IgnoredException("权限不足")
+                logger.debug(
+                    f"{plugin.name}({plugin.module}) 管理员权限不足...",
+                    "HOOK",
+                    session=session,
+                )
+                raise IgnoredException("权限不足")
 
     async def auth_group(
         self, plugin: PluginInfo, session: EventSession, message: UniMsg
@@ -466,29 +460,35 @@ class AuthChecker:
             session: EventSession
             message: UniMsg
         """
-        if group_id := session.id3 or session.id2:
-            text = message.extract_plain_text()
-            group = await GroupConsole.get_group(group_id)
-            if not group:
-                """群不存在"""
-                raise IgnoredException("群不存在")
-            if group.level < 0:
-                """群权限小于0"""
-                logger.debug(
-                    f"群黑名单, 群权限-1...",
-                    "HOOK",
-                    session=session,
-                )
-                raise IgnoredException("群黑名单")
-            if not group.status:
-                """群休眠"""
-                if text.strip() != "醒来":
-                    logger.debug(
-                        f"群休眠状态...",
-                        "HOOK",
-                        session=session,
-                    )
-                    raise IgnoredException("群休眠状态")
+        if not (group_id := session.id3 or session.id2):
+            return
+        text = message.extract_plain_text()
+        group = await GroupConsole.get_group(group_id)
+        if not group:
+            """群不存在"""
+            raise IgnoredException("群不存在")
+        if group.level < 0:
+            """群权限小于0"""
+            logger.debug(
+                "群黑名单, 群权限-1...",
+                "HOOK",
+                session=session,
+            )
+            raise IgnoredException("群黑名单")
+        if not group.status:
+            """群休眠"""
+            if text.strip() != "醒来":
+                logger.debug("群休眠状态...", "HOOK", session=session)
+                raise IgnoredException("群休眠状态")
+        if plugin.level > group.level:
+            """插件等级大于群等级"""
+            logger.debug(
+                f"{plugin.name}({plugin.module}) 群等级限制.."
+                f"该功能需要的群等级: {plugin.level}..",
+                "HOOK",
+                session=session,
+            )
+            raise IgnoredException(f"{plugin.name}({plugin.module}) 群等级限制...")
 
     async def auth_cost(
         self, user: UserConsole, plugin: PluginInfo, session: EventSession
@@ -512,7 +512,8 @@ class AuthChecker:
             except Exception as e:
                 logger.error("auth_cost 发送消息失败", "HOOK", session=session, e=e)
             logger.debug(
-                f"{plugin.name}({plugin.module}) 金币限制..该功能需要{plugin.cost_gold}金币..",
+                f"{plugin.name}({plugin.module}) 金币限制.."
+                f"该功能需要{plugin.cost_gold}金币..",
                 "HOOK",
                 session=session,
             )

zhenxun/builtin_plugins/hooks/chkdsk_hook.py

@@ -2,19 +2,19 @@ import time
 from collections import defaultdict
 
 from nonebot.adapters import Event
-from nonebot.adapters.onebot.v11 import Bot
-from nonebot.exception import IgnoredException
-from nonebot.matcher import Matcher
-from nonebot.message import run_preprocessor
 from nonebot.typing import T_State
+from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import At
+from nonebot.adapters.onebot.v11 import Bot
+from nonebot.message import run_preprocessor
+from nonebot.exception import IgnoredException
 from nonebot_plugin_session import EventSession
 
-from zhenxun.configs.config import Config
-from zhenxun.models.ban_console import BanConsole
 from zhenxun.services.log import logger
+from zhenxun.configs.config import Config
 from zhenxun.utils.enum import PluginType
 from zhenxun.utils.message import MessageUtils
+from zhenxun.models.ban_console import BanConsole
 
 malicious_check_time = Config.get_config("hook", "MALICIOUS_CHECK_TIME")
 malicious_ban_count = Config.get_config("hook", "MALICIOUS_BAN_COUNT")
@@ -36,12 +36,12 @@ class BanCheckLimiter:
         self.default_check_time = default_check_time
         self.default_count = default_count
 
-    def add(self, key: str | int | float):
+    def add(self, key: str | float):
         if self.mint[key] == 1:
             self.mtime[key] = time.time()
         self.mint[key] += 1
 
-    def check(self, key: str | int | float) -> bool:
+    def check(self, key: str | float) -> bool:
         if time.time() - self.mtime[key] > self.default_check_time:
             self.mtime[key] = time.time()
             self.mint[key] = 0
@@ -76,6 +76,7 @@ async def _(
                 PluginType.HIDDEN,
                 PluginType.DEPENDANT,
                 PluginType.ADMIN,
+                PluginType.SUPERUSER,
             ]:
                 return
         else:
@@ -101,7 +102,7 @@ async def _(
                 await MessageUtils.build_message(
                     [
                         At(flag="user", target=user_id),
-                        f"检测到恶意触发命令，您将被封禁 30 分钟",
+                        "检测到恶意触发命令，您将被封禁 30 分钟",
                     ]
                 ).send()
                 logger.debug(