版本更新 (#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/web_ui/api/__init__.py

@@ -1 +1 @@
-from .tabs import *
+from .tabs import *  # noqa: F403

zhenxun/builtin_plugins/web_ui/api/logs/__init__.py

@@ -1 +1 @@
-from .logs import *
+from .logs import *  # noqa: F403

zhenxun/builtin_plugins/web_ui/api/logs/log_manager.py

@@ -1,7 +1,6 @@
 import asyncio
-from typing import Awaitable, Callable, Generic, TypeVar
-
-PATTERN = r"\x1b(\[.*?[@-~]|\].*?(\x07|\x1b\\))"
+from typing import Generic, TypeVar
+from collections.abc import Callable, Awaitable
 
 _T = TypeVar("_T")
 LogListener = Callable[[_T], Awaitable[None]]
@@ -22,14 +21,13 @@ class LogStorage(Generic[_T]):
         self.logs[seq] = log
         asyncio.get_running_loop().call_later(self.rotation, self.remove, seq)
         await asyncio.gather(
-            *map(lambda listener: listener(log), self.listeners),
+            *(listener(log) for listener in self.listeners),
             return_exceptions=True,
         )
         return seq
 
     def remove(self, seq: int):
         del self.logs[seq]
-        return
 
 
 LOG_STORAGE: LogStorage[str] = LogStorage[str]()

zhenxun/builtin_plugins/web_ui/api/logs/logs.py

@@ -1,7 +1,7 @@
-from fastapi import APIRouter, WebSocket
 from loguru import logger
+from fastapi import APIRouter
 from nonebot.utils import escape_tag
-from starlette.websockets import WebSocket, WebSocketDisconnect, WebSocketState
+from starlette.websockets import WebSocket, WebSocketState, WebSocketDisconnect
 
 from .log_manager import LOG_STORAGE
 
@@ -27,4 +27,3 @@ async def system_logs_realtime(websocket: WebSocket):
         pass
     finally:
         LOG_STORAGE.listeners.remove(log_listener)
-    return

zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/__init__.py

@@ -0,0 +1,22 @@
+from nonebot import require
+from fastapi import APIRouter
+
+from ....base_model import Result
+from .data_source import BotManage
+from ....utils import authentication
+
+require("plugin_store")
+
+router = APIRouter(prefix="/dashboard")
+
+
+@router.get(
+    "/get_bot_list",
+    dependencies=[authentication()],
+    deprecated="获取bot列表",  # type: ignore
+)
+async def _() -> Result:
+    try:
+        return Result.ok(await BotManage.get_bot_list(), "拿到信息啦!")
+    except Exception as e:
+        return Result.fail(f"发生了一点错误捏 {type(e)}: {e}")

zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py

@@ -0,0 +1,81 @@
+import time
+from datetime import datetime, timedelta
+
+import nonebot
+from nonebot.adapters import Bot
+from nonebot.drivers import Driver
+
+from zhenxun.models.statistics import Statistics
+from zhenxun.utils.platform import PlatformUtils
+from zhenxun.models.chat_history import ChatHistory
+
+from .model import BotInfo
+from ..main.data_source import bot_live
+
+driver: Driver = nonebot.get_driver()
+
+
+CONNECT_TIME = 0
+
+
+@driver.on_startup
+async def _():
+    global CONNECT_TIME
+    CONNECT_TIME = int(time.time())
+
+
+class BotManage:
+    @classmethod
+    async def __build_bot_info(cls, bot: Bot) -> BotInfo:
+        """构建Bot信息
+
+        参数:
+            bot: Bot
+
+        返回:
+            BotInfo: Bot信息
+        """
+        now = datetime.now()
+        platform = PlatformUtils.get_platform(bot) or ""
+        if platform == "qq":
+            login_info = await bot.get_login_info()
+            nickname = login_info["nickname"]
+            ava_url = PlatformUtils.get_user_avatar_url(bot.self_id, "qq") or ""
+        else:
+            nickname = bot.self_id
+            ava_url = ""
+        bot_info = BotInfo(
+            self_id=bot.self_id, nickname=nickname, ava_url=ava_url, platform=platform
+        )
+        group_list, _ = await PlatformUtils.get_group_list(bot)
+        group_list = [g for g in group_list if g.channel_id is None]
+        friend_list = await PlatformUtils.get_friend_list(bot)
+        bot_info.group_count = len(group_list)
+        bot_info.friend_count = len(friend_list)
+        bot_info.day_call = await Statistics.filter(
+            create_time__gte=now - timedelta(hours=now.hour, minutes=now.minute)
+        ).count()
+        bot_info.received_messages = await ChatHistory.filter(
+            bot_id=bot_info.self_id,
+            create_time__gte=now - timedelta(hours=now.hour, minutes=now.minute),
+        ).count()
+        bot_info.connect_time = bot_live.get(bot.self_id) or 0
+        if bot_info.connect_time:
+            connect_date = datetime.fromtimestamp(CONNECT_TIME)
+            connect_date_str = connect_date.strftime("%Y-%m-%d %H:%M:%S")
+            bot_info.connect_date = datetime.strptime(
+                connect_date_str, "%Y-%m-%d %H:%M:%S"
+            )
+        return bot_info
+
+    @classmethod
+    async def get_bot_list(cls) -> list[BotInfo]:
+        """获取bot列表
+
+        返回:
+            list[BotInfo]: Bot列表
+        """
+        bot_list: list[BotInfo] = []
+        for _, bot in nonebot.get_bots().items():
+            bot_list.append(await cls.__build_bot_info(bot))
+        return bot_list

zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/model.py

@@ -0,0 +1,26 @@
+from datetime import datetime
+
+from pydantic import BaseModel
+
+
+class BotInfo(BaseModel):
+    self_id: str
+    """SELF ID"""
+    nickname: str
+    """昵称"""
+    ava_url: str
+    """头像url"""
+    platform: str
+    """平台"""
+    friend_count: int = 0
+    """好友数量"""
+    group_count: int = 0
+    """群聊数量"""
+    received_messages: int = 0
+    """今日消息接收"""
+    day_call: int = 0
+    """今日调用插件次数"""
+    connect_time: int = 0
+    """连接时间"""
+    connect_date: datetime | None = None
+    """连接日期"""

zhenxun/builtin_plugins/web_ui/api/tabs/database/__init__.py

@@ -1,16 +1,16 @@
 import nonebot
-from fastapi import APIRouter, Request
-from nonebot.drivers import Driver
 from tortoise import Tortoise
+from nonebot.drivers import Driver
+from fastapi import Request, APIRouter
 from tortoise.exceptions import OperationalError
 
-from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.models.task_info import TaskInfo
+from zhenxun.models.plugin_info import PluginInfo
 
-from ....base_model import BaseResultModel, QueryModel, Result
-from ....utils import authentication
-from .models.model import SqlModel, SqlText
 from .models.sql_log import SqlLog
+from ....utils import authentication
+from .models.model import SqlText, SqlModel
+from ....base_model import Result, QueryModel, BaseResultModel
 
 router = APIRouter(prefix="/database")
 
@@ -24,7 +24,8 @@ SQL_DICT = {}
 SELECT_TABLE_SQL = """
 select a.tablename as name,d.description as desc from pg_tables a
     left join pg_class c on relname=tablename
-    left join pg_description d on oid=objoid and objsubid=0 where a.schemaname = 'public'
+    left join pg_description d on oid=objoid
+    and objsubid=0 where a.schemaname = 'public'
 """
 
 SELECT_TABLE_COLUMN_SQL = """
@@ -57,10 +58,7 @@ async def _():
         module2name = {r[0]: r[1] for r in result}
         for s in SQL_DICT:
             module = SQL_DICT[s].module
-            if module in module2name:
-                SQL_DICT[s].name = module2name[module]
-            else:
-                SQL_DICT[s].name = module
+            SQL_DICT[s].name = module2name.get(module, module)
 
 
 @router.get(
@@ -77,7 +75,7 @@ async def _() -> Result:
 )
 async def _(table_name: str) -> Result:
     db = Tortoise.get_connection("default")
-    print(SELECT_TABLE_COLUMN_SQL.format(table_name))
+    # print(SELECT_TABLE_COLUMN_SQL.format(table_name))
     query = await db.execute_query_dict(SELECT_TABLE_COLUMN_SQL.format(table_name))
     return Result.ok(query)
 
@@ -92,7 +90,7 @@ async def _(sql: SqlText, request: Request) -> Result:
             await SqlLog.add(ip or "0.0.0.0", sql.sql, "")
             return Result.ok(res, "执行成功啦!")
         else:
-            result = await TestSQL.raw(sql.sql)
+            result = await TaskInfo.raw(sql.sql)
             await SqlLog.add(ip or "0.0.0.0", sql.sql, str(result))
             return Result.ok(info="执行成功啦!")
     except OperationalError as e:

zhenxun/builtin_plugins/web_ui/api/tabs/database/models/sql_log.py

@@ -4,7 +4,6 @@ from zhenxun.services.db_context import Model
 
 
 class SqlLog(Model):
-
     id = fields.IntField(pk=True, generated=True, auto_increment=True)
     """自增id"""
     ip = fields.CharField(255)
@@ -18,7 +17,7 @@ class SqlLog(Model):
     create_time = fields.DatetimeField(auto_now_add=True)
     """创建时间"""
 
-    class Meta:
+    class Meta:  # type: ignore
         table = "sql_log"
         table_description = "sql执行日志"
 

zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py

@@ -1,26 +1,27 @@
-import asyncio
 import time
-from datetime import datetime, timedelta
+import asyncio
+import contextlib
 from pathlib import Path
+from datetime import datetime, timedelta
 
 import nonebot
-from fastapi import APIRouter, WebSocket
-from starlette.websockets import WebSocket, WebSocketDisconnect, WebSocketState
+from fastapi import APIRouter
 from tortoise.functions import Count
-from websockets.exceptions import ConnectionClosedError, ConnectionClosedOK
+from websockets.exceptions import ConnectionClosedOK, ConnectionClosedError
+from starlette.websockets import WebSocket, WebSocketState, WebSocketDisconnect
 
-from zhenxun.models.chat_history import ChatHistory
-from zhenxun.models.group_info import GroupInfo
-from zhenxun.models.plugin_info import PluginInfo
-from zhenxun.models.statistics import Statistics
 from zhenxun.services.log import logger
+from zhenxun.models.group_info import GroupInfo
+from zhenxun.models.statistics import Statistics
 from zhenxun.utils.platform import PlatformUtils
+from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.models.chat_history import ChatHistory
 
 from ....base_model import Result
-from ....config import AVA_URL, GROUP_AVA_URL, QueryDateType
-from ....utils import authentication, get_system_status
 from .data_source import bot_live
-from .model import ActiveGroup, BaseInfo, ChatHistoryCount, HotPlugin
+from ....utils import authentication, get_system_status
+from ....config import AVA_URL, GROUP_AVA_URL, QueryDateType
+from .model import BaseInfo, HotPlugin, ActiveGroup, ChatHistoryCount
 
 run_time = time.time()
 
@@ -131,7 +132,7 @@ async def _(bot_id: str) -> Result:
     "/get_ch_count", dependencies=[authentication()], description="获取接收消息数量"
 )
 async def _(bot_id: str, query_type: QueryDateType | None = None) -> Result:
-    if bots := nonebot.get_bots():
+    if nonebot.get_bot(bot_id):
         if not query_type:
             return Result.ok(await ChatHistory.filter(bot_id=bot_id).count())
         now = datetime.now()
@@ -210,7 +211,6 @@ async def _(date_type: QueryDateType | None = None) -> Result:
         .limit(5)
         .values_list("group_id", "count")
     )
-    active_group_list = []
     id2name = {}
     if data_list:
         if info_list := await GroupInfo.filter(
@@ -218,15 +218,15 @@ async def _(date_type: QueryDateType | None = None) -> Result:
         ).all():
             for group_info in info_list:
                 id2name[group_info.group_id] = group_info.group_name
-    for data in data_list:
-        active_group_list.append(
-            ActiveGroup(
-                group_id=data[0],
-                name=id2name.get(data[0]) or data[0],
-                chat_num=data[1],
-                ava_img=GROUP_AVA_URL.format(data[0], data[0]),
-            )
+    active_group_list = [
+        ActiveGroup(
+            group_id=data[0],
+            name=id2name.get(data[0]) or data[0],
+            chat_num=data[1],
+            ava_img=GROUP_AVA_URL.format(data[0], data[0]),
         )
+        for data in data_list
+    ]
     active_group_list = sorted(
         active_group_list, key=lambda x: x.chat_num, reverse=True
     )
@@ -263,13 +263,7 @@ async def _(date_type: QueryDateType | None = None) -> Result:
     for data in data_list:
         module = data[0]
         name = module2name.get(module) or module
-        hot_plugin_list.append(
-            HotPlugin(
-                module=data[0],
-                name=name,
-                count=data[1],
-            )
-        )
+        hot_plugin_list.append(HotPlugin(module=module, name=name, count=data[1]))
     hot_plugin_list = sorted(hot_plugin_list, key=lambda x: x.count, reverse=True)
     if len(hot_plugin_list) > 5:
         hot_plugin_list = hot_plugin_list[:5]
@@ -280,11 +274,11 @@ async def _(date_type: QueryDateType | None = None) -> Result:
 async def system_logs_realtime(websocket: WebSocket, sleep: int = 5):
     await websocket.accept()
     logger.debug("ws system_status is connect")
-    try:
+    with contextlib.suppress(
+        WebSocketDisconnect, ConnectionClosedError, ConnectionClosedOK
+    ):
         while websocket.client_state == WebSocketState.CONNECTED:
             system_status = await get_system_status()
             await websocket.send_text(system_status.json())
             await asyncio.sleep(sleep)
-    except (WebSocketDisconnect, ConnectionClosedError, ConnectionClosedOK):
-        pass
     return

zhenxun/builtin_plugins/web_ui/api/tabs/manage/__init__.py

@@ -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未连接...")

zhenxun/builtin_plugins/web_ui/api/tabs/manage/chat.py

@@ -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,

zhenxun/builtin_plugins/web_ui/api/tabs/manage/model.py

@@ -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

zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/__init__.py

@@ -1,20 +1,20 @@
 import re
 
 import cattrs
-from fastapi import APIRouter, Query
+from fastapi import Query, APIRouter
 
-from zhenxun.configs.config import Config
-from zhenxun.models.plugin_info import PluginInfo as DbPluginInfo
 from zhenxun.services.log import logger
+from zhenxun.configs.config import Config
 from zhenxun.utils.enum import BlockType, PluginType
+from zhenxun.models.plugin_info import PluginInfo as DbPluginInfo
 
 from ....base_model import Result
 from ....utils import authentication
 from .model import (
-    PluginConfig,
-    PluginCount,
-    PluginDetail,
     PluginInfo,
+    PluginCount,
+    PluginConfig,
+    PluginDetail,
     PluginSwitch,
     UpdatePlugin,
 )
@@ -23,7 +23,9 @@ router = APIRouter(prefix="/plugin")
 
 
 @router.get(
-    "/get_plugin_list", dependencies=[authentication()], deprecated="获取插件列表"  # type: ignore
+    "/get_plugin_list",
+    dependencies=[authentication()],
+    deprecated="获取插件列表",  # type: ignore
 )
 async def _(
     plugin_type: list[PluginType] = Query(None), menu_type: str | None = None
@@ -57,7 +59,9 @@ async def _(
 
 
 @router.get(
-    "/get_plugin_count", dependencies=[authentication()], deprecated="获取插件数量"  # type: ignore
+    "/get_plugin_count",
+    dependencies=[authentication()],
+    deprecated="获取插件数量",  # type: ignore
 )
 async def _() -> Result:
     plugin_count = PluginCount()
@@ -93,10 +97,7 @@ async def _(plugin: UpdatePlugin) -> Result:
         db_plugin.level = plugin.level
         db_plugin.menu_type = plugin.menu_type
         db_plugin.block_type = plugin.block_type
-        if plugin.block_type == BlockType.ALL:
-            db_plugin.status = False
-        else:
-            db_plugin.status = True
+        db_plugin.status = plugin.block_type != BlockType.ALL
         await db_plugin.save()
         # 配置项
         if plugin.configs and (configs := Config.get(plugin.module)):
@@ -149,19 +150,15 @@ async def _(module: str) -> Result:
         for cfg in config.configs:
             type_str = ""
             type_inner = None
-            x = str(config.configs[cfg].type)
-            r = re.search(r"<class '(.*)'>", str(config.configs[cfg].type))
-            if r:
-                type_str = r.group(1)
-            else:
-                r = re.search(r"typing\.(.*)\[(.*)\]", str(config.configs[cfg].type))
-                if r:
-                    type_str = r.group(1)
-                    if type_str:
-                        type_str = type_str.lower()
-                    type_inner = r.group(2)
-                    if type_inner:
-                        type_inner = [x.strip() for x in type_inner.split(",")]
+            if r := re.search(r"<class '(.*)'>", str(config.configs[cfg].type)):
+                type_str = r[1]
+            elif r := re.search(r"typing\.(.*)\[(.*)\]", str(config.configs[cfg].type)):
+                type_str = r[1]
+                if type_str:
+                    type_str = type_str.lower()
+                type_inner = r[2]
+                if type_inner:
+                    type_inner = [x.strip() for x in type_inner.split(",")]
             config_list.append(
                 PluginConfig(
                     module=module,

zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/model.py

@@ -123,3 +123,8 @@ class PluginDetail(PluginInfo):
     """
 
     config_list: list[PluginConfig]
+
+
+class PluginIr(BaseModel):
+    id: int
+    """插件id"""

zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/store.py

@@ -0,0 +1,50 @@
+from nonebot import require
+from fastapi import APIRouter
+
+from .model import PluginIr
+from ....base_model import Result
+from ....utils import authentication
+
+require("plugin_store")
+from zhenxun.builtin_plugins.plugin_store import ShopManage
+
+router = APIRouter(prefix="/store")
+
+
+@router.get(
+    "/get_plugin_store",
+    dependencies=[authentication()],
+    deprecated="获取插件商店插件信息",  # type: ignore
+)
+async def _() -> Result:
+    try:
+        data = await ShopManage.get_data()
+        return Result.ok(data)
+    except Exception as e:
+        return Result.fail(f"获取插件商店插件信息失败: {type(e)}: {e}")
+
+
+@router.post(
+    "/install_plugin",
+    dependencies=[authentication()],
+    deprecated="安装插件",  # type: ignore
+)
+async def _(param: PluginIr) -> Result:
+    try:
+        result = await ShopManage.add_plugin(param.id)  # type: ignore
+        return Result.ok(result)
+    except Exception as e:
+        return Result.fail(f"安装插件失败: {type(e)}: {e}")
+
+
+@router.post(
+    "/remove_plugin",
+    dependencies=[authentication()],
+    deprecated="移除插件",  # type: ignore
+)
+async def _(param: PluginIr) -> Result:
+    try:
+        result = await ShopManage.remove_plugin(param.id)  # type: ignore
+        return Result.ok(result)
+    except Exception as e:
+        return Result.fail(f"移除插件失败: {type(e)}: {e}")

zhenxun/builtin_plugins/web_ui/api/tabs/system/__init__.py

@@ -1,15 +1,15 @@
 import os
 import shutil
 from pathlib import Path
-from typing import List, Optional
 
+import aiofiles
 from fastapi import APIRouter
 
 from zhenxun.utils._build_image import BuildImage
 
 from ....base_model import Result
 from ....utils import authentication, get_system_disk
-from .model import AddFile, DeleteFile, DirFile, RenameFile, SaveFile
+from .model import AddFile, DirFile, SaveFile, DeleteFile, RenameFile
 
 router = APIRouter(prefix="/system")
 
@@ -19,16 +19,12 @@ IMAGE_TYPE = ["jpg", "jpeg", "png", "gif", "bmp", "webp", "svg"]
 @router.get(
     "/get_dir_list", dependencies=[authentication()], description="获取文件列表"
 )
-async def _(path: Optional[str] = None) -> Result:
+async def _(path: str | None = None) -> Result:
     base_path = Path(path) if path else Path()
     data_list = []
     for file in os.listdir(base_path):
         file_path = base_path / file
-        is_image = False
-        for t in IMAGE_TYPE:
-            if file.endswith(f".{t}"):
-                is_image = True
-                break
+        is_image = any(file.endswith(f".{t}") for t in IMAGE_TYPE)
         data_list.append(
             DirFile(
                 is_file=not file_path.is_dir(),
@@ -43,7 +39,7 @@ async def _(path: Optional[str] = None) -> Result:
 @router.get(
     "/get_resources_size", dependencies=[authentication()], description="获取文件列表"
 )
-async def _(full_path: Optional[str] = None) -> Result:
+async def _(full_path: str | None = None) -> Result:
     return Result.ok(await get_system_disk(full_path))
 
 
@@ -56,7 +52,7 @@ async def _(param: DeleteFile) -> Result:
         path.unlink()
         return Result.ok("删除成功!")
     except Exception as e:
-        return Result.warning_("删除失败: " + str(e))
+        return Result.warning_(f"删除失败: {e!s}")
 
 
 @router.post(
@@ -70,7 +66,7 @@ async def _(param: DeleteFile) -> Result:
         shutil.rmtree(path.absolute())
         return Result.ok("删除成功!")
     except Exception as e:
-        return Result.warning_("删除失败: " + str(e))
+        return Result.warning_(f"删除失败: {e!s}")
 
 
 @router.post("/rename_file", dependencies=[authentication()], description="重命名文件")
@@ -84,7 +80,7 @@ async def _(param: RenameFile) -> Result:
         path.rename(path.parent / param.name)
         return Result.ok("重命名成功!")
     except Exception as e:
-        return Result.warning_("重命名失败: " + str(e))
+        return Result.warning_(f"重命名失败: {e!s}")
 
 
 @router.post(
@@ -101,7 +97,7 @@ async def _(param: RenameFile) -> Result:
         shutil.move(path.absolute(), new_path.absolute())
         return Result.ok("重命名成功!")
     except Exception as e:
-        return Result.warning_("重命名失败: " + str(e))
+        return Result.warning_(f"重命名失败: {e!s}")
 
 
 @router.post("/add_file", dependencies=[authentication()], description="新建文件")
@@ -113,7 +109,7 @@ async def _(param: AddFile) -> Result:
         path.open("w")
         return Result.ok("新建文件成功!")
     except Exception as e:
-        return Result.warning_("新建文件失败: " + str(e))
+        return Result.warning_(f"新建文件失败: {e!s}")
 
 
 @router.post("/add_folder", dependencies=[authentication()], description="新建文件夹")
@@ -125,7 +121,7 @@ async def _(param: AddFile) -> Result:
         path.mkdir()
         return Result.ok("新建文件夹成功!")
     except Exception as e:
-        return Result.warning_("新建文件夹失败: " + str(e))
+        return Result.warning_(f"新建文件夹失败: {e!s}")
 
 
 @router.get("/read_file", dependencies=[authentication()], description="读取文件")
@@ -137,18 +133,18 @@ async def _(full_path: str) -> Result:
         text = path.read_text(encoding="utf-8")
         return Result.ok(text)
     except Exception as e:
-        return Result.warning_("读取文件失败: " + str(e))
+        return Result.warning_(f"读取文件失败: {e!s}")
 
 
 @router.post("/save_file", dependencies=[authentication()], description="读取文件")
 async def _(param: SaveFile) -> Result:
     path = Path(param.full_path)
     try:
-        with path.open("w") as f:
-            f.write(param.content)
+        async with aiofiles.open(path, "w", encoding="utf-8") as f:
+            await f.write(param.content)
         return Result.ok("更新成功!")
     except Exception as e:
-        return Result.warning_("保存文件失败: " + str(e))
+        return Result.warning_(f"保存文件失败: {e!s}")
 
 
 @router.get("/get_image", dependencies=[authentication()], description="读取图片base64")
@@ -159,4 +155,4 @@ async def _(full_path: str) -> Result:
     try:
         return Result.ok(BuildImage.open(path).pic2bs4())
     except Exception as e:
-        return Result.warning_("获取图片失败: " + str(e))
+        return Result.warning_(f"获取图片失败: {e!s}")