From 6358ce52668069bb69c3c7aaa6ba80ab5daea417 Mon Sep 17 00:00:00 2001
From: HibiKier <775757368@qq.com>
Date: Mon, 14 Oct 2024 22:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8Dwebui=E5=A5=BD?=
 =?UTF-8?q?=E5=8F=8B=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E5=92=8C=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../builtin_plugins/web_ui/api/tabs/dashboard/data_source.py  | 2 +-
 zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py      | 4 ++++
 zhenxun/builtin_plugins/web_ui/api/tabs/main/model.py         | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py b/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py
index be822c90..c4d196c8 100644
--- a/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py
+++ b/zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py
@@ -49,7 +49,7 @@ class BotManage:
         )
         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)
+        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(
diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py b/zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py
index 3ebf4445..04d23bbb 100644
--- a/zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py
+++ b/zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py
@@ -16,6 +16,7 @@ from zhenxun.utils.platform import PlatformUtils
 from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.models.chat_history import ChatHistory
 from zhenxun.models.group_console import GroupConsole
+from zhenxun.models.bot_connect_log import BotConnectLog
 
 from ....base_model import Result
 from .data_source import bot_live
@@ -94,6 +95,9 @@ async def _(bot_id: str | None = None) -> Result:
             create_time__gte=now - timedelta(hours=now.hour)
         ).count()
         select_bot.day_call = day_call
+        select_bot.connect_count = await BotConnectLog.filter(
+            bot_id=select_bot.self_id
+        ).count()
         return Result.ok(bot_list, "拿到信息啦!")
     return Result.warning_("无Bot连接...")
 
diff --git a/zhenxun/builtin_plugins/web_ui/api/tabs/main/model.py b/zhenxun/builtin_plugins/web_ui/api/tabs/main/model.py
index d8ec0c0f..023ed8a6 100644
--- a/zhenxun/builtin_plugins/web_ui/api/tabs/main/model.py
+++ b/zhenxun/builtin_plugins/web_ui/api/tabs/main/model.py
@@ -36,6 +36,8 @@ class BaseInfo(BaseModel):
     """连接时间"""
     connect_date: str | None = None
     """连接日期"""
+    connect_count: int = 0
+    """连接次数"""
 
     plugin_count: int = 0
     """加载插件数量"""
@@ -47,8 +49,6 @@ class BaseInfo(BaseModel):
     is_select: bool = False
     """当前选择"""
 
-    config: Config | None = None
-    """nb配置"""
     day_call: int = 0
     """今日调用插件次数"""
     version: str = "unknown"