ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-02-07 19:36:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 check data instead of object in to_me

Browse Source
This commit is contained in:
yanyongyu 2021-08-12 13:57:52 +08:00
parent a04957a354
commit 59db66ef27
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py
View File

@ -96,10 +96,13 @@ def _check_at_me(bot: "Bot", event: "Event"):
if event.message_type == "private": if event.message_type == "private":
event.to_me = True event.to_me = True
else: else:
at_me_seg = MessageSegment.at(event.self_id)
def _is_at_me_seg(segment: MessageSegment):
return segment.type == "at" and str(segment.data.get(
"qq", "")) == str(event.self_id)
# check the first segment # check the first segment
if event.message[0] == at_me_seg: if _is_at_me_seg(event.message[0]):
event.to_me = True event.to_me = True
event.message.pop(0) event.message.pop(0)
if event.message and event.message[0].type == "text": if event.message and event.message[0].type == "text":
@ -107,7 +110,7 @@ def _check_at_me(bot: "Bot", event: "Event"):
"text"].lstrip() "text"].lstrip()
if not event.message[0].data["text"]: if not event.message[0].data["text"]:
del event.message[0] del event.message[0]
if event.message and event.message[0] == at_me_seg: if event.message and _is_at_me_seg(event.message[0]):
event.message.pop(0) event.message.pop(0)
if event.message and event.message[0].type == "text": if event.message and event.message[0].type == "text":
event.message[0].data["text"] = event.message[0].data[ event.message[0].data["text"] = event.message[0].data[
@ -125,7 +128,7 @@ def _check_at_me(bot: "Bot", event: "Event"):
i -= 1 i -= 1
last_msg_seg = event.message[i] last_msg_seg = event.message[i]
if last_msg_seg == at_me_seg: if _is_at_me_seg(last_msg_seg):
event.to_me = True event.to_me = True
del event.message[i:] del event.message[i:]