From b1030a527a3abf1865e46e37e43a48677ea4802f Mon Sep 17 00:00:00 2001
From: divid <dingdingduang@outlook.com>
Date: Mon, 20 Nov 2023 21:51:59 +0800
Subject: [PATCH 1/2] blacklist

---
 channel/chat_channel.py | 5 +++++
 config-template.json    | 4 ++++
 config.py               | 1 +
 3 files changed, 10 insertions(+)

diff --git a/channel/chat_channel.py b/channel/chat_channel.py
index 8ed5f4f..4cedffd 100644
--- a/channel/chat_channel.py
+++ b/channel/chat_channel.py
@@ -99,6 +99,7 @@ class ChatChannel(Channel):
                 # 校验关键字
                 match_prefix = check_prefix(content, conf().get("group_chat_prefix"))
                 match_contain = check_contain(content, conf().get("group_chat_keyword"))
+                group_name_black_list = config.get("group_name_black_list", [])
                 flag = False
                 if context["msg"].to_user_id != context["msg"].actual_user_id:
                     if match_prefix is not None or match_contain is not None:
@@ -107,6 +108,10 @@ class ChatChannel(Channel):
                             content = content.replace(match_prefix, "", 1).strip()
                     if context["msg"].is_at:
                         logger.info("[WX]receive group at")
+                        if context["msg"].actual_user_nickname in group_name_black_list:
+                            print('黑名单2',context["msg"].actual_user_nickname)
+                            logger.info("[WX]Is In BlackList")
+                            return None
                         if not conf().get("group_at_off", False):
                             flag = True
                         pattern = f"@{re.escape(self.name)}(\u2005|\u0020)"
diff --git a/config-template.json b/config-template.json
index dd07d25..f211762 100644
--- a/config-template.json
+++ b/config-template.json
@@ -19,6 +19,10 @@
     "ChatGPT测试群",
     "ChatGPT测试群2"
   ],
+  "group_name_black_list": [
+    "测试昵称",
+    "测试昵称2"
+  ], 
   "group_chat_in_one_session": [
     "ChatGPT测试群"
   ],
diff --git a/config.py b/config.py
index 8db08cd..448c5c9 100644
--- a/config.py
+++ b/config.py
@@ -32,6 +32,7 @@ available_setting = {
     "group_name_white_list": ["ChatGPT测试群", "ChatGPT测试群2"],  # 开启自动回复的群名称列表
     "group_name_keyword_white_list": [],  # 开启自动回复的群名称关键词列表
     "group_chat_in_one_session": ["ChatGPT测试群"],  # 支持会话上下文共享的群名称
+    "group_name_black_list": [],  # 黑名单
     "group_welcome_msg": "",  # 配置新人进群固定欢迎语，不配置则使用随机风格欢迎 
     "trigger_by_self": False,  # 是否允许机器人触发
     "text_to_image": "dall-e-2",  # 图片生成模型，可选 dall-e-2, dall-e-3

From abf9a9048dab4c20a99890f722b3b4d6141ce65d Mon Sep 17 00:00:00 2001
From: divid <dingdingduang@outlook.com>
Date: Mon, 20 Nov 2023 21:59:00 +0800
Subject: [PATCH 2/2] feat:blasklist

---
 channel/chat_channel.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/channel/chat_channel.py b/channel/chat_channel.py
index 4cedffd..b8f7e90 100644
--- a/channel/chat_channel.py
+++ b/channel/chat_channel.py
@@ -109,7 +109,6 @@ class ChatChannel(Channel):
                     if context["msg"].is_at:
                         logger.info("[WX]receive group at")
                         if context["msg"].actual_user_nickname in group_name_black_list:
-                            print('黑名单2',context["msg"].actual_user_nickname)
                             logger.info("[WX]Is In BlackList")
                             return None
                         if not conf().get("group_at_off", False):