calvin.erfmann/WhatsApp-Chat-Exporter
1
0
Fork 0
mirror of https://github.com/KnugiHK/WhatsApp-Chat-Exporter.git synced 2026-06-03 14:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
KnugiHK
2023-10-29 18:05:45 +08:00
parent 86ea938323
commit 150180fdff
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Whatsapp_Chat_Exporter/extract.py
View File

@@ -192,7 +192,7 @@ def messages(db, data, media_folder):
messages.key_id, messages.key_id,
messages_quotes.data as quoted_data, messages_quotes.data as quoted_data,
messages.media_caption, messages.media_caption,
missed_call_logs.video_call, missed_call_logs.video_call,
chat.subject as chat_subject, chat.subject as chat_subject,
message_system.action_type, message_system.action_type,
message_system_group.is_me_joined, message_system_group.is_me_joined,
@@ -406,8 +406,7 @@ def messages(db, data, media_folder):
message.data = None message.data = None
else: else:
# Real message # Real message
if content["media_wa_type"] == 20: # Sticker is a message message.sticker = content["media_wa_type"] == 20 # Sticker is a message
message.sticker = True
if content["key_from_me"] == 1: if content["key_from_me"] == 1:
if content["status"] == 5 and content["edit_version"] == 7 or table_message and content["media_wa_type"] == 15: if content["status"] == 5 and content["edit_version"] == 7 or table_message and content["media_wa_type"] == 15:
msg = "Message deleted" msg = "Message deleted"
@@ -488,13 +487,13 @@ def media(db, data, media_folder):
file_hash, file_hash,
thumbnail thumbnail
FROM message_media FROM message_media
INNER JOIN message INNER JOIN message
ON message_media.message_row_id = message._id ON message_media.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
ON jid._id = chat.jid_row_id ON jid._id = chat.jid_row_id
LEFT JOIN media_hash_thumbnail LEFT JOIN media_hash_thumbnail
ON message_media.file_hash = media_hash_thumbnail.media_hash ON message_media.file_hash = media_hash_thumbnail.media_hash
WHERE jid.type <> 7 WHERE jid.type <> 7
ORDER BY jid.raw_string ASC""" ORDER BY jid.raw_string ASC"""