From 86d3a957cf515fefd6fb47f5de8404c851be3411 Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Tue, 9 Jan 2024 17:37:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96contact=5Fcount=5Flist?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8E=BB=E9=87=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +--- pywxdump/api/api.py | 2 ++ pywxdump/api/rjson.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 874dcf3..5671f6c 100644 --- a/README.md +++ b/README.md @@ -137,9 +137,7 @@ qq交流群：577704006（左边二维码） or 点击链接加入群聊[pywxdum # 四、致谢 -[![PyWxDump 贡献者](https://contrib.rocks/image?repo=xaoyaoo/PyWxDump)](https://github.com/xaoyaoo/PyWxDump/graphs/contributors) - -[![UI 贡献者](https://contrib.rocks/image?repo=xaoyaoo/wxdump_web)](https://github.com/xaoyaoo/wxdump_web/graphs/contributors) +[![PyWxDump 贡献者](https://contrib.rocks/image?repo=xaoyaoo/PyWxDump)](https://github.com/xaoyaoo/PyWxDump/graphs/contributors)[![UI 贡献者](https://contrib.rocks/image?repo=xaoyaoo/wxdump_web)](https://github.com/xaoyaoo/wxdump_web/graphs/contributors) # 五、许可证 diff --git a/pywxdump/api/api.py b/pywxdump/api/api.py index 0f71b05..e11bab9 100644 --- a/pywxdump/api/api.py +++ b/pywxdump/api/api.py @@ -99,6 +99,8 @@ def contact_count_list(): chat_count = analyzer.get_chat_count(msg_path) for contact in contact_list: contact["chat_count"] = chat_count.get(contact["username"], 0) + # 去重 + contact_list = [dict(t) for t in {tuple(d.items()) for d in contact_list}] # 降序 contact_list = sorted(contact_list, key=lambda x: x["chat_count"], reverse=True) diff --git a/pywxdump/api/rjson.py b/pywxdump/api/rjson.py index 8985892..11a3e87 100644 --- a/pywxdump/api/rjson.py +++ b/pywxdump/api/rjson.py @@ -1,7 +1,7 @@ import logging -def ReJson(code: int, body: dict = None, msg: str = None, error: str = None, extra: dict = None) -> dict: +def ReJson(code: int, body: [dict, list] = None, msg: str = None, error: str = None, extra: dict = None) -> dict: """ 返回格式化的json数据 :param code: 状态码 int