pyqt支持群聊显示，合并群聊和非群聊的获取

app/DataBase/exporter_csv.py

@@ -14,11 +14,7 @@ class CSVExporter(ExporterBase):
         columns = ['localId', 'TalkerId', 'Type', 'SubType',
                    'IsSender', 'CreateTime', 'Status', 'StrContent',
                    'StrTime', 'Remark', 'NickName', 'Sender']
-        if self.contact.is_chatroom:
-            packagemsg = PackageMsg()
-            messages = packagemsg.get_package_message_by_wxid(self.contact.wxid)
-        else:
-            messages = msg_db.get_messages(self.contact.wxid)
+        messages = msg_db.get_messages(self.contact.wxid)
         # 写入CSV文件
         with open(filename, mode='w', newline='', encoding='utf-8-sig') as file:
             writer = csv.writer(file)

app/DataBase/exporter_docx.py

@@ -1,27 +1,20 @@
 import os
 import shutil
-import sys
 import time
-import traceback
 from re import findall
 
 import docx
-from PyQt5.QtCore import pyqtSignal, QThread
 from docx import shared
 from docx.enum.table import WD_ALIGN_VERTICAL
 from docx.enum.text import WD_COLOR_INDEX, WD_PARAGRAPH_ALIGNMENT
 from docx.oxml.ns import qn
 
-from app.DataBase import msg_db, hard_link_db, media_msg_db
+from app.DataBase import msg_db, hard_link_db
 from app.DataBase.output import ExporterBase, escape_js_and_html
 from app.DataBase.package_msg import PackageMsg
-from app.log import logger
 from app.person import Me
-from app.util import path
 from app.util.compress_content import parser_reply, share_card, music_share
-from app.util.emoji import get_emoji_url
-from app.util.file import get_file
-from app.util.image import get_image_path, get_image, get_image_abs_path
+from app.util.image import get_image_abs_path
 from app.util.music import get_music_path
 
 
@@ -296,11 +289,7 @@ class DocxExporter(ExporterBase):
         doc = docx.Document()
         doc.styles['Normal'].font.name = u'Cambria'
         doc.styles['Normal']._element.rPr.rFonts.set(qn('w:eastAsia'), u'宋体')
-        if self.contact.is_chatroom:
-            packagemsg = PackageMsg()
-            messages = packagemsg.get_package_message_by_wxid(self.contact.wxid)
-        else:
-            messages = msg_db.get_messages(self.contact.wxid)
+        messages = msg_db.get_messages(self.contact.wxid)
         Me().save_avatar(os.path.join(f"{origin_docx_path}/avatar/{Me().wxid}.png"))
         if self.contact.is_chatroom:
             for message in messages:

app/DataBase/exporter_html.py

@@ -276,11 +276,7 @@ class HtmlExporter(ExporterBase):
         )
 
     def export(self):
-        if self.contact.is_chatroom:
-            packagemsg = PackageMsg()
-            messages = packagemsg.get_package_message_by_wxid(self.contact.wxid)
-        else:
-            messages = msg_db.get_messages(self.contact.wxid)
+        messages = msg_db.get_messages(self.contact.wxid)
         filename = f"{os.path.abspath('.')}/data/聊天记录/{self.contact.remark}/{self.contact.remark}.html"
         file_path = './app/resources/data/template.html'
         if not os.path.exists(file_path):

app/DataBase/exporter_txt.py

@@ -114,11 +114,7 @@ class TxtExporter(ExporterBase):
         origin_docx_path = f"{os.path.abspath('.')}/data/聊天记录/{self.contact.remark}"
         os.makedirs(origin_docx_path, exist_ok=True)
         filename = f"{os.path.abspath('.')}/data/聊天记录/{self.contact.remark}/{self.contact.remark}.txt"
-        if self.contact.is_chatroom:
-            packagemsg = PackageMsg()
-            messages = packagemsg.get_package_message_by_wxid(self.contact.wxid)
-        else:
-            messages = msg_db.get_messages(self.contact.wxid)
+        messages = msg_db.get_messages(self.contact.wxid)
         total_steps = len(messages)
         with open(filename, mode='w', newline='', encoding='utf-8') as f:
             for index, message in enumerate(messages):

app/DataBase/micro_msg.py

@@ -93,6 +93,7 @@ class MicroMsg:
             self.cursor.execute(sql, [username])
             result = self.cursor.fetchone()
         except sqlite3.OperationalError:
