Changeset 31e2b09

Timestamp:

2015-06-23T00:15:19Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

9076a1c

Parents:

15c3a6b

Message:

Get participants list through local yowsup change, and add ping timeouts.

File:

• python/wa.py (modified) (6 diffs)

python/wa.py

@@ -199 +199 @@
                 if isinstance(entity, ResultSyncIqProtocolEntity):
                         return self.onSyncResult(entity)
-                elif isinstance(entity, ListParticipantsResultIqProtocolEntity):
-                        return self.b.chat_join_participants(entity)
                 elif isinstance(entity, ListGroupsResultIqProtocolEntity):
                         return self.onListGroupsResult(entity)
-                elif "ping" in self.todo: # Pong has no type, sigh.
-                        if "contacts" in self.todo:
-                                # Shitty Whatsapp rejected the sync request, and
-                                # annoying Yowsup doesn't inform on error responses.
-                                # So instead, if we received no response to it but
-                                # did get our ping back, declare failure.
-                                self.onSyncResultFail()
-                        if "groups" in self.todo:
-                                # Well fuck this. Just reject ALL the things!
-                                # Maybe I don't need this one then.
-                                self.check_connected("groups")
-                        self.check_connected("ping")
+                elif type(entity) == IqProtocolEntity:  # Pong has no type, sigh.
+                        self.b.last_pong = time.time()
+                        if self.todo:
+                                return self.onLoginPong()
         
         def onSyncResult(self, entity):
@@ -248 +238 @@
                                 jid += "@g.us"
                         group = self.b.groups[jid]
+                        try:
+                                group["participants"] = g.getParticipants().keys()
+                        except AttributeError:
+                                # Depends on a change I made to yowsup that may
+                                # or may not get merged..
+                                group["participants"] = []
                         
                         # Save it. We're going to mix ListGroups elements and
@@ -256 +252 @@
 
                 self.check_connected("groups")
+
+        def onLoginPong(self):
+                if "contacts" in self.todo:
+                        # Shitty Whatsapp rejected the sync request, and
+                        # annoying Yowsup doesn't inform on error responses.
+                        # So instead, if we received no response to it but
+                        # did get our ping back, declare failure.
+                        self.onSyncResultFail()
+                if "groups" in self.todo:
+                        # Well fuck this. Just reject ALL the things!
+                        # Maybe I don't need this one then.
+                        self.check_connected("groups")
+                self.check_connected("ping")
 
         def getStatuses(self, contacts):
@@ -328 +337 @@
         # TODO: HANDLE_DOMAIN in right place (add ... ... nick bug)
         PING_INTERVAL = 299 # seconds
+        PING_TIMEOUT = 360 # seconds
 
         def login(self, account):
@@ -340 +350 @@
 
                 self.next_ping = None
+                self.last_pong = time.time()
 
         def keepalive(self):
+                if (time.time() - self.last_pong) > self.PING_TIMEOUT:
+                        self.error("Ping timeout")
+                        self.logout(True)
+                        return
                 if self.next_ping and (time.time() < self.next_ping):
                         return
@@ -394 +409 @@
                 
                 # So for now do without a participant list..
-                #self.chat_join_participants(None)
+                self.chat_join_participants(group)
                 self.chat_send_backlog(group)
 
-        def chat_join_participants(self, entity):
-                """
-                group = self.groups[entity.getFrom()]
-                id = group["id"]
-                for p in entity.getParticipants():
+        def chat_join_participants(self, group):
+                for p in group.get("participants", []):
                         if p != self.account["user"]:
-                                self.bee.chat_add_buddy(id, p)
-                """
+                                self.bee.chat_add_buddy(group["id"], p)
 
         def chat_send_backlog(self, group):