diff --git a/app/DataBase/micro_msg.py b/app/DataBase/micro_msg.py index 0cd7e52..a22fa75 100644 --- a/app/DataBase/micro_msg.py +++ b/app/DataBase/micro_msg.py @@ -47,7 +47,7 @@ class MicroMsg: sql = '''SELECT UserName, Alias, Type, Remark, NickName, PYInitial, RemarkPYInitial, ContactHeadImgUrl.smallHeadImgUrl, ContactHeadImgUrl.bigHeadImgUrl FROM Contact INNER JOIN ContactHeadImgUrl ON Contact.UserName = ContactHeadImgUrl.usrName - WHERE (Type % 2 = 1 OR Type=2) + WHERE (Type!=4) AND NickName != '' ORDER BY CASE diff --git a/app/DataBase/output_pc.py b/app/DataBase/output_pc.py index 8084d31..94b5f19 100644 --- a/app/DataBase/output_pc.py +++ b/app/DataBase/output_pc.py @@ -632,17 +632,6 @@ class OutputMedia(QThread): msgSvrId = message[9] try: audio_path = media_msg_db.get_audio(msgSvrId, output_path=origin_docx_path + "/voice") - audio_path = audio_path.replace('/', '\\') - if self.contact.is_chatroom: - if is_send: - displayname = MePC().name - else: - displayname = message[12].remark - else: - displayname = MePC().name if is_send else self.contact.remark - displayname = escape_js_and_html(displayname) - modify_audio_metadata(audio_path, displayname) - # os.utime(audio_path, (timestamp, timestamp)) except: logger.error(traceback.format_exc()) finally: @@ -692,7 +681,7 @@ class OutputImage(QThread): def run(self): origin_docx_path = f"{os.path.abspath('.')}/data/聊天记录/{self.contact.remark}" - messages = msg_db.get_messages_by_type(self.contact.wxid, 3) + messages = msg_db.get_messages_by_type(self.contact.wxid,3) for message in messages: str_content = message[7] BytesExtra = message[10]