From 8e3153e35cf12f5ecb5fd625649859166cb2edcf Mon Sep 17 00:00:00 2001
From: yeyang <746659424@qq.com>
Date: Mon, 10 Apr 2023 19:37:46 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E7=A6=81?=
 =?UTF-8?q?=E8=A8=80=E6=B1=89=E5=AD=97=E6=95=B0=E5=AD=97=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/bika.js              | 2 +-
 apps/groupAdmin.js        | 5 +++--
 apps/privateGroupAdmin.js | 5 +++--
 apps/setu.js              | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/bika.js b/apps/bika.js
index ad60afa..4138f8a 100644
--- a/apps/bika.js
+++ b/apps/bika.js
@@ -5,7 +5,7 @@ import { Admin } from './admin.js'
 const SWITCH_ERROR = '主人没有开放这个功能哦(＊／ω＼＊)'
 
 // 汉字数字匹配正则
-const numReg = '[一壹二两三四五六七八九十百千万亿\\d]+'
+const numReg = '[零一壹二两三四五六七八九十百千万亿\\d]+'
 const Prefix = '(bika|哔咔)'
 // 命令正则
 const searchReg = new RegExp(`^#?${Prefix}(类别|作者|高级)?搜索(.*?)(第(${numReg})页)?$`)
diff --git a/apps/groupAdmin.js b/apps/groupAdmin.js
index 9fc89f2..cafc610 100644
--- a/apps/groupAdmin.js
+++ b/apps/groupAdmin.js
@@ -9,7 +9,7 @@ import { Time_unit } from '../constants/other.js'
 // API请求错误文案
 const API_ERROR = '❎ 出错辣，请稍后重试'
 // 正则
-const Numreg = '[一壹二两三四五六七八九十百千万亿\\d]+'
+const Numreg = '[零一壹二两三四五六七八九十百千万亿\\d]+'
 const TimeUnitReg = Object.keys(Time_unit).join('|')
 
 /** 清理多久没发言的人正则 */
@@ -164,8 +164,9 @@ export class GroupAdmin extends plugin {
     let qq = e.message.find(item => item.type == 'at')?.qq
     let reg = `#禁言\\s?((\\d+)\\s)?(${Numreg})?(${TimeUnitReg})?`
     let regRet = e.msg.match(new RegExp(reg))
+    const time = common.translateChinaNum(regRet[3])
     new Ga(e).muteMember(
-      e.group_id, qq ?? regRet[2], e.user_id, regRet[3], regRet[4]
+      e.group_id, qq ?? regRet[2], e.user_id, time, regRet[4]
     ).then(res => e.reply(res)).catch(err => e.reply(err.message))
   }
 
diff --git a/apps/privateGroupAdmin.js b/apps/privateGroupAdmin.js
index 5e65c5f..01fe3b9 100644
--- a/apps/privateGroupAdmin.js
+++ b/apps/privateGroupAdmin.js
@@ -1,5 +1,5 @@
 import plugin from '../../../lib/plugins/plugin.js'
-import { GroupAdmin as Ga } from '../model/index.js'
+import { GroupAdmin as Ga, common } from '../model/index.js'
 import { Time_unit } from '../constants/other.js'
 // 正则
 const Numreg = '[一壹二两三四五六七八九十百千万亿\\d]+'
@@ -35,7 +35,8 @@ export class PrivateGroupAdmin extends plugin {
   async muteMember (e) {
     if (!e.isMaster) return false
     let regRet = e.msg.match(muteMemberReg)
-    let res = await new Ga(e).muteMember(regRet[1], regRet[2], e.user_id, regRet[3], regRet[4])
+    const time = common.translateChinaNum(regRet[3])
+    let res = await new Ga(e).muteMember(regRet[1], regRet[2], e.user_id, time, regRet[4])
     e.reply(res)
   }
 
diff --git a/apps/setu.js b/apps/setu.js
index 89c232e..7d52d2e 100644
--- a/apps/setu.js
+++ b/apps/setu.js
@@ -5,7 +5,7 @@ import { Admin } from './admin.js'
 
 const SWITCH_ERROR = '主人没有开放这个功能哦(＊／ω＼＊)'
 
-const NumReg = '[一壹二两三四五六七八九十百千万亿\\d]+'
+const NumReg = '[零一壹二两三四五六七八九十百千万亿\\d]+'
 export class SeSe extends plugin {
   constructor () {
     super({