ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2024-11-24 17:15:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

🔀 Merge pull request #135

Browse Source 
fix incorrect removing temp matcher
This commit is contained in:
Ju4tCode 2021-01-01 21:02:18 -06:00 committed by GitHub
commit 822709ceeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nonebot/message.py
View File

@ -117,8 +117,7 @@ async def _check_matcher(priority: int, bot: "Bot", event: "Event",
return None return None
async def _check_expire(Matcher: Type[Matcher]) -> Optional[Type[Matcher]]: async def _check_expire(Matcher: Type[Matcher]) -> Optional[Type[Matcher]]:
if Matcher.temp or (Matcher.expire_time and if Matcher.expire_time and datetime.now() > Matcher.expire_time:
datetime.now() > Matcher.expire_time):
return Matcher return Matcher
return None return None
@ -128,14 +127,19 @@ async def _check_matcher(priority: int, bot: "Bot", event: "Event",
checking_expire_tasks = [ checking_expire_tasks = [
_check_expire(Matcher) for Matcher in current_matchers _check_expire(Matcher) for Matcher in current_matchers
] ]
results = await asyncio.gather(*checking_tasks, return_exceptions=True) results = await asyncio.gather(*checking_tasks)
expired = await asyncio.gather(*checking_expire_tasks) expired = await asyncio.gather(*checking_expire_tasks)
for expired_matcher in filter(lambda x: x, expired): for expired_matcher in filter(lambda x: x, expired):
try: try:
matchers[priority].remove(expired_matcher) # type: ignore matchers[priority].remove(expired_matcher) # type: ignore
except Exception: except Exception:
pass pass
return filter(lambda x: x, results) for temp_matcher in filter(lambda x: x and x.temp, results):
try:
matchers[priority].remove(temp_matcher) # type: ignore
except Exception:
pass
return filter(lambda x: x, results) # type: ignore
async def _run_matcher(Matcher: Type[Matcher], bot: "Bot", event: "Event", async def _run_matcher(Matcher: Type[Matcher], bot: "Bot", event: "Event",