From 1d18774d59f059492e6a277f896ee44820dae186 Mon Sep 17 00:00:00 2001 From: XiYang6666 <1782356858@qq.com> Date: Sun, 17 Sep 2023 23:52:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20fix=20wrong=20length=20compa?= =?UTF-8?q?rison?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nonebot/adapters/red/bot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nonebot/adapters/red/bot.py b/nonebot/adapters/red/bot.py index 75ed92b..7e48397 100644 --- a/nonebot/adapters/red/bot.py +++ b/nonebot/adapters/red/bot.py @@ -34,7 +34,7 @@ def _check_at_me(bot: "Bot", event: MessageEvent) -> None: event.elements.pop(0) # 处理at后的空格 - if len(event.elements) >= 1: + if len(event.elements) > 1: second_element = event.elements[0] if ( second_element.elementType == 1 @@ -52,7 +52,7 @@ def _check_at_me(bot: "Bot", event: MessageEvent) -> None: and last_element.textElement and last_element.textElement.atType == 0 and not last_element.textElement.content.strip() - and len(event.elements) >= 1 + and len(event.elements) > 1 ): # 处理at后的空格 i -= 1 From 19c8a62947f10753c0210781de8372017a878a24 Mon Sep 17 00:00:00 2001 From: XiYang6666 <1782356858@qq.com> Date: Mon, 18 Sep 2023 00:17:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20fix=20wrong=20order?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nonebot/adapters/red/bot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nonebot/adapters/red/bot.py b/nonebot/adapters/red/bot.py index 7e48397..7f6f918 100644 --- a/nonebot/adapters/red/bot.py +++ b/nonebot/adapters/red/bot.py @@ -33,7 +33,7 @@ def _check_at_me(bot: "Bot", event: MessageEvent) -> None: event.to_me = True event.elements.pop(0) - # 处理at后的空格 + # 处理at前的空格 if len(event.elements) > 1: second_element = event.elements[0] if ( @@ -125,8 +125,8 @@ def __init__( async def handle_event(self, event: Event): # TODO: 检查事件是否有回复消息,调用平台 API 获取原始消息的消息内容 if isinstance(event, MessageEvent): - _check_at_me(self, event) _check_reply_me(self, event) + _check_at_me(self, event) _check_nickname(self, event) await handle_event(self, event) From 44f6b4e8eb9ff4c6f632f1b70ad2a5d5666b21f7 Mon Sep 17 00:00:00 2001 From: XiYang6666 <1782356858@qq.com> Date: Mon, 18 Sep 2023 00:47:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=90=9B=20add=20missing=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pdm.lock | 2 +- pyproject.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pdm.lock b/pdm.lock index b8a522f..a3580df 100644 --- a/pdm.lock +++ b/pdm.lock @@ -6,7 +6,7 @@ groups = ["default", "dev"] cross_platform = true static_urls = false lock_version = "4.3" -content_hash = "sha256:9226512708bb76dd461eabf467802c90b86f994adab4fd508634dd51ca4f5024" +content_hash = "sha256:10e5a42e647693ca50d12218f96063e2e7e7e7c9f92637b30386b14ac0eda735" [[package]] name = "anyio" diff --git a/pyproject.toml b/pyproject.toml index 3669f90..df78333 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,6 +7,7 @@ authors = [ ] dependencies = [ "nonebot2>=2.0.1", + "packaging>=23.1", ] requires-python = ">=3.8" readme = "README.md"