Shikong/WeChatMsg
1
0
Fork 0
mirror of https://github.com/LC044/WeChatMsg synced 2025-02-23 03:22:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'LC044:master' into master

Browse Source
This commit is contained in:
STDquantum 2023-12-18 19:50:10 +08:00 committed by GitHub
commit 38aeb246bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/DataBase/package_msg.py
View File

@ -34,19 +34,24 @@ class PackageMsg:
for row in messages: for row in messages:
row_list = list(row) row_list = list(row)
# 删除不使用的几个字段 # 删除不使用的几个字段
del row_list[13]
del row_list[12] del row_list[12]
del row_list[11] del row_list[11]
del row_list[10] del row_list[10]
del row_list[9]
strtalker = row[11] strtalker = row[11]
info = micro_msg_db.get_contact_by_username(strtalker) info = micro_msg_db.get_contact_by_username(strtalker)
if info is not None: if info is not None:
row_list.append(info[3]) row_list.append(info[3])
row_list.append(info[4]) row_list.append(info[4])
else:
row_list.append('')
row_list.append('')
# 判断是否是群聊 # 判断是否是群聊
if strtalker.__contains__('@chatroom'): if strtalker.__contains__('@chatroom'):
# 自己发送 # 自己发送
if row[12] == 1: if row[4] == 1:
row_list.append('我') row_list.append('我')
else: else:
# 存在BytesExtra为空的情况，此时消息类型应该为提示性消息。跳过不处理 # 存在BytesExtra为空的情况，此时消息类型应该为提示性消息。跳过不处理
@ -75,6 +80,14 @@ class PackageMsg:
sender = senderinfo[3] sender = senderinfo[3]
membersMap[wxid] = senderinfo[3] membersMap[wxid] = senderinfo[3]
row_list.append(sender) row_list.append(sender)
else:
if row[4] == 1:
row_list.append('我')
else:
if info is not None:
row_list.append(info[4])
else:
row_list.append('')
updated_messages.append(tuple(row_list)) updated_messages.append(tuple(row_list))
return updated_messages return updated_messages