From 6c08982ca7f9ebd957cc3c5d9df9fcdb3c10e0f6 Mon Sep 17 00:00:00 2001
From: yanyongyu <yanyongyu_1@126.com>
Date: Fri, 11 Dec 2020 16:29:12 +0800
Subject: [PATCH] :construction: update process

---
 nonebot/adapters/cqhttp/bot.py | 10 +++++-----
 nonebot/message.py             |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/nonebot/adapters/cqhttp/bot.py b/nonebot/adapters/cqhttp/bot.py
index d0f90dd7..5a6f7ab8 100644
--- a/nonebot/adapters/cqhttp/bot.py
+++ b/nonebot/adapters/cqhttp/bot.py
@@ -421,13 +421,13 @@ class Bot(BaseBot):
         """
         msg = message if isinstance(message, Message) else Message(message)
 
-        at_sender = at_sender and bool(event.user_id)
+        at_sender = at_sender and hasattr(event, "user_id")
 
         params = {}
-        if event.user_id:
-            params["user_id"] = event.user_id
-        if event.group_id:
-            params["group_id"] = event.group_id
+        if hasattr(event, "user_id"):
+            params["user_id"] = getattr(event, "user_id")
+        if hasattr(event, "group_id"):
+            params["group_id"] = getattr(event, "group_id")
         params.update(kwargs)
 
         if "message_type" not in params:
diff --git a/nonebot/message.py b/nonebot/message.py
index b5cb689a..3553c554 100644
--- a/nonebot/message.py
+++ b/nonebot/message.py
@@ -11,7 +11,6 @@ from typing import Set, Type, Optional, Iterable, TYPE_CHECKING
 
 from nonebot.log import logger
 from nonebot.rule import TrieRule
-from nonebot.utils import escape_tag
 from nonebot.matcher import matchers, Matcher
 from nonebot.exception import IgnoredException, StopPropagation, NoLogException
 from nonebot.typing import State, EventPreProcessor, RunPreProcessor, EventPostProcessor, RunPostProcessor
@@ -131,7 +130,7 @@ async def _check_matcher(priority: int, bot: "Bot", event: "Event",
     ]
     results = await asyncio.gather(*checking_tasks, return_exceptions=True)
     expired = await asyncio.gather(*checking_expire_tasks)
-    for expired_matcher in filter(lambda x: x and x in results, expired):
+    for expired_matcher in filter(lambda x: x, expired):
         try:
             matchers[priority].remove(expired_matcher)  # type: ignore
         except Exception: