From 26c752a710a9879634ac5bd135f2b99366b5ea1f Mon Sep 17 00:00:00 2001
From: shuaikangzhou <863909694@qq.com>
Date: Thu, 7 Dec 2023 20:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=92=A4=E5=9B=9E=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/DataBase/msg.py         |  2 +-
 app/DataBase/output_pc.py   | 14 +++++---------
 app/ui_pc/chat/chat_info.py |  4 ++++
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/DataBase/msg.py b/app/DataBase/msg.py
index 8876d4f..44530aa 100644
--- a/app/DataBase/msg.py
+++ b/app/DataBase/msg.py
@@ -110,7 +110,7 @@ class Msg:
                 from MSG
                 where StrTalker = ? and localId < ?
                 order by CreateTime desc 
-                limit 10
+                limit 20
             '''
         result = None
         if not self.open_flag:
diff --git a/app/DataBase/output_pc.py b/app/DataBase/output_pc.py
index 2934e38..30090bb 100644
--- a/app/DataBase/output_pc.py
+++ b/app/DataBase/output_pc.py
@@ -903,15 +903,6 @@ const chatMessages = [
                     f'''{{ type:{type_}, text: '{str_content}',is_send:{is_send},avatar_path:'{avatar}'}},'''
                 )
             elif type_ == 3:
-                import re
-                pattern1 = r'<msg><img length="\d+" hdlength="0" /><commenturl></commenturl></msg>'
-                pattern2 = r'<msg><img /></msg>'
-                match = re.search(pattern1, str_content)
-                if match:
-                    continue
-                match = re.search(pattern2, str_content)
-                if match:
-                    continue
                 image_path = hard_link_db.get_image(content=str_content, thumb=False)
                 image_path = path.get_relative_path(image_path, base_path=f'/data/聊天记录/{self.contact.remark}/image')
                 image_path = image_path.replace('\\', '/')
@@ -923,6 +914,11 @@ const chatMessages = [
                 f.write(
                     f'''{{ type:{type_}, text: '{image_path}',is_send:{is_send},avatar_path:'{avatar}'}},'''
                 )
+            elif type_ == 10000:
+                str_content = escape_js_and_html(str_content.lstrip('<revokemsg>').rstrip('</revokemsg>'))
+                f.write(
+                    f'''{{ type:0, text: '{str_content}',is_send:{is_send},avatar_path:''}},'''
+                )
         html_end = '''
 ];
     function renderMessages(messages) {
diff --git a/app/ui_pc/chat/chat_info.py b/app/ui_pc/chat/chat_info.py
index 5464be6..5642bdd 100644
--- a/app/ui_pc/chat/chat_info.py
+++ b/app/ui_pc/chat/chat_info.py
@@ -129,6 +129,10 @@ class ChatInfo(QWidget):
                     is_send
                 )
                 self.chat_window.add_message_item(bubble_message, 0)
+            elif type_ == 10000:
+                str_content = str_content.lstrip('<revokemsg>').rstrip('</revokemsg>')
+                message = Notice(str_content )
+                self.chat_window.add_message_item(message, 0)
         except:
             print(message)
             traceback.print_exc()