calvin.erfmann/WhatsApp-Chat-Exporter
1
0
Fork 0
mirror of https://github.com/KnugiHK/WhatsApp-Chat-Exporter.git synced 2026-04-27 16:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix for sender name in group chat

Browse Source 
#9
This commit is contained in:
KnugiHK
2023-02-13 00:25:31 +08:00
parent d46a42a097
commit 4cb4ac3e7b
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Whatsapp_Chat_Exporter/extract_new.py
View File

@@ -203,7 +203,7 @@ def messages(db, data):
print(f"Gathering messages...(0/{total_row_number})", end="\r") print(f"Gathering messages...(0/{total_row_number})", end="\r")
phone_number_re = re.compile(r"[0-9]+@s.whatsapp.net") phone_number_re = re.compile(r"[0-9]+@s.whatsapp.net")
c.execute("""SELECT jid.raw_string as key_remote_jid, c.execute("""SELECT jid_global.raw_string as key_remote_jid,
message._id, message._id,
message.from_me as key_from_me, message.from_me as key_from_me,
message.timestamp, message.timestamp,
@@ -219,6 +219,7 @@ def messages(db, data):
message.key_id, message.key_id,
message_quoted.text_data as quoted_data, message_quoted.text_data as quoted_data,
message.message_type, message.message_type,
jid_group.raw_string as group_sender_jid,
chat.subject as chat_subject chat.subject as chat_subject
FROM message FROM message
LEFT JOIN message_quoted LEFT JOIN message_quoted
@@ -233,8 +234,10 @@ def messages(db, data):
ON message_future.message_row_id = message._id ON message_future.message_row_id = message._id
LEFT JOIN chat LEFT JOIN chat
ON chat._id = message.chat_row_id ON chat._id = message.chat_row_id
INNER JOIN jid INNER JOIN jid jid_global
ON jid._id = chat.jid_row_id ON jid_global._id = chat.jid_row_id
LEFT JOIN jid jid_group
ON jid_group._id = message.sender_jid_row_id
WHERE key_remote_jid <> '-1';""") WHERE key_remote_jid <> '-1';""")
i = 0 i = 0
content = c.fetchone() content = c.fetchone()
@@ -252,14 +255,15 @@ def messages(db, data):
if "-" in content["key_remote_jid"] and content["key_from_me"] == 0: if "-" in content["key_remote_jid"] and content["key_from_me"] == 0:
name = None name = None
if content["remote_resource"] in data: if content["remote_resource"] in data:
name = data[content["remote_resource"]]["name"] if content["chat_subject"] is not None:
if "@" in content["remote_resource"]: _jid = content["group_sender_jid"]
fallback = content["remote_resource"].split('@')["key_remote_jid"] else:
else: _jid = content["key_remote_jid"]
fallback = None if _jid in data:
name = data[_jid].name
fallback = _jid.split('@')[0] if "@" in _jid else None
else: else:
fallback = None fallback = None
data[content["key_remote_jid"]].messages[content["_id"]].sender = name or fallback data[content["key_remote_jid"]].messages[content["_id"]].sender = name or fallback
else: else:
data[content["key_remote_jid"]].messages[content["_id"]].sender = None data[content["key_remote_jid"]].messages[content["_id"]].sender = None