From 2f459719e8374678eaa29429bdeb2c19798964f3 Mon Sep 17 00:00:00 2001
From: HibiKier <45528451+HibiKier@users.noreply.github.com>
Date: Wed, 9 Oct 2024 17:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E6=94=B9=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8module=20(#1688)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🐛 修改禁用module

* chore(version): Update version to v0.2.3-4cde662

---------

Co-authored-by: HibiKier <HibiKier@users.noreply.github.com>
---
 __version__                                   |  2 +-
 .../builtin_plugins/scheduler/chat_check.py   |  1 +
 zhenxun/builtin_plugins/scripts.py            | 24 +++++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/__version__ b/__version__
index c9e6b295..b1fd47fe 100644
--- a/__version__
+++ b/__version__
@@ -1 +1 @@
-__version__: v0.2.3-ba3a9f1
+__version__: v0.2.3-4cde662
diff --git a/zhenxun/builtin_plugins/scheduler/chat_check.py b/zhenxun/builtin_plugins/scheduler/chat_check.py
index 2d4c9823..30442a00 100644
--- a/zhenxun/builtin_plugins/scheduler/chat_check.py
+++ b/zhenxun/builtin_plugins/scheduler/chat_check.py
@@ -53,6 +53,7 @@ async def _():
                             _group, _ = await GroupConsole.get_or_create(
                                 group_id=group.group_id, channel_id__isnull=True
                             )
+                            modules = [f"<{module}" for module in modules]
                             _group.block_task = ",".join(modules) + ","  # type: ignore
                             update_list.append(_group)
                             logger.info(
diff --git a/zhenxun/builtin_plugins/scripts.py b/zhenxun/builtin_plugins/scripts.py
index b265eb7c..257ad246 100644
--- a/zhenxun/builtin_plugins/scripts.py
+++ b/zhenxun/builtin_plugins/scripts.py
@@ -71,19 +71,19 @@ async def _():
         for group in await GroupConsole.all():
             if group.block_plugin:
                 if modules := group.block_plugin.split(","):
-                    if block_plugin := [
-                        f"<{module}" for module in modules if not module.startswith("<")
-                    ]:
-                        group.block_plugin = (",".join(block_plugin) + ",").replace(
-                            "<,", ""
-                        )
+                    block_plugin = "".join(
+                        (f"{module}," if module.startswith("<") else f"<{module},")
+                        for module in modules
+                        if module.strip()
+                    )
+                    group.block_plugin = block_plugin.replace("<,", "")
             if group.block_task:
                 if modules := group.block_task.split(","):
-                    if block_task := [
-                        f"<{module}" for module in modules if not module.startswith("<")
-                    ]:
-                        group.block_task = (",".join(block_task) + ",").replace(
-                            "<,", ""
-                        )
+                    block_task = "".join(
+                        (f"{module}," if module.startswith("<") else f"<{module},")
+                        for module in modules
+                        if module.strip()
+                    )
+                    group.block_task = block_task.replace("<,", "")
             data_list.append(group)
         await GroupConsole.bulk_update(data_list, ["block_plugin", "block_task"], 10)