From ee473bc844f9ce7137955337564f7bb4374ce933 Mon Sep 17 00:00:00 2001 From: cressidacressida <74683527+cressidacressida@users.noreply.github.com> Date: Fri, 20 Nov 2020 23:41:36 +0100 Subject: [PATCH 1/3] Bringing out "quotedStanzaID" and "isForwarded" message properties to new "quoting" and "forwarded" Message attributes respectively. --- webwhatsapi/objects/message.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/webwhatsapi/objects/message.py b/webwhatsapi/objects/message.py index e7a72927..70b0e412 100755 --- a/webwhatsapi/objects/message.py +++ b/webwhatsapi/objects/message.py @@ -65,6 +65,16 @@ def __init__(self, js_obj, driver=None): self.content = "" self.safe_content = "..." + if js_obj["quotedStanzaID"]: + self.quoting = js_obj["quotedStanzaID"] + else: + self.quoting = "" + + if js_obj["isForwarded"]: + self.forwarded = js_obj["isForwarded"] + else: + self.forwarded = False + def __repr__(self): return "".format( type=self.type, From fc0b0b8842169decf55459f5dc3144c18df8d37d Mon Sep 17 00:00:00 2001 From: cressidacressida <74683527+cressidacressida@users.noreply.github.com> Date: Fri, 20 Nov 2020 23:49:30 +0100 Subject: [PATCH 2/3] Added a "readable" attribute to the NotificationMessage class, containing the verbose notification description already used by __repr__. --- webwhatsapi/objects/message.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/webwhatsapi/objects/message.py b/webwhatsapi/objects/message.py index 70b0e412..c7e0dbf8 100755 --- a/webwhatsapi/objects/message.py +++ b/webwhatsapi/objects/message.py @@ -184,13 +184,6 @@ def __repr__(self): class NotificationMessage(Message): def __init__(self, js_obj, driver=None): - super(NotificationMessage, self).__init__(js_obj, driver) - self.type = js_obj["type"] - self.subtype = js_obj["subtype"] - if js_obj["recipients"]: - self.recipients = [getContacts(x, driver) for x in js_obj["recipients"]] - - def __repr__(self): readable = { "call_log": {"miss": "Missed Call"}, "e2e_notification": {"encrypt": "Messages now Encrypted"}, @@ -202,13 +195,21 @@ def __repr__(self): "leave": "Left the group", }, } + super(NotificationMessage, self).__init__(js_obj, driver) + self.type = js_obj["type"] + self.subtype = js_obj["subtype"] + self.readable = readable[self.type][self.subtype] + if js_obj["recipients"]: + self.recipients = [getContacts(x, driver) for x in js_obj["recipients"]] + + def __repr__(self): sender = ( "" if not self.sender else ("from " + str(safe_str(self.sender.get_safe_name()))) ) return "".format( - type=readable[self.type][self.subtype], + type=self.readable, sender=sender, timestamp=self.timestamp, recip="" From 5451dd729d212074b031bfda877dbff00b892533 Mon Sep 17 00:00:00 2001 From: cressidacressida <74683527+cressidacressida@users.noreply.github.com> Date: Mon, 23 Nov 2020 12:07:13 +0100 Subject: [PATCH 3/3] Added readable description for missed video call notification --- webwhatsapi/objects/message.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webwhatsapi/objects/message.py b/webwhatsapi/objects/message.py index c7e0dbf8..dbd7899b 100755 --- a/webwhatsapi/objects/message.py +++ b/webwhatsapi/objects/message.py @@ -185,7 +185,10 @@ def __repr__(self): class NotificationMessage(Message): def __init__(self, js_obj, driver=None): readable = { - "call_log": {"miss": "Missed Call"}, + "call_log": { + "miss": "Missed Call", + "miss_video": "Missed Video Call", + }, "e2e_notification": {"encrypt": "Messages now Encrypted"}, "gp2": { "invite": "Joined an invite link",