✨ Feature: 添加正则匹配文本注入 (#1457)

Co-authored-by: Ju4tCode <42488585+yanyongyu@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

tests/plugins/param/param_state.py

@@ -6,6 +6,7 @@ from nonebot.params import (
     Command,
     Keyword,
     Endswith,
+    RegexStr,
     Fullmatch,
     RegexDict,
     CommandArg,
@@ -71,6 +72,10 @@ async def regex_matched(regex_matched: str = RegexMatched()) -> str:
     return regex_matched
 
 
+async def regex_str(regex_matched: str = RegexStr()) -> str:
+    return regex_matched
+
+
 async def startswith(startswith: str = Startswith()) -> str:
     return startswith
 

tests/test_param.py

@@ -163,6 +163,7 @@ async def test_state(app: App, load_plugin):
     from nonebot.params import StateParam, DependParam
     from nonebot.consts import (
         CMD_KEY,
+        REGEX_STR,
         PREFIX_KEY,
         REGEX_DICT,
         SHELL_ARGS,
@@ -183,6 +184,7 @@ async def test_state(app: App, load_plugin):
         keyword,
         endswith,
         fullmatch,
+        regex_str,
         regex_dict,
         startswith,
         command_arg,
@@ -207,6 +209,7 @@ async def test_state(app: App, load_plugin):
         SHELL_ARGV: ["-h"],
         SHELL_ARGS: {"help": True},
         REGEX_MATCHED: "[cq:test,arg=value]",
+        REGEX_STR: "[cq:test,arg=value]",
         REGEX_GROUP: ("test", "arg=value"),
         REGEX_DICT: {"type": "test", "arg": "value"},
         STARTSWITH_KEY: "startswith",
@@ -271,6 +274,12 @@ async def test_state(app: App, load_plugin):
         ctx.pass_params(state=fake_state)
         ctx.should_return(fake_state[REGEX_MATCHED])
 
+    async with app.test_dependent(
+        regex_str, allow_types=[StateParam, DependParam]
+    ) as ctx:
+        ctx.pass_params(state=fake_state)
+        ctx.should_return(fake_state[REGEX_STR])
+
     async with app.test_dependent(
         regex_group, allow_types=[StateParam, DependParam]
     ) as ctx:

tests/test_rule.py

@@ -328,7 +328,7 @@ async def test_shell_command(app: App):
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
-    "pattern,type,text,expected,matched,group,dict",
+    "pattern,type,text,expected,matched,string,group,dict",
     [
         (
             r"(?P<key>key\d)",
@@ -336,11 +336,12 @@ async def test_shell_command(app: App):
             "_key1_",
             True,
             "key1",
+            "key1",
             ("key1",),
             {"key": "key1"},
         ),
-        (r"foo", "message", None, False, None, None, None),
-        (r"foo", "notice", "foo", False, None, None, None),
+        (r"foo", "message", None, False, None, None, None, None),
+        (r"foo", "notice", "foo", False, None, None, None, None),
     ],
 )
 async def test_regex(
@@ -350,12 +351,13 @@ async def test_regex(
     text: Optional[str],
     expected: bool,
     matched: Optional[str],
+    string: Optional[str],
     group: Optional[Tuple[str, ...]],
     dict: Optional[Dict[str, str]],
 ):
     from nonebot.typing import T_State
     from nonebot.rule import RegexRule, regex
-    from nonebot.consts import REGEX_DICT, REGEX_GROUP, REGEX_MATCHED
+    from nonebot.consts import REGEX_STR, REGEX_DICT, REGEX_GROUP, REGEX_MATCHED
 
     test_regex = regex(pattern)
     dependent = list(test_regex.checkers)[0]
@@ -369,6 +371,7 @@ async def test_regex(
     state = {}
     assert await dependent(event=event, state=state) == expected
     assert state.get(REGEX_MATCHED) == matched
+    assert state.get(REGEX_STR) == string
     assert state.get(REGEX_GROUP) == group
     assert state.get(REGEX_DICT) == dict