From 4d16167fef677926ed2ec742eaae92aadcf8218f Mon Sep 17 00:00:00 2001
From: yeyang <746659424@qq.com>
Date: Fri, 7 Jun 2024 18:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/search.js             |  5 ++++-
 lib/puppeteer/puppeteer.js |  4 ++--
 model/State/OtherInfo.js   | 16 +++++++++++++---
 model/State/index.js       |  2 +-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/apps/search.js b/apps/search.js
index c69be61..be61584 100644
--- a/apps/search.js
+++ b/apps/search.js
@@ -44,7 +44,10 @@ export class NewSearch extends plugin {
     let regRet = searchReg.exec(e.msg)
     if (/(lp|ip)|(i|p|l)(地址|查询)/ig.test(regRet[2])) return e.reply("(;｀O´)o警告！！触发屏蔽词！！！", true)
     let url = SEARCH_MAP[regRet[1]] + encodeURIComponent(regRet[2])
-    e.reply([ await puppeteer.Webpage({ url }), url ])
+    const scr = await puppeteer.Webpage({
+      url
+    })
+    e.reply([ scr, url ])
   }
 
   async bggSearch(e) {
diff --git a/lib/puppeteer/puppeteer.js b/lib/puppeteer/puppeteer.js
index 84ec809..6ba643f 100644
--- a/lib/puppeteer/puppeteer.js
+++ b/lib/puppeteer/puppeteer.js
@@ -37,9 +37,9 @@ export default new class extends render {
    * @param {boolean} [options.font] - 是否设置字体样式
    * @param {object | false} [options.cookie] - 设置cookie信息
    * @param {boolean} [options.fullPage] - 是否截取整个网页
-   * @param {string|boolean} [options.emulate] - 模拟设备信息
+   * @param {keyof typeof import('puppeteer').KnownDevices | 'QQTheme'} [options.emulate] - 模拟设备信息
    * @param {Array|false} [options.click] - 点击事件
-   * @returns {Promise<import('icqq').segment.image>} Promise对象，如果截图成功返回构造图片消息，否则返回false
+   * @returns {Promise<object>} Promise对象，如果截图成功返回构造图片消息，否则返回false
    */
   async Webpage({
     url,
diff --git a/model/State/OtherInfo.js b/model/State/OtherInfo.js
index 5114fc5..4c7c39e 100644
--- a/model/State/OtherInfo.js
+++ b/model/State/OtherInfo.js
@@ -5,7 +5,7 @@ import path from "path"
 import loader from "../../../../lib/plugins/loader.js"
 import { Version } from "../../components/index.js"
 import { formatDuration } from "../../tools/index.js"
-import { osInfo } from "./utils.js"
+import { osInfo, si } from "./utils.js"
 
 export default function otherInfo(e) {
   let otherInfo = []
@@ -53,6 +53,16 @@ function getPluginNum(e) {
   return e.isPro ? `${pluginsStr} | ${loaderStr}` : pluginsStr
 }
 
-export function getCopyright() {
-  return `Created By ${Version.name}<span class="version">${Version.yunzai}</span> & Yenai-Plugin<span class="version">${Version.ver}</span> & Node <span class="version">${process.version}</span>`
+export async function getCopyright() {
+  const { node, v8, git, redis } = await si.versions("node,v8,git,redis")
+  let v = `Created By ${Version.name}<span class="version">${Version.yunzai}</span> & Yenai-Plugin<span class="version">v${Version.ver}</span>`
+  v += "<br>"
+  v += `Node <span class="version">v${node}</span> & V8 <span class="version">v${v8}</span>`
+  if (git) {
+    v += ` & Git <span class="version">v${git}</span>`
+  }
+  if (redis) {
+    v += ` & Redis <span class="version">v${redis}</span>`
+  }
+  return v
 }
diff --git a/model/State/index.js b/model/State/index.js
index 04dc34f..f5af4c5 100644
--- a/model/State/index.js
+++ b/model/State/index.js
@@ -57,7 +57,7 @@ export async function getData(e) {
     otherInfo: getOtherInfo(e),
     psTest: _.isEmpty(psTest) ? undefined : psTest,
     fsStats: getDiskSpeed(),
-    copyright: getCopyright(),
+    copyright: await getCopyright(),
     network: getNetwork(),
     Config: JSON.stringify(Config.state),
     FastFetch,