From c09d0d2629f97abca20f46e2259aee3d01ead774 Mon Sep 17 00:00:00 2001
From: Zyy955 <74231782+Zyy955@users.noreply.github.com>
Date: Tue, 29 Aug 2023 02:31:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=B8=80=E4=B8=8B`WeChat-plu?=
 =?UTF-8?q?gin`=20(#236)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`ComWeChatBotClient`的`user_id`和`group_id`都是字符串，在此的情况下，不能正确识别id，导致黑白名单和主人无法生效问题
---
 lib/common/common.js  |  2 --
 lib/plugins/loader.js | 10 +++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/common/common.js b/lib/common/common.js
index 9775360..4ad440c 100644
--- a/lib/common/common.js
+++ b/lib/common/common.js
@@ -67,8 +67,6 @@ function mkdirs(dirname) {
  * @param msgsscr 转发信息是否伪装
  */
 async function makeForwardMsg(e, msg = [], dec = '', msgsscr = false) {
-  /** 是频道插件直接返回 */
-  if (e.QQGuild) return msg
 
   if (!Array.isArray(msg)) msg = [msg]
 
diff --git a/lib/plugins/loader.js b/lib/plugins/loader.js
index 7944845..83ebb71 100644
--- a/lib/plugins/loader.js
+++ b/lib/plugins/loader.js
@@ -440,7 +440,7 @@ class PluginsLoader {
       e.isGuild = true
     }
 
-    if (e.user_id && cfg.masterQQ.includes(Number(e.user_id))) {
+    if (e.user_id && cfg.masterQQ.includes(Number(e.user_id) || e.user_id)) {
       e.isMaster = true
     }
 
@@ -486,7 +486,7 @@ class PluginsLoader {
             text = lodash.truncate(e.sender.card, { length: 10 })
           }
           if (at === true) {
-            at = Number(e.user_id)
+            at = Number(e.user_id) || e.user_id
           } else if (!isNaN(at)) {
             if (e.isGuild) {
               text = e.sender?.nickname
@@ -703,18 +703,18 @@ class PluginsLoader {
     if (e.test) return true
 
     /** 黑名单qq */
-    if (other.blackQQ && other.blackQQ.includes(Number(e.user_id))) {
+    if (other.blackQQ && other.blackQQ.includes(Number(e.user_id) || e.user_id)) {
       return false
     }
 
     if (e.group_id) {
       /** 白名单群 */
       if (Array.isArray(other.whiteGroup) && other.whiteGroup.length > 0) {
-        return other.whiteGroup.includes(Number(e.group_id))
+        return other.whiteGroup.includes(Number(e.group_id) || e.group_id)
       }
       /** 黑名单群 */
       if (Array.isArray(other.blackGroup) && other.blackGroup.length > 0) {
-        return !other.blackGroup.includes(Number(e.group_id))
+        return !other.blackGroup.includes(Number(e.group_id) || e.group_id)
       }
     }