🔀 Merge pull request #588

Feature: `Handler` Dependency Injection

nonebot/plugin/on.py

@@ -2,19 +2,16 @@ import re
 import sys
 import inspect
 from types import ModuleType
-from typing import (TYPE_CHECKING, Any, Set, Dict, List, Type, Tuple, Union,
-                    Optional)
+from typing import Any, Set, Dict, List, Type, Tuple, Union, Optional
 
+from nonebot.adapters import Event
 from nonebot.handler import Handler
 from nonebot.matcher import Matcher
 from .manager import _current_plugin
 from nonebot.permission import Permission
 from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory
-from nonebot.rule import (Rule, ArgumentParser, regex, command, keyword,
-                          endswith, startswith, shell_command)
-
-if TYPE_CHECKING:
-    from nonebot.adapters import Bot, Event
+from nonebot.rule import (PREFIX_KEY, RAW_CMD_KEY, Rule, ArgumentParser, regex,
+                          command, keyword, endswith, startswith, shell_command)
 
 
 def _store_matcher(matcher: Type[Matcher]) -> None:
@@ -376,16 +373,16 @@ def on_command(cmd: Union[str, Tuple[str, ...]],
       - ``Type[Matcher]``
     """
 
-    async def _strip_cmd(bot: "Bot", event: "Event", state: T_State):
+    async def _strip_cmd(event: Event, state: T_State):
         message = event.get_message()
         if len(message) < 1:
             return
         segment = message.pop(0)
         segment_text = str(segment).lstrip()
-        if not segment_text.startswith(state["_prefix"]["raw_command"]):
+        if not segment_text.startswith(state[PREFIX_KEY][RAW_CMD_KEY]):
             return
         new_message = message.__class__(
-            segment_text[len(state["_prefix"]["raw_command"]):].lstrip())
+            segment_text[len(state[PREFIX_KEY][RAW_CMD_KEY]):].lstrip())
         for new_segment in reversed(new_message):
             message.insert(0, new_segment)
 
@@ -433,12 +430,11 @@ def on_shell_command(cmd: Union[str, Tuple[str, ...]],
       - ``Type[Matcher]``
     """
 
-    async def _strip_cmd(bot: "Bot", event: "Event", state: T_State):
+    async def _strip_cmd(event: Event, state: T_State):
         message = event.get_message()
         segment = message.pop(0)
         new_message = message.__class__(
-            str(segment)
-            [len(state["_prefix"]["raw_command"]):].strip())  # type: ignore
+            str(segment)[len(state[PREFIX_KEY][RAW_CMD_KEY]):].strip())
         for new_segment in reversed(new_message):
             message.insert(0, new_segment)