From 67c0c5c9e3a0f146318a8ce2d50e3534a4d5cccf Mon Sep 17 00:00:00 2001
From: yeyang <746659424@qq.com>
Date: Fri, 5 Apr 2024 23:03:44 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E7=BB=86=E8=8A=82=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.cjs              | 27 +++++++++++++++++----------
 apps/groupAdmin/voteBan.js | 19 +++++++++++++++++--
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 48ece62..faf5631 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -3,12 +3,17 @@ module.exports = {
     es2021: true,
     node: true
   },
-  extends: ["standard", "plugin:jsdoc/recommended", "plugin:import/recommended", "plugin:promise/recommended"],
+  extends: [
+    "standard",
+    "plugin:jsdoc/recommended",
+    "plugin:import/recommended",
+    "plugin:promise/recommended"
+  ],
   parserOptions: {
     ecmaVersion: "latest",
     sourceType: "module"
   },
-  plugins: ["import", "promise", "jsdoc"],
+  plugins: [ "import", "promise", "jsdoc" ],
   globals: {
     Bot: true,
     redis: true,
@@ -18,20 +23,22 @@ module.exports = {
     ReplyError: true
   },
   rules: {
-    "eqeqeq": ["off"],
-    "prefer-const": ["off"],
+    "eqeqeq": [ "off" ],
+    "prefer-const": [ "off" ],
     "arrow-body-style": "off",
     "camelcase": "off",
-    "quotes": ["error", "double"],
-    "quote-props": ["error", "consistent"],
-    "no-eval": ["error", { allowIndirect: true }],
+    "quotes": [ "error", "double" ],
+    "quote-props": [ "error", "consistent" ],
+    "no-eval": [ "error", { allowIndirect: true } ],
+    "array-bracket-newline": [ "error", { multiline: true } ],
+    "array-bracket-spacing": [ "error", "always" ],
+    // 插件规则
     "jsdoc/require-returns": 0,
     "jsdoc/require-jsdoc": 0,
     "jsdoc/require-param-description": 0,
     "jsdoc/require-returns-description": 0,
     "jsdoc/require-param-type": 0,
-    "import/extensions": ["error", "ignorePackages"],
-    "array-bracket-newline": ["error", { multiline: true }]
+    "import/extensions": [ "error", "ignorePackages" ]
   },
-  ignorePatterns: ["resources/state/echarts.min.js"]
+  ignorePatterns: [ "resources/state/echarts.min.js" ]
 }
diff --git a/apps/groupAdmin/voteBan.js b/apps/groupAdmin/voteBan.js
index ee2e192..a8bad96 100644
--- a/apps/groupAdmin/voteBan.js
+++ b/apps/groupAdmin/voteBan.js
@@ -51,9 +51,9 @@ export class NewGroupVerify extends plugin {
     Vote[key] = {
       supportCount: 1,
       opposeCount: 0,
-      List: [e.user_id]
+      List: [ e.user_id ]
     }
-    e.reply([
+    let res = await e.reply([
       segment.at(targetQQ),
       `(${targetQQ})的禁言投票已发起\n`,
       "发起人:",
@@ -66,6 +66,7 @@ export class NewGroupVerify extends plugin {
       `超时时间：${time}秒\n`,
       "规则：支持票大于反对票且参与人高于3人即可成功禁言"
     ])
+    if (!res) return false
     setTimeout(async () => {
       // 处理结果
       if (!Vote[key]) return
@@ -80,6 +81,20 @@ export class NewGroupVerify extends plugin {
       delete Vote[key]
       return e.reply(msg, true)
     }, time * 1000)
+    setTimeout(async () => {
+      const { supportCount, opposeCount } = Vote[key]
+      const msg = [
+        segment.at(targetQQ),
+        `(${targetQQ})的禁言投票仅剩一分钟结束\n`,
+        "当前票数：\n",
+      `支持票数：${supportCount}\n反对票数：${opposeCount}\n`,
+      "请支持者发送：\n",
+        `「#支持禁言${targetQQ}」\n`,
+        "不支持者请发送：\n",
+        `「#反对禁言${targetQQ}」\n`
+      ]
+      e.reply(msg)
+    }, time * 1000 - 60000)
   }
 
   async Follow (e) {