From 2f81b2e381eb6715046172d31f0abdb3d7372c27 Mon Sep 17 00:00:00 2001 From: QiChenSn <2102733232@qq.com> Date: Fri, 27 Jun 2025 02:32:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dcommandfilter?= =?UTF-8?q?=E5=AF=B9=E5=B8=83=E5=B0=94=E7=B1=BB=E5=9E=8B=E7=9A=84=E8=A7=A3?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- astrbot/core/star/filter/command.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/astrbot/core/star/filter/command.py b/astrbot/core/star/filter/command.py index 7d3cabbfa..9bddcb263 100755 --- a/astrbot/core/star/filter/command.py +++ b/astrbot/core/star/filter/command.py @@ -110,6 +110,17 @@ class CommandFilter(HandlerFilter): elif isinstance(param_type_or_default_val, str): # 如果 param_type_or_default_val 是字符串，直接赋值 result[param_name] = params[i] + elif isinstance(param_type_or_default_val, bool): + # 处理布尔类型 + lower_param = params[i].lower() + if lower_param in ['true', 'yes', '1']: + result[param_name] = True + elif lower_param in ['false', 'no', '0']: + result[param_name] = False + else: + raise ValueError( + f"参数 {param_name} 必须是布尔值（true/false, yes/no, 1/0）。" + ) elif isinstance(param_type_or_default_val, int): result[param_name] = int(params[i]) elif isinstance(param_type_or_default_val, float): From 2ca95a988e4635fd58d64623bff68e023d2806c6 Mon Sep 17 00:00:00 2001 From: Soulter <905617992@qq.com> Date: Sat, 28 Jun 2025 15:05:57 +0800 Subject: [PATCH 2/3] fix: lint warnings --- astrbot/core/star/filter/command.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/astrbot/core/star/filter/command.py b/astrbot/core/star/filter/command.py index 9bddcb263..52f530da6 100755 --- a/astrbot/core/star/filter/command.py +++ b/astrbot/core/star/filter/command.py @@ -7,10 +7,13 @@ from astrbot.core.config import AstrBotConfig from .custom_filter import CustomFilter from ..star_handler import StarHandlerMetadata + class GreedyStr(str): """标记指令完成其他参数接收后的所有剩余文本。""" + pass + # 标准指令受到 wake_prefix 的制约。 class CommandFilter(HandlerFilter): """标准指令过滤器""" @@ -18,8 +21,8 @@ class CommandFilter(HandlerFilter): def __init__( self, command_name: str, - alias: set = None, - handler_md: StarHandlerMetadata = None, + alias: set | None = None, + handler_md: StarHandlerMetadata | None = None, parent_command_names: List[str] = [""], ): self.command_name = command_name @@ -113,9 +116,9 @@ class CommandFilter(HandlerFilter): elif isinstance(param_type_or_default_val, bool): # 处理布尔类型 lower_param = params[i].lower() - if lower_param in ['true', 'yes', '1']: + if lower_param in ["true", "yes", "1"]: result[param_name] = True - elif lower_param in ['false', 'no', '0']: + elif lower_param in ["false", "no", "0"]: result[param_name] = False else: raise ValueError( From 770dec9ed677b9885c527036d9ef085f4250e242 Mon Sep 17 00:00:00 2001 From: Soulter <905617992@qq.com> Date: Sat, 28 Jun 2025 15:08:19 +0800 Subject: [PATCH 3/3] fix: handle boolean parameter parsing correctly in CommandFilter --- astrbot/core/star/filter/command.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astrbot/core/star/filter/command.py b/astrbot/core/star/filter/command.py index 52f530da6..9ceed54a9 100755 --- a/astrbot/core/star/filter/command.py +++ b/astrbot/core/star/filter/command.py @@ -115,7 +115,7 @@ class CommandFilter(HandlerFilter): result[param_name] = params[i] elif isinstance(param_type_or_default_val, bool): # 处理布尔类型 - lower_param = params[i].lower() + lower_param = str(params[i]).lower() if lower_param in ["true", "yes", "1"]: result[param_name] = True elif lower_param in ["false", "no", "0"]: