From 3b149c520b5d585c8176c35e7835477b6b0266d6 Mon Sep 17 00:00:00 2001 From: HakimYu Date: Tue, 24 Jun 2025 16:30:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(AiocqhttpAdapter):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?at=5Finfo.get("nick",=20"")=E7=9A=84=E9=94=99=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=9C=A8message=5Fstr=E4=B8=AD=E9=92=88=E5=AF=B9At?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0QQ=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py index df8a00ae1..079371548 100644 --- a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py +++ b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py @@ -307,7 +307,7 @@ class AiocqhttpAdapter(Platform): user_id=int(m["data"]["qq"]), ) if at_info: - nickname = at_info.get("nick", "") + nickname = at_info.get("nickname", "") is_at_self = str(m["data"]["qq"]) in {abm.self_id, "all"} abm.message.append( @@ -322,7 +322,7 @@ class AiocqhttpAdapter(Platform): first_at_self_processed = True else: # 非第一个@机器人或@其他用户，添加到message_str - message_str += f" @{nickname} " + message_str += f" @{nickname}({m['data']['qq']}) " else: abm.message.append(At(qq=str(m["data"]["qq"]), name="")) except ActionFailed as e: From 0760cabbbe9391024e811bd64f48a2bcc77848b2 Mon Sep 17 00:00:00 2001 From: HakimYu Date: Tue, 24 Jun 2025 17:20:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(AiocqhttpAdapter):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dreply=E7=B1=BB=E5=9E=8B=E7=9A=84=20Event.from=5Fpayloa?= =?UTF-8?q?d=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py index 079371548..a103b2ea6 100644 --- a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py +++ b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py @@ -183,6 +183,7 @@ class AiocqhttpAdapter(Platform): @param get_reply: 是否获取回复消息。这个参数是为了防止多个回复嵌套。 """ abm = AstrBotMessage() + logger.info(f"event: {event}") abm.self_id = str(event.self_id) abm.sender = MessageMember( str(event.sender["user_id"]), event.sender["nickname"] @@ -273,6 +274,8 @@ class AiocqhttpAdapter(Platform): action="get_msg", message_id=int(m["data"]["id"]), ) + # 添加必要的 post_type 字段，防止 Event.from_payload 报错 + reply_event_data["post_type"] = "message" abm_reply = await self._convert_handle_message_event( Event.from_payload(reply_event_data), get_reply=False ) From 244fb1fed6a019c8183d30c7dcad5a3da9b75be3 Mon Sep 17 00:00:00 2001 From: Soulter <905617992@qq.com> Date: Fri, 27 Jun 2025 14:38:31 +0800 Subject: [PATCH 3/4] chore: remove useless logger --- .../platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py index a103b2ea6..eca99543a 100644 --- a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py +++ b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py @@ -168,9 +168,7 @@ class AiocqhttpAdapter(Platform): if "sub_type" in event: if event["sub_type"] == "poke" and "target_id" in event: - abm.message.append( - Poke(qq=str(event["target_id"]), type="poke") - ) # noqa: F405 + abm.message.append(Poke(qq=str(event["target_id"]), type="poke")) # noqa: F405 return abm @@ -183,7 +181,6 @@ class AiocqhttpAdapter(Platform): @param get_reply: 是否获取回复消息。这个参数是为了防止多个回复嵌套。 """ abm = AstrBotMessage() - logger.info(f"event: {event}") abm.self_id = str(event.self_id) abm.sender = MessageMember( str(event.sender["user_id"]), event.sender["nickname"] From 073cdf6d51bce7e2028c78673d0e793a5c289c27 Mon Sep 17 00:00:00 2001 From: Soulter <905617992@qq.com> Date: Sat, 28 Jun 2025 21:51:10 +0800 Subject: [PATCH 4/4] perf: also consider nick --- .../platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py index eca99543a..02e655af7 100644 --- a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py +++ b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py @@ -307,7 +307,7 @@ class AiocqhttpAdapter(Platform): user_id=int(m["data"]["qq"]), ) if at_info: - nickname = at_info.get("nickname", "") + nickname = at_info.get("nick", "") or at_info.get("nickname", "") is_at_self = str(m["data"]["qq"]) in {abm.self_id, "all"} abm.message.append(