From 672b85474e8155fddb9a18b8e94e481a6086f78d Mon Sep 17 00:00:00 2001
From: KnugiHK <24708955+KnugiHK@users.noreply.github.com>
Date: Mon, 19 Jun 2023 20:26:13 +0800
Subject: [PATCH] Bug fix on the wrong type of media_wa_type in old Android
 schema

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

diff --git a/Whatsapp_Chat_Exporter/data_model.py b/Whatsapp_Chat_Exporter/data_model.py
index 9d8b135..53d9bb6 100644
--- a/Whatsapp_Chat_Exporter/data_model.py
+++ b/Whatsapp_Chat_Exporter/data_model.py
@@ -71,7 +71,7 @@ class Message():
         self.quoted_data = None
         self.caption = None
         self.thumb = None # Android specific
-        self.sticker = None
+        self.sticker = False
     
     def to_json(self):
         return {
diff --git a/Whatsapp_Chat_Exporter/extract.py b/Whatsapp_Chat_Exporter/extract.py
index 4d66d14..ccf2f26 100644
--- a/Whatsapp_Chat_Exporter/extract.py
+++ b/Whatsapp_Chat_Exporter/extract.py
@@ -183,7 +183,7 @@ def messages(db, data, media_folder):
                             messages.edit_version,
                             messages.thumb_image,
                             messages.remote_resource,
-                            messages.media_wa_type,
+                            CAST(messages.media_wa_type as INTEGER) as media_wa_type,
                             messages.latitude,
                             messages.longitude,
                             messages_quotes.key_id as quoted,
@@ -378,7 +378,7 @@ def messages(db, data, media_folder):
                     msg = "Message deleted"
                     message.meta = True
                 else:
-                    if content["media_wa_type"] == "5":
+                    if content["media_wa_type"] == 5:
                         msg = f"Location shared: {content['latitude'], content['longitude']}"
                         message.meta = True
                     else:
@@ -393,7 +393,7 @@ def messages(db, data, media_folder):
                     msg = "Message deleted"
                     message.meta = True
                 else:
-                    if content["media_wa_type"] == "5":
+                    if content["media_wa_type"] == 5:
                         msg = f"Location shared: {content['latitude'], content['longitude']}"
                         message.meta = True
                     else: