🔀 Merge pull request #183

Fix rule override state

docs/api/adapters/ding.md

@@ -197,6 +197,16 @@ sidebarDepth: 0
 @指定手机号人员
 
 
+### _static_ `atDingtalkIds(*dingtalkIds)`
+
+@指定 id，@ 默认会在消息段末尾。
+所以你可以在消息中使用 @{senderId} 占位，发送出去之后 @ 就会出现在占位的位置：
+``python
+message = MessageSegment.text(f"@{event.senderId}，你好")
+message += MessageSegment.atDingtalkIds(event.senderId)
+``
+
+
 ### _static_ `text(text)`
 
 发送 `text` 类型消息
@@ -212,6 +222,11 @@ sidebarDepth: 0
 "标记 text 文本的 extension 属性，需要与 text 消息段相加。
 
 
+### _static_ `code(code_language, code)`
+
+"发送 code 消息段
+
+
 ### _static_ `markdown(title, text)`
 
 发送 `markdown` 类型消息

docs/api/rule.md

@@ -177,7 +177,8 @@ Rule(async_function, run_sync(sync_function))
 
     根据正则表达式进行匹配。
 
-    可以通过 `state["_matched"]` 获取正则表达式匹配成功的文本。
+    可以通过 `state["_matched"]` `state["_matched_groups"]` `state["_matched_dict"]`
+    获取正则表达式匹配成功的文本。
 
 
 

nonebot/message.py

@@ -99,47 +99,30 @@ def run_postprocessor(func: T_RunPostProcessor) -> T_RunPostProcessor:
     return func
 
 
-async def _check_matcher(priority: int, bot: "Bot", event: "Event",
-                         state: T_State) -> Iterable[Type[Matcher]]:
-    current_matchers = matchers[priority].copy()
-
-    async def _check(Matcher: Type[Matcher], bot: "Bot", event: "Event",
-                     state: T_State) -> Optional[Type[Matcher]]:
+async def _check_matcher(priority: int, Matcher: Type[Matcher], bot: "Bot",
+                         event: "Event", state: T_State) -> None:
+    if Matcher.expire_time and datetime.now() > Matcher.expire_time:
         try:
-            if (not Matcher.expire_time or datetime.now() <= Matcher.expire_time
-               ) and await Matcher.check_perm(
-                   bot, event) and await Matcher.check_rule(bot, event, state):
-                return Matcher
-        except Exception as e:
-            logger.opt(colors=True, exception=e).error(
-                f"<r><bg #f8bbd0>Rule check failed for {Matcher}.</bg #f8bbd0></r>"
-            )
-        return None
-
-    async def _check_expire(Matcher: Type[Matcher]) -> Optional[Type[Matcher]]:
-        if Matcher.expire_time and datetime.now() > Matcher.expire_time:
-            return Matcher
-        return None
-
-    checking_tasks = [
-        _check(Matcher, bot, event, state) for Matcher in current_matchers
-    ]
-    checking_expire_tasks = [
-        _check_expire(Matcher) for Matcher in current_matchers
-    ]
-    results = await asyncio.gather(*checking_tasks)
-    expired = await asyncio.gather(*checking_expire_tasks)
-    for expired_matcher in filter(lambda x: x, expired):
-        try:
-            matchers[priority].remove(expired_matcher)  # type: ignore
+            matchers[priority].remove(Matcher)
         except Exception:
             pass
-    for temp_matcher in filter(lambda x: x and x.temp, results):
+        return
+
+    try:
+        if not await Matcher.check_perm(
+                bot, event) or not await Matcher.check_rule(bot, event, state):
+            return
+    except Exception as e:
+        logger.opt(colors=True, exception=e).error(
+            f"<r><bg #f8bbd0>Rule check failed for {Matcher}.</bg #f8bbd0></r>")
+
+    if Matcher.temp:
         try:
-            matchers[priority].remove(temp_matcher)  # type: ignore
+            matchers[priority].remove(Matcher)
         except Exception:
             pass
-    return filter(lambda x: x, results)  # type: ignore
+
+    await _run_matcher(Matcher, bot, event, state)
 
 
 async def _run_matcher(Matcher: Type[Matcher], bot: "Bot", event: "Event",
@@ -244,11 +227,9 @@ async def handle_event(bot: "Bot", event: "Event"):
         if show_log:
             logger.debug(f"Checking for matchers in priority {priority}...")
 
-        run_matchers = await _check_matcher(priority, bot, event, state)
-
         pending_tasks = [
-            _run_matcher(matcher, bot, event, state.copy())
-            for matcher in run_matchers
+            _check_matcher(priority, matcher, bot, event, state.copy())
+            for matcher in matchers[priority]
         ]
 
         results = await asyncio.gather(*pending_tasks, return_exceptions=True)

nonebot/rule.py

@@ -282,7 +282,8 @@ def regex(regex: str, flags: Union[int, re.RegexFlag] = 0) -> Rule:
 
       根据正则表达式进行匹配。
 
-      可以通过 ``state["_matched"]`` 获取正则表达式匹配成功的文本。
+      可以通过 ``state["_matched"]`` ``state["_matched_groups"]`` ``state["_matched_dict"]``
+      获取正则表达式匹配成功的文本。
 
     :参数:
 
@@ -302,9 +303,13 @@ def regex(regex: str, flags: Union[int, re.RegexFlag] = 0) -> Rule:
         matched = pattern.search(str(event.get_message()))
         if matched:
             state["_matched"] = matched.group()
+            state["_matched_groups"] = matched.groups()
+            state["_matched_dict"] = matched.groupdict()
             return True
         else:
             state["_matched"] = None
+            state["_matched_groups"] = None
+            state["_matched_dict"] = None
             return False
 
     return Rule(_regex)