From 0539e774d7992e7b8935dd543f83547a15825d3b Mon Sep 17 00:00:00 2001 From: liuwei Date: Wed, 7 May 2025 16:39:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BE=A4=E6=88=90=E5=91=98?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- robot.py | 53 +++++++++++++++++++++++------------------------------ 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/robot.py b/robot.py index 79062f1..c3d6b84 100644 --- a/robot.py +++ b/robot.py @@ -360,21 +360,20 @@ class Robot(Job): if chatroom_info: # 保存群信息到数据库 self.contacts_db.save_chatroom_info(chatroom_info) - - # 保存群成员信息 - if "NewChatroomData" in chatroom_info and "ChatRoomMember" in chatroom_info["NewChatroomData"]: - member_list = chatroom_info["NewChatroomData"]["ChatRoomMember"] + members = await self.ipad_bot.get_chatroom_member_list(group_id) + # 保存群成员信息 + if members: # 兼容逻辑已放到save_chatroom_member_simple内部 - self.contacts_db.save_chatroom_member_simple(group_id, member_list) - self.LOG.info(f"member_list: {member_list}") + self.contacts_db.save_chatroom_member_simple(group_id, members) + self.LOG.info(f"member_list: {members}") # 更新联系人缓存 - for member in member_list: + for member in members: wxid = member.get("UserName", "") - if isinstance(wxid, dict): - wxid = wxid.get("string", "") nick_name = member.get("NickName", "") - if isinstance(nick_name, dict): - nick_name = nick_name.get("string", "") + displayName = member.get("DisplayName", "") + #如果displayName不为空，使用displayName + if displayName: + nick_name = displayName if wxid: self.allContacts[wxid] = nick_name @@ -541,26 +540,20 @@ class Robot(Job): if chatroom_info.get("UserName", ""): # 保存群信息到数据库 self.contacts_db.save_chatroom_info(chatroom_info) - - # 保存群成员信息 - if "NewChatroomData" in chatroom_info and "ChatRoomMember" in chatroom_info["NewChatroomData"]: - member_list = chatroom_info["NewChatroomData"]["ChatRoomMember"] - self.contacts_db.save_chatroom_member_simple(group_id, member_list) - + members = await self.ipad_bot.get_chatroom_member_list(group_id) + # 保存群成员信息 + if members: + # 兼容逻辑已放到save_chatroom_member_simple内部 + self.contacts_db.save_chatroom_member_simple(group_id, members) + self.LOG.info(f"member_list: {members}") # 更新联系人缓存 - for member in member_list: - wxid = "" - if isinstance(member.get("UserName"), dict): - wxid = member["UserName"].get("string", "") - else: - wxid = member.get("UserName", "") - - nick_name = "" - if isinstance(member.get("NickName"), dict): - nick_name = member["NickName"].get("string", "") - else: - nick_name = member.get("NickName", "") - + for member in members: + wxid = member.get("UserName", "") + nick_name = member.get("NickName", "") + displayName = member.get("DisplayName", "") + #如果displayName不为空，使用displayName + if displayName: + nick_name = displayName if wxid: self.allContacts[wxid] = nick_name