ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-02-21 18:15:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 fix coding error

Browse Source
This commit is contained in:
yanyongyu 2020-11-16 12:35:04 +08:00
parent 6986232290
commit 829f085340
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nonebot/message.py
View File

@ -10,8 +10,8 @@ from nonebot.log import logger
from nonebot.rule import TrieRule from nonebot.rule import TrieRule
from nonebot.utils import escape_tag from nonebot.utils import escape_tag
from nonebot.matcher import matchers, Matcher from nonebot.matcher import matchers, Matcher
from nonebot.typing import Set, Type, Union, Iterable, NoReturn, Bot, Event from nonebot.typing import Set, Type, Union, Optional, Iterable, NoReturn, Bot, Event
from nonebot.exception import IgnoredException, ExpiredException, StopPropagation from nonebot.exception import IgnoredException, StopPropagation
from nonebot.typing import EventPreProcessor, RunPreProcessor, EventPostProcessor, RunPostProcessor from nonebot.typing import EventPreProcessor, RunPreProcessor, EventPostProcessor, RunPostProcessor
_event_preprocessors: Set[EventPreProcessor] = set() _event_preprocessors: Set[EventPreProcessor] = set()
@ -70,12 +70,12 @@ async def _check_matcher(priority: int, bot: Bot, event: Event,
] ]
results = await asyncio.gather(*checking_tasks, return_exceptions=True) results = await asyncio.gather(*checking_tasks, return_exceptions=True)
expired = await asyncio.gather(*checking_expire_tasks) expired = await asyncio.gather(*checking_expire_tasks)
for expired_matcher in filter(lambda x: issubclass(Matcher), expired): for expired_matcher in filter(lambda x: x and x in results, expired):
try: try:
matchers[priority].remove(expired_matcher) matchers[priority].remove(expired_matcher)
except Exception: except Exception:
pass pass
return filter(lambda x: issubclass(Matcher), results) return filter(lambda x: x, results)
async def _run_matcher(Matcher: Type[Matcher], bot: Bot, event: Event, async def _run_matcher(Matcher: Type[Matcher], bot: Bot, event: Event,
@ -176,7 +176,7 @@ async def handle_event(bot: Bot, event: Event):
if show_log: if show_log:
logger.debug(f"Checking for matchers in priority {priority}...") logger.debug(f"Checking for matchers in priority {priority}...")
run_matchers = _check_matcher(priority, bot, event, state) run_matchers = await _check_matcher(priority, bot, event, state)
pending_tasks = [ pending_tasks = [
_run_matcher(matcher, bot, event, state.copy()) _run_matcher(matcher, bot, event, state.copy())