From f659a8c17111c99bf4a01802afc235209fdeac40 Mon Sep 17 00:00:00 2001
From: KnugiHK <24708955+KnugiHK@users.noreply.github.com>
Date: Thu, 7 Dec 2023 23:17:50 +0800
Subject: [PATCH] Make sure all messages are extracted chronologically #64

---
 Whatsapp_Chat_Exporter/extract.py        | 3 ++-
 Whatsapp_Chat_Exporter/extract_iphone.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Whatsapp_Chat_Exporter/extract.py b/Whatsapp_Chat_Exporter/extract.py
index 3520c5d..8f0ff6b 100644
--- a/Whatsapp_Chat_Exporter/extract.py
+++ b/Whatsapp_Chat_Exporter/extract.py
@@ -226,7 +226,8 @@ def messages(db, data, media_folder, timezone_offset):
                         LEFT JOIN receipt_user
                             ON receipt_user.message_row_id = messages._id
                     WHERE messages.key_remote_jid <> '-1'
-                    GROUP BY message._id;"""
+                    GROUP BY message._id
+                    ORDER BY timestamp ASC;"""
         )
     except sqlite3.OperationalError:
         try:
diff --git a/Whatsapp_Chat_Exporter/extract_iphone.py b/Whatsapp_Chat_Exporter/extract_iphone.py
index a71e7fb..97cb2ca 100644
--- a/Whatsapp_Chat_Exporter/extract_iphone.py
+++ b/Whatsapp_Chat_Exporter/extract_iphone.py
@@ -85,7 +85,8 @@ def messages(db, data, media_folder, timezone_offset):
 					LEFT JOIN ZWAMEDIAITEM
 						ON ZWAMESSAGE.Z_PK = ZWAMEDIAITEM.ZMESSAGE
                     INNER JOIN ZWACHATSESSION
-                        ON ZWAMESSAGE.ZCHATSESSION = ZWACHATSESSION.Z_PK;""")
+                        ON ZWAMESSAGE.ZCHATSESSION = ZWACHATSESSION.Z_PK
+                 ORDER BY ZMESSAGEDATE ASC;""")
     i = 0
     content = c.fetchone()
     while content is not None: