From dd54d31e4b2bb83eee2ebb1f6868ee6172cf4f20 Mon Sep 17 00:00:00 2001
From: yeyang <746659424@qq.com>
Date: Sun, 7 Apr 2024 20:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A4=B0=E5=A5=B6=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=9C=AA=E8=8E=B7=E5=8F=96=E5=88=B0=E7=BE=A4=E5=AF=B9?=
 =?UTF-8?q?=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix #I9EJZ8
---
 lib/common/common.js | 3 +--
 model/GroupAdmin.js  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/common/common.js b/lib/common/common.js
index a3fb493..1c4a5af 100644
--- a/lib/common/common.js
+++ b/lib/common/common.js
@@ -22,8 +22,7 @@ export default new class extends sendMsgMod {
    * @returns {boolean} - 是否具有权限
    */
   checkPermission(e, permission = "all", role = "all", { groupObj = e.group } = {}) {
-    console.log(groupObj)
-    if (!groupObj) throw new Error("未获取到群对象")
+    if (!groupObj && permission != "master" && role != "all") throw new Error("未获取到群对象")
     if (role == "owner" && !groupObj.is_owner) {
       e.reply("❎ Bot权限不足，需要群主权限", true)
       return false
diff --git a/model/GroupAdmin.js b/model/GroupAdmin.js
index 6c7e1a8..54359a2 100644
--- a/model/GroupAdmin.js
+++ b/model/GroupAdmin.js
@@ -355,7 +355,7 @@ segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${item.user_id}`),
    * @throws {Error} - 如果缺少必要参数或参数格式不正确，则会抛出错误
    */
   async muteMember(groupId, userId, executor, time = 300, unit = "秒") {
-    unit = Time_unit[unit.toUpperCase()] ?? (/^\d+$/.test(unit) ? unit : 60)
+    let _unit = Time_unit[unit.toUpperCase()] ?? (/^\d+$/.test(unit) ? unit : 60)
     const group = this.Bot.pickGroup(Number(groupId), true)
     // 判断是否有管理
     if (!group.is_admin && !group.is_owner) throw new ReplyError(ROLE_ERROR)
@@ -383,7 +383,7 @@ segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${item.user_id}`),
 
     if (isWhite && !isMaster && time != 0) throw new ReplyError("❎ 该用户为白名单，不可操作")
 
-    await group.muteMember(userId, time * unit)
+    await group.muteMember(userId, time * _unit)
     const memberName = Memberinfo.card || Memberinfo.nickname
     return time == 0 ? `✅ 已将「${memberName}」解除禁言` : `✅ 已将「${memberName}」禁言${time + unit}`
   }