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}` }