版本更新 (#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>
2026-10-07 12:50:03 +08:00 · 2024-10-01 00:42:23 +08:00
parent daa40ae8b8
commit 4e33bf3a50
216 changed files with 10281 additions and 2538 deletions
@@ -1,40 +1,40 @@
 import nonebot
 from fastapi import APIRouter
-from nonebot.adapters.onebot.v11 import ActionFailed
 from tortoise.functions import Count
+from nonebot.adapters.onebot.v11 import ActionFailed

-from zhenxun.configs.config import BotConfig
-from zhenxun.models.ban_console import BanConsole
-from zhenxun.models.chat_history import ChatHistory
-from zhenxun.models.fg_request import FgRequest
-from zhenxun.models.group_console import GroupConsole
-from zhenxun.models.plugin_info import PluginInfo
-from zhenxun.models.statistics import Statistics
-from zhenxun.models.task_info import TaskInfo
 from zhenxun.services.log import logger
-from zhenxun.utils.enum import RequestHandleType, RequestType
-from zhenxun.utils.exception import NotFoundError
+from zhenxun.configs.config import BotConfig
+from zhenxun.models.task_info import TaskInfo
+from zhenxun.models.fg_request import FgRequest
+from zhenxun.models.statistics import Statistics
 from zhenxun.utils.platform import PlatformUtils
+from zhenxun.models.ban_console import BanConsole
+from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.utils.exception import NotFoundError
+from zhenxun.models.chat_history import ChatHistory
+from zhenxun.models.group_console import GroupConsole
+from zhenxun.utils.enum import RequestType, RequestHandleType

 from ....base_model import Result
-from ....config import AVA_URL, GROUP_AVA_URL
 from ....utils import authentication
+from ....config import AVA_URL, GROUP_AVA_URL
 from .model import (
-    ClearRequest,
-    DeleteFriend,
+    Task,
    Friend,
-    FriendRequestResult,
-    GroupDetail,
-    GroupRequestResult,
-    GroupResult,
-    HandleRequest,
-    LeaveGroup,
    Plugin,
    ReqResult,
-    SendMessage,
-    Task,
-    UpdateGroup,
+    LeaveGroup,
    UserDetail,
+    GroupDetail,
+    GroupResult,
+    SendMessage,
+    UpdateGroup,
+    ClearRequest,
+    DeleteFriend,
+    HandleRequest,
+    GroupRequestResult,
+    FriendRequestResult,
 )

 router = APIRouter(prefix="/manage")
@@ -47,21 +47,21 @@ async def _(bot_id: str) -> Result:
    """
    获取群信息
    """
-    if bots := nonebot.get_bots():
-        if bot_id not in bots:
-            return Result.warning_("指定Bot未连接...")
-        group_list_result = []
-        try:
-            group_list = await bots[bot_id].get_group_list()
-            for g in group_list:
-                gid = g["group_id"]
-                g["ava_url"] = GROUP_AVA_URL.format(gid, gid)
-                group_list_result.append(GroupResult(**g))
-        except Exception as e:
-            logger.error("调用API错误", "/get_group_list", e=e)
-            return Result.fail(f"{type(e)}: {e}")
-        return Result.ok(group_list_result, "拿到了新鲜出炉的数据!")
-    return Result.warning_("无Bot连接...")
+    if not (bots := nonebot.get_bots()):
+        return Result.warning_("无Bot连接...")
+    if bot_id not in bots:
+        return Result.warning_("指定Bot未连接...")
+    group_list_result = []
+    try:
+        group_list = await bots[bot_id].get_group_list()
+        for g in group_list:
+            gid = g["group_id"]
+            g["ava_url"] = GROUP_AVA_URL.format(gid, gid)
+            group_list_result.append(GroupResult(**g))
+    except Exception as e:
+        logger.error("调用API错误", "/get_group_list", e=e)
+        return Result.fail(f"{type(e)}: {e}")
+    return Result.ok(group_list_result, "拿到了新鲜出炉的数据!")


@router.post(
@@ -77,12 +77,8 @@ async def _(group: UpdateGroup) -> Result:
            if group.close_plugins:
                db_group.block_plugin = ",".join(group.close_plugins) + ","
            if group.task:
-                block_task = []
-                for t in task_list:
-                    if t not in group.task:
-                        block_task.append(t)
-                if block_task:
-                    db_group.block_task = ",".join(block_task) + ","
+                if block_task := [t for t in task_list if t not in group.task]:
+                    db_group.block_task = ",".join(block_task) + ","  # type: ignore
            await db_group.save(
                update_fields=["level", "status", "block_plugin", "block_task"]
            )
@@ -199,7 +195,7 @@ async def _(parma: HandleRequest) -> Result:
                return Result.warning_("指定Bot未连接...")
            try:
                await FgRequest.refused(bots[bot_id], parma.id)
-            except ActionFailed as e:
+            except ActionFailed:
                await FgRequest.expire(parma.id)
                return Result.warning_("请求失败，可能该请求已失效或请求数据错误...")
            except NotFoundError:
@@ -226,22 +222,21 @@ async def _(parma: HandleRequest) -> Result:
            bot_id = parma.bot_id
            if bot_id not in nonebot.get_bots():
                return Result.warning_("指定Bot未连接...")
-            if req := await FgRequest.get_or_none(id=parma.id):
-                if req.request_type == RequestType.GROUP:
-                    if group := await GroupConsole.get_group(group_id=req.group_id):
-                        group.group_flag = 1
-                        await group.save(update_fields=["group_flag"])
-                    else:
-                        await GroupConsole.update_or_create(
-                            group_id=req.group_id,
-                            defaults={"group_flag": 1},
-                        )
-            else:
+            if not (req := await FgRequest.get_or_none(id=parma.id)):
                return Result.warning_("未找到此Id请求...")
+            if req.request_type == RequestType.GROUP:
+                if group := await GroupConsole.get_group(group_id=req.group_id):
+                    group.group_flag = 1
+                    await group.save(update_fields=["group_flag"])
+                else:
+                    await GroupConsole.update_or_create(
+                        group_id=req.group_id,
+                        defaults={"group_flag": 1},
+                    )
            try:
                await FgRequest.approve(bots[bot_id], parma.id)
                return Result.ok(info="成功处理了请求!")
-            except ActionFailed as e:
+            except ActionFailed:
                await FgRequest.expire(parma.id)
                return Result.warning_("请求失败，可能该请求已失效或请求数据错误...")
        return Result.warning_("无Bot连接...")
@@ -335,99 +330,98 @@ async def _(bot_id: str, user_id: str) -> Result:
    "/get_group_detail", dependencies=[authentication()], description="获取群组详情"
 )
 async def _(bot_id: str, group_id: str) -> Result:
-    if bots := nonebot.get_bots():
-        if bot_id in bots:
-            group = await GroupConsole.get_or_none(group_id=group_id)
-            if not group:
-                return Result.warning_("指定群组未被收录...")
-            like_plugin_list = (
-                await Statistics.filter(group_id=group_id)
-                .annotate(count=Count("id"))
-                .group_by("plugin_name")
-                .order_by("-count")
-                .limit(5)
-                .values_list("plugin_name", "count")
+    if not (bots := nonebot.get_bots()):
+        return Result.warning_("无Bot连接...")
+    if bot_id not in bots:
+        return Result.warning_("未添加指定群组...")
+    group = await GroupConsole.get_or_none(group_id=group_id)
+    if not group:
+        return Result.warning_("指定群组未被收录...")
+    like_plugin_list = (
+        await Statistics.filter(group_id=group_id)
+        .annotate(count=Count("id"))
+        .group_by("plugin_name")
+        .order_by("-count")
+        .limit(5)
+        .values_list("plugin_name", "count")
+    )
+    like_plugin = {}
+    plugins = await PluginInfo.all()
+    module2name = {p.module: p.name for p in plugins}
+    for data in like_plugin_list:
+        name = module2name.get(data[0]) or data[0]
+        like_plugin[name] = data[1]
+    close_plugins = []
+    if group.block_plugin:
+        for module in group.block_plugin.split(","):
+            module_ = module.replace(":super", "")
+            is_super_block = module.endswith(":super")
+            plugin = Plugin(
+                module=module_,
+                plugin_name=module,
+                is_super_block=is_super_block,
            )
-            like_plugin = {}
-            plugins = await PluginInfo.all()
-            module2name = {p.module: p.name for p in plugins}
-            for data in like_plugin_list:
-                name = module2name.get(data[0]) or data[0]
-                like_plugin[name] = data[1]
-            close_plugins = []
-            if group.block_plugin:
-                for module in group.block_plugin.split(","):
-                    module_ = module.replace(":super", "")
-                    is_super_block = module.endswith(":super")
-                    plugin = Plugin(
-                        module=module_,
-                        plugin_name=module,
-                        is_super_block=is_super_block,
-                    )
-                    plugin.plugin_name = module2name.get(module) or module
-                    close_plugins.append(plugin)
-            all_task = await TaskInfo.annotate().values_list("module", "name")
-            task_module2name = {x[0]: x[1] for x in all_task}
-            task_list = []
-            if group.block_task:
-                split_task = group.block_task.split(",")
-                for task in all_task:
-                    task_list.append(
-                        Task(
-                            name=task[0],
-                            zh_name=task_module2name.get(task[0]) or task[0],
-                            status=task[0] not in split_task,
-                        )
-                    )
-            else:
-                for task in all_task:
-                    task_list.append(
-                        Task(
-                            name=task[0],
-                            zh_name=task_module2name.get(task[0]) or task[0],
-                            status=True,
-                        )
-                    )
-            group_detail = GroupDetail(
-                group_id=group_id,
-                ava_url=GROUP_AVA_URL.format(group_id, group_id),
-                name=group.group_name,
-                member_count=group.member_count,
-                max_member_count=group.max_member_count,
-                chat_count=await ChatHistory.filter(group_id=group_id).count(),
-                call_count=await Statistics.filter(group_id=group_id).count(),
-                like_plugin=like_plugin,
-                level=group.level,
-                status=group.status,
-                close_plugins=close_plugins,
-                task=task_list,
+            plugin.plugin_name = module2name.get(module) or module
+            close_plugins.append(plugin)
+    all_task = await TaskInfo.annotate().values_list("module", "name")
+    task_module2name = {x[0]: x[1] for x in all_task}
+    task_list = []
+    if group.block_task:
+        split_task = group.block_task.split(",")
+        for task in all_task:
+            task_list.append(
+                Task(
+                    name=task[0],
+                    zh_name=task_module2name.get(task[0]) or task[0],
+                    status=task[0] not in split_task,
+                )
            )
-            return Result.ok(group_detail)
-        else:
-            return Result.warning_("未添加指定群组...")
-    return Result.warning_("无Bot连接...")
+    else:
+        for task in all_task:
+            task_list.append(
+                Task(
+                    name=task[0],
+                    zh_name=task_module2name.get(task[0]) or task[0],
+                    status=True,
+                )
+            )
+    group_detail = GroupDetail(
+        group_id=group_id,
+        ava_url=GROUP_AVA_URL.format(group_id, group_id),
+        name=group.group_name,
+        member_count=group.member_count,
+        max_member_count=group.max_member_count,
+        chat_count=await ChatHistory.filter(group_id=group_id).count(),
+        call_count=await Statistics.filter(group_id=group_id).count(),
+        like_plugin=like_plugin,
+        level=group.level,
+        status=group.status,
+        close_plugins=close_plugins,
+        task=task_list,
+    )
+    return Result.ok(group_detail)


@router.post(
    "/send_message", dependencies=[authentication()], description="获取群组详情"
 )
 async def _(param: SendMessage) -> Result:
-    if bots := nonebot.get_bots():
-        if param.bot_id in bots:
-            platform = PlatformUtils.get_platform(bots[param.bot_id])
-            if platform != "qq":
-                return Result.warning_("暂不支持该平台...")
-            try:
-                if param.user_id:
-                    await bots[param.bot_id].send_private_msg(
-                        user_id=str(param.user_id), message=param.message
-                    )
-                else:
-                    await bots[param.bot_id].send_group_msg(
-                        group_id=str(param.group_id), message=param.message
-                    )
-            except Exception as e:
-                return Result.fail(str(e))
-            return Result.ok("发送成功!")
-        return Result.warning_("指定Bot未连接...")
-    return Result.warning_("无Bot连接...")
+    if not (bots := nonebot.get_bots()):
+        return Result.warning_("无Bot连接...")
+    if param.bot_id in bots:
+        platform = PlatformUtils.get_platform(bots[param.bot_id])
+        if platform != "qq":
+            return Result.warning_("暂不支持该平台...")
+        try:
+            if param.user_id:
+                await bots[param.bot_id].send_private_msg(
+                    user_id=str(param.user_id), message=param.message
+                )
+            else:
+                await bots[param.bot_id].send_group_msg(
+                    group_id=str(param.group_id), message=param.message
+                )
+        except Exception as e:
+            return Result.fail(str(e))
+        return Result.ok("发送成功!")
+    return Result.warning_("指定Bot未连接...")
@@ -1,20 +1,15 @@
-import re
-from typing import Literal
-
 import nonebot
 from fastapi import APIRouter
 from nonebot import on_message
-from nonebot.adapters.onebot.v11 import MessageEvent
-from nonebot_plugin_alconna import At, Emoji, Hyper, Image, Text, UniMessage, UniMsg
 from nonebot_plugin_session import EventSession
-from starlette.websockets import WebSocket, WebSocketDisconnect, WebSocketState
+from nonebot.adapters.onebot.v11 import MessageEvent
+from nonebot_plugin_alconna import At, Text, Hyper, Image, UniMsg
+from starlette.websockets import WebSocket, WebSocketState, WebSocketDisconnect

-from zhenxun.models.friend_user import FriendUser
-from zhenxun.models.group_console import GroupConsole
-from zhenxun.models.group_member_info import GroupInfoUser
 from zhenxun.utils.depends import UserName
+from zhenxun.models.group_member_info import GroupInfoUser

-from ....config import AVA_URL, GROUP_AVA_URL
+from ....config import AVA_URL
 from .model import Message, MessageItem

 driver = nonebot.get_driver()
@@ -27,7 +22,8 @@ ID_LIST = []

 ws_router = APIRouter()

-matcher = on_message(block=False, priority=1)
+
+matcher = on_message(block=False, priority=1, rule=lambda: bool(ws_conn))


@driver.on_shutdown
@@ -44,7 +40,7 @@ async def _(websocket: WebSocket):
        ws_conn = websocket
        try:
            while websocket.client_state == WebSocketState.CONNECTED:
-                recv = await websocket.receive()
+                await websocket.receive()
        except WebSocketDisconnect:
            ws_conn = None

@@ -55,7 +51,7 @@ async def message_handle(
 ):
    messages = []
    for m in message:
-        if isinstance(m, (Text, str)):
+        if isinstance(m, Text | str):
            messages.append(MessageItem(type="text", msg=str(m)))
        elif isinstance(m, Image):
            if m.url:
@@ -70,18 +66,15 @@ async def message_handle(
                        ID2NAME[group_id] = {}
                    if m.target in ID2NAME[group_id]:
                        uname = ID2NAME[group_id][m.target]
-                    else:
-                        if group_user := await GroupInfoUser.get_or_none(
-                            user_id=m.target, group_id=group_id
-                        ):
-                            uname = group_user.user_name
-                            if m.target not in ID2NAME[group_id]:
-                                ID2NAME[group_id][m.target] = uname
+                    elif group_user := await GroupInfoUser.get_or_none(
+                        user_id=m.target, group_id=group_id
+                    ):
+                        uname = group_user.user_name
+                        if m.target not in ID2NAME[group_id]:
+                            ID2NAME[group_id][m.target] = uname
                messages.append(MessageItem(type="at", msg=f"@{uname}"))
-        # elif isinstance(m, Emoji):
-        # messages.append(MessageItem(type="text", msg=f"[emoji]"))
        elif isinstance(m, Hyper):
-            messages.append(MessageItem(type="text", msg=f"[分享消息]"))
+            messages.append(MessageItem(type="text", msg="[分享消息]"))
    return messages


@@ -91,7 +84,6 @@ async def _(
 ):
    global ws_conn, ID2NAME, ID_LIST
    uid = session.id1
-    gid = session.id3 or session.id2
    if ws_conn and ws_conn.client_state == WebSocketState.CONNECTED and uid:
        msg_id = event.message_id
        if msg_id in ID_LIST:
@@ -99,6 +91,7 @@ async def _(
        ID_LIST.append(msg_id)
        if len(ID_LIST) > 50:
            ID_LIST = ID_LIST[40:]
+        gid = session.id3 or session.id2
        messages = await message_handle(message, gid)
        data = Message(
            object_id=gid or uid,
@@ -1,5 +1,3 @@
-from typing import Literal
-
 from pydantic import BaseModel

 from zhenxun.utils.enum import RequestType
@@ -232,7 +230,6 @@ class GroupDetail(BaseModel):


 class MessageItem(BaseModel):
-
    type: str
    """消息类型"""
    msg: str