From 162cf4cabb1fd0763034222c37908e93cd4bbcbd Mon Sep 17 00:00:00 2001
From: Admilk <admin@admilk.top>
Date: Sun, 21 Jul 2024 14:00:35 +0000
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AF=B9=E8=AE=BE=E7=BD=AE=E7=AE=A1=E7=90=86=E7=BE=A4=E5=91=98?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9C=A8=E7=BE=A4=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/groupAdmin/groupAdmin.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/groupAdmin/groupAdmin.js b/apps/groupAdmin/groupAdmin.js
index ad58795..927043a 100644
--- a/apps/groupAdmin/groupAdmin.js
+++ b/apps/groupAdmin/groupAdmin.js
@@ -168,14 +168,16 @@ export class GroupAdmin extends plugin {
     let qq = e.message.find(item => item.type == "at")?.qq
     const type = /设置管理/.test(e.msg)
     if (!qq) qq = e.msg.replace(/#|(设置|取消)管理/g, "").trim()
-
     if (!qq || !(/\d{5,}/.test(qq))) return e.reply("❎ 请输入正确的QQ号")
-    const Member = e.group.pickMember(Number(qq) || qq)
+    let Member;
+    try {
+      Member = e.group.pickMember(Number(qq) || qq, true)
+    } catch {
+      return e.reply("❎ 这个群没有这个人哦~")
+    }
     const Memberinfo = Member?.info || await Member?.getInfo?.()
-    if (!Memberinfo) return e.reply("❎ 这个群没有这个人哦~")
-
     const res = await e.group.setAdmin(qq, type)
-    const name = Memberinfo.card || Memberinfo.nickname
+    const name = Memberinfo.card || Memberinfo.nickname  || (Number(qq) || qq)
     if (!res) return e.reply("❎ 未知错误")
     type ? e.reply(`✅ 已经把「${name}」设置为管理啦！！`) : e.reply(`✅ 已取消「${name}」的管理`)
   }