+            # 解决ContactLabel表不存在的问题
             # lock.acquire(True)
             sql = '''
                    SELECT UserName, Alias, Type, Remark, NickName, PYInitial, RemarkPYInitial, ContactHeadImgUrl.smallHeadImgUrl, ContactHeadImgUrl.bigHeadImgUrl,ExTraBuf,"None"

app/DataBase/msg.py

@@ -16,6 +16,70 @@ def is_database_exist():
     return os.path.exists(db_path)
 
 
+def parser_chatroom_message(messages):
+    from app.DataBase import micro_msg_db, misc_db
+    from app.util.protocbuf.msg_pb2 import MessageBytesExtra
+    from app.person import Contact, Me, ContactDefault
+    '''
+    获取一个群聊的聊天记录
+    return list
+        a[0]: localId,
+        a[1]: talkerId, （和strtalker对应的，不是群聊信息发送人）
+        a[2]: type,
+        a[3]: subType,
+        a[4]: is_sender,
+        a[5]: timestamp,
+        a[6]: status, （没啥用）
+        a[7]: str_content,
+        a[8]: str_time, （格式化的时间）
+        a[9]: msgSvrId,
+        a[10]: BytesExtra,
+        a[11]: CompressContent,
+        a[12]: msg_sender, （ContactPC 或 ContactDefault 类型，这个才是群聊里的信息发送人，不是群聊或者自己是发送者没有这个字段）
+    '''
+    updated_messages = []  # 用于存储修改后的消息列表
+    for row in messages:
+        message = list(row)
+        if message[4] == 1:  # 自己发送的就没必要解析了
+            message.append(Me())
+            updated_messages.append(tuple(message))
+            continue
+        if message[10] is None:  # BytesExtra是空的跳过
+            message.append(ContactDefault(wxid))
+            updated_messages.append(tuple(message))
+            continue
+        msgbytes = MessageBytesExtra()
+        msgbytes.ParseFromString(message[10])
+        wxid = ''
+        for tmp in msgbytes.message2:
+            if tmp.field1 != 1:
+                continue
+            wxid = tmp.field2
+        if wxid == "":  # 系统消息里面 wxid 不存在
+            message.append(ContactDefault(wxid))
+            updated_messages.append(tuple(message))
+            continue
+        contact_info_list = micro_msg_db.get_contact_by_username(wxid)
+        if contact_info_list is None:  # 群聊中已退群的联系人不会保存在数据库里
+            message.append(ContactDefault(wxid))
+            updated_messages.append(tuple(message))
+            continue
+        contact_info = {
+            'UserName': contact_info_list[0],
+            'Alias': contact_info_list[1],
+            'Type': contact_info_list[2],
+            'Remark': contact_info_list[3],
+            'NickName': contact_info_list[4],
+            'smallHeadImgUrl': contact_info_list[7]
+        }
+        contact = Contact(contact_info)
+        contact.smallHeadImgBLOG = misc_db.get_avatar_buffer(contact.wxid)
+        contact.set_avatar(contact.smallHeadImgBLOG)
+        message.append(contact)
+        updated_messages.append(tuple(message))
+    return updated_messages
+
+
 def singleton(cls):
     _instance = {}
 
@@ -105,7 +169,7 @@ class Msg:
             result = self.cursor.fetchall()
         finally:
             lock.release()
-        return result
+        return parser_chatroom_message(result) if username_.__contains__('@chatroom') else result
         # result.sort(key=lambda x: x[5])
         # return self.add_sender(result)
 
@@ -164,7 +228,7 @@ class Msg:
         finally:
             lock.release()
         # result.sort(key=lambda x: x[5])
-        return result
+        return parser_chatroom_message(result) if username_.__contains__('@chatroom') else result
 
     def get_messages_by_type(self, username_, type_, year_='all'):
         if not self.open_flag:
@@ -629,14 +693,15 @@ if __name__ == '__main__':
     msg.init_database()
     wxid = 'wxid_0o18ef858vnu22'
     wxid = '24521163022@chatroom'
-    wxid = 'wxid_vtz9jk9ulzjt22' # si
+    wxid = 'wxid_vtz9jk9ulzjt22'  # si
     print()
     from app.util import compress_content
     import xml.etree.ElementTree as ET
+
     msgs = msg.get_messages(wxid)
 
     for msg in msgs:
-        if msg[2]==49 and msg[3]==5:
+        if msg[2] == 49 and msg[3] == 5:
             xml = compress_content.decompress_CompressContent(msg[11])
             root = ET.XML(xml)
             appmsg = root.find('appmsg')
@@ -658,4 +723,4 @@ if __name__ == '__main__':
                     print(thumb)
                 if tmp.field2 == 4:
                     app_logo = tmp.field2
-                    print('logo',app_logo)
+                    print('logo', app_logo)

app/DataBase/package_msg.py

@@ -110,7 +110,6 @@ class PackageMsg:
             a[12]: msg_sender, （ContactPC 或 ContactDefault 类型，这个才是群聊里的信息发送人，不是群聊或者自己是发送者没有这个字段）
         '''
         updated_messages = []  # 用于存储修改后的消息列表
-        chatroom_members = self.get_chatroom_member_list(chatroom_wxid)
         messages = msg_db.get_messages(chatroom_wxid)
         for row in messages:
             message = list(row)
@@ -150,7 +149,7 @@ class PackageMsg:
             contact.smallHeadImgBLOG = misc_db.get_avatar_buffer(contact.wxid)
             contact.set_avatar(contact.smallHeadImgBLOG)
             message.append(contact)
-            updated_messages.append(message)
+            updated_messages.append(tuple(message))
         return updated_messages
 
     def get_chatroom_member_list(self, strtalker):