From 3f87ff68269837114f370dbddf4ef334deb0c3bb Mon Sep 17 00:00:00 2001
From: xaoyaoo <xaoyaoo@qq.com>
Date: Sat, 30 Mar 2024 19:02:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pywxdump/analyzer/export_chat.py | 19 +++++++++++++++++--
 pywxdump/analyzer/utils.py       |  9 +++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/pywxdump/analyzer/export_chat.py b/pywxdump/analyzer/export_chat.py
index bae7d02..a957e63 100644
--- a/pywxdump/analyzer/export_chat.py
+++ b/pywxdump/analyzer/export_chat.py
@@ -20,7 +20,7 @@ import json
 import time
 from functools import wraps
 
-from .utils import get_md5, attach_databases, execute_sql, get_type_name, match_BytesExtra, DBPool
+from .utils import get_md5, attach_databases, execute_sql, get_type_name, match_BytesExtra, DBPool, time_int2str
 from .db_parsing import parse_xml_string, decompress_CompressContent, read_BytesExtra
 
 
@@ -81,6 +81,7 @@ def get_contact_list(MicroMsg_db_path, OpenIMContact_db_path=None):
                      "headImgUrl": headImgUrl})
     return users
 
+
 def get_chatroom_list(MicroMsg_db_path):
     """
     获取群聊列表
@@ -169,7 +170,7 @@ def get_msg_list(MSG_db_path, selected_talker="", start_index=0, page_size=500):
         data = []
         for row in result1:
             localId, IsSender, StrContent, StrTalker, Sequence, Type, SubType, CreateTime, MsgSvrID, DisplayContent, CompressContent, BytesExtra, id = row
-            CreateTime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(CreateTime))
+            CreateTime = time_int2str(CreateTime)
 
             type_id = (Type, SubType)
             type_name = get_type_name(type_id)
@@ -236,6 +237,20 @@ def get_msg_list(MSG_db_path, selected_talker="", start_index=0, page_size=500):
                 content["msg"] = f"{title}\n{des}"
                 content["src"] = recorditem
 
+            elif type_id == (49, 57):  # 带有引用的文本消息
+                CompressContent = decompress_CompressContent(CompressContent)
+                content_tmp = parse_xml_string(CompressContent)
+                appmsg = content_tmp.get("appmsg", {})
+                title = appmsg.get("title", "")
+                refermsg = appmsg.get("refermsg", {})
+                displayname = refermsg.get("displayname", "")
+                display_content = refermsg.get("content", "")
+                display_createtime = refermsg.get("createtime", "")
+                display_createtime = time_int2str(
+                    int(display_createtime)) if display_createtime.isdigit() else display_createtime
+                content["msg"] = f"{title}\n[引用]{displayname}:{display_content}({display_createtime})"
+                content["src"] = ""
+
             elif type_id == (49, 2000):  # 转账消息
                 CompressContent = decompress_CompressContent(CompressContent)
                 content_tmp = parse_xml_string(CompressContent)
diff --git a/pywxdump/analyzer/utils.py b/pywxdump/analyzer/utils.py
index 2f8a779..17cbe6e 100644
--- a/pywxdump/analyzer/utils.py
+++ b/pywxdump/analyzer/utils.py
@@ -9,8 +9,17 @@ import hashlib
 import os
 import re
 import sqlite3
+import time
 
 
+def time_int2str(time_int):
+    """
+    时间戳转换为时间字符串
+    :param time_int: 时间戳
+    :return: 时间字符串
+    """
+    return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time_int))
+
 def read_dict_all_values(data):
     """
     读取字典中所有的值（单层）