From 46c24e6ecc650ea15e9be7b9a2afff470bc49c0e Mon Sep 17 00:00:00 2001
From: xaoyaoo <xaoyaoo@163.com>
Date: Mon, 5 Aug 2024 17:47:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=BC=95=E7=94=A8=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pywxdump/db/dbMSG.py              | 17 +++++++++++++----
 pywxdump/db/utils/common_utils.py |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pywxdump/db/dbMSG.py b/pywxdump/db/dbMSG.py
index a5a1f7b..c4170c1 100644
--- a/pywxdump/db/dbMSG.py
+++ b/pywxdump/db/dbMSG.py
@@ -178,18 +178,27 @@ class MsgHandler(DatabaseBase):
             CompressContent = decompress_CompressContent(CompressContent)
             content_tmp = xml2dict(CompressContent)
             appmsg = content_tmp.get("appmsg", {})
+
             title = appmsg.get("title", "")
             refermsg = appmsg.get("refermsg", {})
+
+            type_id = appmsg.get("type", "1")
+
             displayname = refermsg.get("displayname", "")
             display_content = refermsg.get("content", "")
             display_createtime = refermsg.get("createtime", "")
+
             display_createtime = timestamp2str(
                 int(display_createtime)) if display_createtime.isdigit() else display_createtime
-            if display_content.startswith("<?xml"):
+
+            if display_content and display_content.startswith("<?xml"):
                 display_content = xml2dict(display_content)
-                appmsg1 = display_content.get("appmsg", {})
-                title1 = appmsg1.get("title", "")
-                if title1: display_content = title1
+                if "img" in display_content:
+                    display_content = "图片"
+                else:
+                    appmsg1 = display_content.get("appmsg", {})
+                    title1 = appmsg1.get("title", "")
+                    display_content = title1 | display_content
             msg = f"{title}\n\n[引用]({display_createtime}){displayname}:{display_content}"
             src = ""
 
diff --git a/pywxdump/db/utils/common_utils.py b/pywxdump/db/utils/common_utils.py
index f68173b..cf64671 100644
--- a/pywxdump/db/utils/common_utils.py
+++ b/pywxdump/db/utils/common_utils.py
@@ -367,7 +367,7 @@ def silk2audio(buf_data, is_play=False, is_wave=False, save_path=None, rate=2400
 
         play_audio(pcm_data, rate)
 
-    print(is_play, is_wave, save_path)
+    # print(is_play, is_wave, save_path)
 
     if is_wave:  # 转换为wav文件
         wave_file = BytesIO()  # 创建wav文件