nonebot/nonebot2
1
1
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2024-09-21 05:12:34 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

🐛 fix index error when check to me

Browse Source
This commit is contained in:
yanyongyu 2020-11-19 13:57:49 +08:00 committed by pull[bot]
parent 1557158cd9
commit 47aede8f67
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,14 +112,15 @@ async def _check_reply(bot: "Bot", event: "Event"):
return
msg_seg = event.message[index]
event.reply = await bot.get_msg(message_id=msg_seg.data["id"])
if event.reply["sender"]["user_id"] == int(event.self_id): # TODO 这里一个int一个str需要修改
# ensure string comparation
if str(event.reply["sender"]["user_id"]) == str(event.self_id):
event.to_me = True
del event.message[index]
if not event.message:
event.message.append(MessageSegment.text(""))
def _check_at_me(bot: "Bot", event: "Event"): # TODO 只有开头at机器人才会识别,其他的不管 应该删除前面两个如果存在的at以及后面正文前面的空格
def _check_at_me(bot: "Bot", event: "Event"):
"""
:说明:
@ -138,23 +139,22 @@ def _check_at_me(bot: "Bot", event: "Event"): # TODO 只有开头at机器人才
else:
at_me_seg = MessageSegment.at(event.self_id)
# check the first segment at 空 at
if event.message[0] == at_me_seg: # TODO 有时候不能正常判断
# check the first segment
if event.message[0] == at_me_seg:
event.to_me = True
del event.message[0]
if event.message[0].type == "text":
if event.message and event.message[0].type == "text":
event.message[0].data["text"] = event.message[0].data[
"text"].lstrip()
if not event.message[0].data["text"]:
del event.message[0]
if event.message:
if event.message[0] == at_me_seg:
del event.message[0]
if event.message[0].type == "text":
event.message[0].data["text"] = event.message[0].data[
"text"].lstrip()
if not event.message[0].data["text"]:
del event.message[0]
if event.message and event.message[0] == at_me_seg:
del event.message[0]
if event.message and event.message[0].type == "text":
event.message[0].data["text"] = event.message[0].data[
"text"].lstrip()
if not event.message[0].data["text"]:
del event.message[0]
if not event.to_me:
# check the last segment