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

* ✨ 新增插件商店api

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

---------

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

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