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 index error in cqhttp check to_me

Browse Source
This commit is contained in:
yanyongyu 2020-11-13 16:51:14 +08:00
parent c79a6df400
commit 781ec1ef67
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nonebot/adapters/cqhttp/__init__.py
View File

@ -115,6 +115,8 @@ async def _check_reply(bot: "Bot", event: "Event"):
if event.reply["sender"]["user_id"] == event.self_id: if event.reply["sender"]["user_id"] == event.self_id:
event.to_me = True event.to_me = True
del event.message[index] del event.message[index]
if not event.message:
event.message.append(MessageSegment.text(""))
def _check_at_me(bot: "Bot", event: "Event"): def _check_at_me(bot: "Bot", event: "Event"):
@ -137,8 +139,7 @@ def _check_at_me(bot: "Bot", event: "Event"):
at_me_seg = MessageSegment.at(event.self_id) at_me_seg = MessageSegment.at(event.self_id)
# check the first segment # check the first segment
first_msg_seg = event.message[0] if event.message[0] == at_me_seg:
if first_msg_seg == at_me_seg:
event.to_me = True event.to_me = True
del event.message[0] del event.message[0]
if event.message[0].type == "text": if event.message[0].type == "text":
@ -192,13 +193,9 @@ def _check_nickname(bot: "Bot", event: "Event"):
first_text = first_msg_seg.data["text"] first_text = first_msg_seg.data["text"]
if bot.config.nickname: nicknames = set(filter(lambda n: n, bot.config.nickname))
if nicknames:
# check if the user is calling me with my nickname # check if the user is calling me with my nickname
if isinstance(bot.config.nickname, str) or \
not isinstance(bot.config.nickname, Iterable):
nicknames = (bot.config.nickname,)
else:
nicknames = filter(lambda n: n, bot.config.nickname)
nickname_regex = "|".join(nicknames) nickname_regex = "|".join(nicknames)
m = re.search(rf"^({nickname_regex})([\s,，]*|$)", first_text, m = re.search(rf"^({nickname_regex})([\s,，]*|$)", first_text,
re.IGNORECASE) re.IGNORECASE)