From 85182073fbe0433ef00d59920c0951abb527f5e5 Mon Sep 17 00:00:00 2001 From: Bakadax Date: Fri, 25 Apr 2025 14:49:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=88=B3=E4=B8=80?= =?UTF-8?q?=E6=88=B3=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/recv_handler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/recv_handler.py b/src/recv_handler.py index 66dcb66..50f14ea 100644 --- a/src/recv_handler.py +++ b/src/recv_handler.py @@ -536,8 +536,8 @@ class RecvHandler: else: return None try: - first_txt = raw_info[2].get("text", "戳了戳") - second_txt = raw_info[4].get("text", "") + first_txt = raw_info[2].get("txt", "戳了戳") + second_txt = raw_info[4].get("txt", "") except Exception as e: logger.warning(f"解析戳一戳消息失败，使用默认文本：{str(e)}") first_txt = "戳了戳" From 0f34a798f7b6f91dc1744029373aa730c330c19c Mon Sep 17 00:00:00 2001 From: Bakadax Date: Fri, 25 Apr 2025 15:22:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=81=E8=81=8A?= =?UTF-8?q?=E6=88=B3=E4=B8=80=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/recv_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/recv_handler.py b/src/recv_handler.py index 50f14ea..bda5c9b 100644 --- a/src/recv_handler.py +++ b/src/recv_handler.py @@ -463,7 +463,7 @@ class RecvHandler: source_name: str = None source_cardname: str = None - if group_id: + if group_id != "None": member_info: dict = await get_member_info(self.server_connection, group_id, user_id) if member_info: source_name = member_info.get("nickname") From 536b231fd107c1e84e6df8c451ee8672119dff70 Mon Sep 17 00:00:00 2001 From: Bakadax Date: Fri, 25 Apr 2025 15:36:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=98=B2=E6=AD=A2nonetype=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/recv_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/recv_handler.py b/src/recv_handler.py index bda5c9b..22a05e4 100644 --- a/src/recv_handler.py +++ b/src/recv_handler.py @@ -463,7 +463,7 @@ class RecvHandler: source_name: str = None source_cardname: str = None - if group_id != "None": + if group_id and group_id != "None": member_info: dict = await get_member_info(self.server_connection, group_id, user_id) if member_info: source_name = member_info.get("nickname") From 32bae6399a4479e10c78372d6f90ef1b8b329a2c Mon Sep 17 00:00:00 2001 From: Bakadax Date: Fri, 25 Apr 2025 18:06:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=8D=E5=8F=91=E7=8E=B0=E5=90=8E?= =?UTF-8?q?=E9=9D=A2=E8=BF=98=E6=9C=89=E4=B8=80=E4=B8=AA=E5=88=A4=E6=96=AD?= =?UTF-8?q?group=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/recv_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/recv_handler.py b/src/recv_handler.py index 22a05e4..e7f37ae 100644 --- a/src/recv_handler.py +++ b/src/recv_handler.py @@ -487,7 +487,7 @@ class RecvHandler: ) group_info: GroupInfo = None - if group_id: + if group_id and group_id != "None": fetched_group_info = await get_group_info(self.server_connection, group_id) group_name: str = None if fetched_group_info: