ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-01-19 17:58:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

修复了at机器人时的bug

Browse Source
This commit is contained in:
synodriver 2020-11-19 13:07:02 +08:00 committed by pull[bot]
parent 8f4961613d
commit 1557158cd9
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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