mirror of
https://github.com/KnugiHK/WhatsApp-Chat-Exporter.git
synced 2026-04-23 06:21:37 +00:00
Distinguish between regular video and GIF (#103)
This commit is contained in:
@@ -360,7 +360,8 @@ def messages(db, data, media_folder, timezone_offset, filter_date, filter_chat,
|
|||||||
timestamp=content["timestamp"],
|
timestamp=content["timestamp"],
|
||||||
time=content["timestamp"],
|
time=content["timestamp"],
|
||||||
key_id=content["key_id"],
|
key_id=content["key_id"],
|
||||||
timezone_offset=timezone_offset if timezone_offset else CURRENT_TZ_OFFSET
|
timezone_offset=timezone_offset if timezone_offset else CURRENT_TZ_OFFSET,
|
||||||
|
message_type=content["media_wa_type"]
|
||||||
)
|
)
|
||||||
if isinstance(content["data"], bytes):
|
if isinstance(content["data"], bytes):
|
||||||
message.data = ("The message is binary data and its base64 is "
|
message.data = ("The message is binary data and its base64 is "
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ class ChatStore():
|
|||||||
|
|
||||||
|
|
||||||
class Message():
|
class Message():
|
||||||
def __init__(self, from_me: Union[bool,int], timestamp: int, time: Union[int,float,str], key_id: int, timezone_offset: int = 0):
|
def __init__(self, from_me: Union[bool,int], timestamp: int, time: Union[int,float,str], key_id: int, timezone_offset: int = 0, message_type: int = None):
|
||||||
self.from_me = bool(from_me)
|
self.from_me = bool(from_me)
|
||||||
self.timestamp = timestamp / 1000 if timestamp > 9999999999 else timestamp
|
self.timestamp = timestamp / 1000 if timestamp > 9999999999 else timestamp
|
||||||
if isinstance(time, int) or isinstance(time, float):
|
if isinstance(time, int) or isinstance(time, float):
|
||||||
@@ -81,6 +81,7 @@ class Message():
|
|||||||
self.sender = None
|
self.sender = None
|
||||||
self.safe = False
|
self.safe = False
|
||||||
self.mime = None
|
self.mime = None
|
||||||
|
self.message_type = message_type
|
||||||
# Extra
|
# Extra
|
||||||
self.reply = None
|
self.reply = None
|
||||||
self.quoted_data = None
|
self.quoted_data = None
|
||||||
|
|||||||
@@ -150,7 +150,8 @@ def messages(db, data, media_folder, timezone_offset, filter_date, filter_chat,
|
|||||||
timestamp=ts,
|
timestamp=ts,
|
||||||
time=ts, # TODO: Could be bug
|
time=ts, # TODO: Could be bug
|
||||||
key_id=content["ZSTANZAID"][:17],
|
key_id=content["ZSTANZAID"][:17],
|
||||||
timezone_offset=timezone_offset if timezone_offset else CURRENT_TZ_OFFSET
|
timezone_offset=timezone_offset if timezone_offset else CURRENT_TZ_OFFSET,
|
||||||
|
message_type=content["ZMESSAGETYPE"]
|
||||||
)
|
)
|
||||||
invalid = False
|
invalid = False
|
||||||
if is_group_message and content["ZISFROMME"] == 0:
|
if is_group_message and content["ZISFROMME"] == 0:
|
||||||
|
|||||||
@@ -155,7 +155,7 @@
|
|||||||
<source src="{{ msg.data }}" />
|
<source src="{{ msg.data }}" />
|
||||||
</audio>
|
</audio>
|
||||||
{% elif "video/" in msg.mime %}
|
{% elif "video/" in msg.mime %}
|
||||||
<video class="lazy" controls autobuffer>
|
<video class="lazy" autobuffer {% if msg.message_type|int == 13 or msg.message_type|int == 11 %}autoplay muted loop playsinline{%else%}controls{% endif %}>
|
||||||
<source type="{{ msg.mime }}" data-src="{{ msg.data }}" />
|
<source type="{{ msg.mime }}" data-src="{{ msg.data }}" />
|
||||||
</video>
|
</video>
|
||||||
{% elif "/" in msg.mime %}
|
{% elif "/" in msg.mime %}
|
||||||
@@ -245,7 +245,7 @@
|
|||||||
<source src="{{ msg.data }}" />
|
<source src="{{ msg.data }}" />
|
||||||
</audio>
|
</audio>
|
||||||
{% elif "video/" in msg.mime %}
|
{% elif "video/" in msg.mime %}
|
||||||
<video class="lazy" controls autobuffer>
|
<video class="lazy" autobuffer {% if msg.message_type|int == 13 or msg.message_type|int == 11 %}autoplay muted loop playsinline{%else%}controls{% endif %}>
|
||||||
<source type="{{ msg.mime }}" data-src="{{ msg.data }}" />
|
<source type="{{ msg.mime }}" data-src="{{ msg.data }}" />
|
||||||
</video>
|
</video>
|
||||||
{% elif "/" in msg.mime %}
|
{% elif "/" in msg.mime %}
|
||||||
|
|||||||
Reference in New Issue
Block a user