From 7cae3f0531893e86ba77be555e98cf8a2675ff1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=8C=8C?= <Time.Rain.Star.Sky@Gmail.com>
Date: Sat, 5 Aug 2023 20:30:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                       | 4 ++--
 package.json                 | 6 +++---
 plugins/adapter/ComWeChat.js | 2 +-
 plugins/adapter/go-cqhttp.js | 5 ++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index fa3c4ca..6feed2a 100644
--- a/app.js
+++ b/app.js
@@ -1,3 +1,3 @@
-import Yunzai from './lib/bot.js'
-global.Bot = new Yunzai()
+import Yunzai from "./lib/bot.js"
+global.Bot = new Yunzai
 Bot.run()
\ No newline at end of file
diff --git a/package.json b/package.json
index 7a9d301..18558b4 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "node-xlsx": "^0.23.0",
     "oicq": "link:lib/modules/oicq",
     "pm2": "^5.3.0",
-    "puppeteer": "^20.9.0",
+    "puppeteer": "^21.0.1",
     "redis": "^4.6.7",
     "sequelize": "^6.32.1",
     "sqlite3": "^5.1.6",
@@ -40,9 +40,9 @@
     "yaml": "^2.3.1"
   },
   "devDependencies": {
-    "eslint": "^8.45.0",
+    "eslint": "^8.46.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.28.0",
     "eslint-plugin-n": "^16.0.1",
     "eslint-plugin-promise": "^6.1.1"
   },
diff --git a/plugins/adapter/ComWeChat.js b/plugins/adapter/ComWeChat.js
index 78eb34c..44b55e0 100644
--- a/plugins/adapter/ComWeChat.js
+++ b/plugins/adapter/ComWeChat.js
@@ -329,7 +329,7 @@ Bot.adapter.push(new class ComWeChatAdapter {
     Bot[data.self_id].getFriendMap()
     Bot[data.self_id].getGroupMap()
 
-    logger.mark(`${logger.blue(`[${data.self_id}]`)} ${this.name}(${this.id}) 已连接`)
+    logger.mark(`${logger.blue(`[${data.self_id}]`)} ${this.name}(${this.id}) ${Bot[data.self_id].version.impl}-${Bot[data.self_id].version.version} 已连接`)
     Bot.emit(`connect.${data.self_id}`, Bot[data.self_id])
     Bot.emit("connect", Bot[data.self_id])
   }
diff --git a/plugins/adapter/go-cqhttp.js b/plugins/adapter/go-cqhttp.js
index 5514d65..ba40f52 100644
--- a/plugins/adapter/go-cqhttp.js
+++ b/plugins/adapter/go-cqhttp.js
@@ -607,9 +607,8 @@ Bot.adapter.push(new class gocqhttpAdapter {
     Bot[data.self_id].info = (await data.sendApi("get_login_info")).data
     Bot[data.self_id].guild_info = (await data.sendApi("get_guild_service_profile")).data
     Bot[data.self_id].clients = (await data.sendApi("get_online_clients")).clients
-    Bot[data.self_id].version = (await data.sendApi("get_version_info")).data
     Bot[data.self_id].version = {
-      ...Bot[data.self_id].version,
+      ...(await data.sendApi("get_version_info")).data,
       id: this.id,
       name: this.name,
     }
@@ -617,7 +616,7 @@ Bot.adapter.push(new class gocqhttpAdapter {
     Bot[data.self_id].getFriendMap()
     Bot[data.self_id].getGroupMap()
 
-    logger.mark(`${logger.blue(`[${data.self_id}]`)} ${this.name}(${this.id}) 已连接`)
+    logger.mark(`${logger.blue(`[${data.self_id}]`)} ${this.name}(${this.id}) ${Bot[data.self_id].version.app_full_name} 已连接`)
     Bot.emit(`connect.${data.self_id}`, Bot[data.self_id])
     Bot.emit("connect", Bot[data.self_id])
   }