diff --git a/astrbot/core/pipeline/process_stage/method/star_request.py b/astrbot/core/pipeline/process_stage/method/star_request.py index 109e1ea81..d2a4c8382 100644 --- a/astrbot/core/pipeline/process_stage/method/star_request.py +++ b/astrbot/core/pipeline/process_stage/method/star_request.py @@ -31,7 +31,7 @@ class StarRequestSubStage(Stage): # 孤立无援的 star handler continue - logger.debug(f"执行 Star Handler {handler.handler_full_name}") + logger.debug(f"执行插件 handler {handler.handler_full_name}") wrapper = self._call_handler(self.ctx, event, handler.handler, **params) async for ret in wrapper: yield ret diff --git a/astrbot/core/pipeline/waking_check/stage.py b/astrbot/core/pipeline/waking_check/stage.py index c26761655..b48637c14 100644 --- a/astrbot/core/pipeline/waking_check/stage.py +++ b/astrbot/core/pipeline/waking_check/stage.py @@ -43,7 +43,7 @@ class WakingCheckStage(Stage): if event.message_str.startswith(wake_prefix): if ( not event.is_private_chat() - and (isinstance(messages[0], At) or isinstance(messages[0], Reply)) + and isinstance(messages[0], At) and str(messages[0].qq) != str(event.get_self_id()) and str(messages[0].qq) != "all" ): diff --git a/astrbot/core/star/filter/command.py b/astrbot/core/star/filter/command.py index 03466bb73..3e1394f38 100644 --- a/astrbot/core/star/filter/command.py +++ b/astrbot/core/star/filter/command.py @@ -43,7 +43,7 @@ class CommandFilter(HandlerFilter, ParameterValidationMixin): return self.handler_md def filter(self, event: AstrMessageEvent, cfg: AstrBotConfig) -> bool: - if not event.is_wake_up(): + if not event.is_at_or_wake_command: return False if event.get_extra("parsing_command"): diff --git a/astrbot/core/star/filter/command_group.py b/astrbot/core/star/filter/command_group.py index b3a66d22e..0dca9916f 100644 --- a/astrbot/core/star/filter/command_group.py +++ b/astrbot/core/star/filter/command_group.py @@ -37,7 +37,7 @@ class CommandGroupFilter(HandlerFilter): return result def filter(self, event: AstrMessageEvent, cfg: AstrBotConfig) -> Tuple[bool, StarHandlerMetadata]: - if not event.is_wake_up(): + if not event.is_at_or_wake_command: return False, None if event.get_extra("parsing_command"):