diff --git a/Whatsapp_Chat_Exporter/data_model.py b/Whatsapp_Chat_Exporter/data_model.py index 5859dc5..13b7cac 100644 --- a/Whatsapp_Chat_Exporter/data_model.py +++ b/Whatsapp_Chat_Exporter/data_model.py @@ -62,6 +62,7 @@ class Message(): self.quoted_data = None self.caption = None self.thumb = None # Android specific + self.sticker = None def to_json(self): return { diff --git a/Whatsapp_Chat_Exporter/extract.py b/Whatsapp_Chat_Exporter/extract.py index 8d1ea58..4741240 100644 --- a/Whatsapp_Chat_Exporter/extract.py +++ b/Whatsapp_Chat_Exporter/extract.py @@ -351,6 +351,8 @@ def messages(db, data, media_folder): invalid = True else: + if content["media_wa_type"] == 20: # Sticker + message.sticker = True if content["key_from_me"] == 1: if content["status"] == 5 and content["edit_version"] == 7 or table_message and content["message_type"] == 15: msg = "Message deleted" diff --git a/Whatsapp_Chat_Exporter/extract_iphone.py b/Whatsapp_Chat_Exporter/extract_iphone.py index 917acb8..9d24aff 100644 --- a/Whatsapp_Chat_Exporter/extract_iphone.py +++ b/Whatsapp_Chat_Exporter/extract_iphone.py @@ -129,6 +129,8 @@ def messages(db, data, media_folder): quoted = content["ZMETADATA"][2:19] message.reply = quoted.decode() message.quoted_data = None # TODO + if content["ZMESSAGETYPE"] == 15: # Sticker + message.sticker = True if content["ZISFROMME"] == 1: if content["ZMESSAGETYPE"] == 14: diff --git a/Whatsapp_Chat_Exporter/whatsapp.html b/Whatsapp_Chat_Exporter/whatsapp.html index 7ddf58c..7ca65db 100644 --- a/Whatsapp_Chat_Exporter/whatsapp.html +++ b/Whatsapp_Chat_Exporter/whatsapp.html @@ -82,6 +82,10 @@ .blue { color: #70777a; } + .sticker { + max-width: 100px !important; + max-height: 100px !important; + }
@@ -128,7 +132,9 @@ {{ msg.data | sanitize_except() }} {% else %} {% if "image/" in msg.mime %} -