Changeset a852b2b

Timestamp:

2015-05-25T05:30:26Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

f16c64d

Parents:

8c3637b

Message:

WA: Request contact list during login, only call the connected callback when
we're *really* done.

File:

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

python/wa.py

@@ -78 +78 @@
                 self.cb = self.b.bee
                 self.b.yow = self
-                self.cb.connected()
+                
+                self.cb.log("Authenticated, syncing contact list")
+                
+                # We're done once this set is empty.
+                self.todo = set(["contacts", "groups"])
+                
+                # Supposedly WA can also do national-style phone numbers without
+                # a + prefix BTW (relative to I guess the user's country?). I
+                # don't want to support this at least for now.
+                numbers = [("+" + x.split("@")[0]) for x in self.cb.get_local_contacts()]
+                self.toLower(GetSyncIqProtocolEntity(numbers))
                 self.toLower(ListGroupsIqProtocolEntity())
+                
                 try:
                         self.toLower(PresenceProtocolEntity(name=self.b.setting("name")))
                 except KeyError:
                         pass
-                # Should send the contact list now, but BitlBee hasn't given
-                # it yet. See set_away() and send_initial_contacts() below.
+
+        def check_connected(self, done):
+                if self.todo is None:
+                        return
+                self.todo.remove(done)
+                if not self.todo:
+                        self.todo = None
+                        self.cb.connected()
         
         @ProtocolEntityCallback("failure")
@@ -101 +118 @@
         @ProtocolEntityCallback("presence")
         def onPresence(self, pres):
+                if pres.getFrom() == self.b.account["user"]:
+                        # WA returns our own presence. Meh.
+                        return
+                
                 status = 8 # MOBILE
                 if pres.getType() != "unavailable":
                         status |= 1 # ONLINE
                 self.cb.buddy_status(pres.getFrom(), status, None, None)
+                
                 try:
                         # Last online time becomes idle time which I guess is
@@ -137 +159 @@
         def onIq(self, entity):
                 if isinstance(entity, ResultSyncIqProtocolEntity):
-                        print "XXX SYNC RESULT RECEIVED!"
                         return self.onSyncResult(entity)
                 elif isinstance(entity, ListParticipantsResultIqProtocolEntity):
@@ -147 +168 @@
                 # TODO HERE AND ELSEWHERE: Thread idiocy happens when going
                 # from here to the IMPlugin. Check how bjsonrpc lets me solve that.
-                # ALSO TODO: See why this one doesn't seem to be called for adds later.
-                ok = set(jid.lower() for jid in entity.inNumbers.values())
-                for handle in self.b.contacts:
-                        if handle.lower() in ok:
-                                self.toLower(SubscribePresenceProtocolEntity(handle))
-                                self.cb.add_buddy(handle, "")
+                for num, jid in entity.inNumbers.iteritems():
+                        self.toLower(SubscribePresenceProtocolEntity(jid))
+                        self.cb.add_buddy(jid, "")
                 if entity.outNumbers:
                         self.cb.error("Not on WhatsApp: %s" %
@@ -159 +177 @@
                         self.cb.error("Invalid numbers: %s" %
                                       ", ".join(entity.invalidNumbers.keys()))
+
+                self.check_connected("contacts")
 
         def onListGroupsResult(self, groups):
@@ -169 +189 @@
                         group["info"] = g
 
+                self.check_connected("groups")
+
         @ProtocolEntityCallback("notification")
         def onNotification(self, ent):
@@ -213 +235 @@
         SETTINGS = {
                 "cc": {
+                        # Country code. Seems to be required for registration only.
                         "type": "int",
                 },
@@ -233 +256 @@
                 self.bee.log("Started yowsup thread")
                 
-                self.logging_in = True
-                self.contacts = set()
                 self.groups = {}
                 self.groups_by_id = {}
@@ -252 +273 @@
 
         def add_buddy(self, handle, _group):
-                if self.logging_in:
-                        # Need to batch up the initial adds. This is a "little" ugly.
-                        self.contacts.add(handle)
-                else:
-                        self.yow.Ship(GetSyncIqProtocolEntity(
-                            ["+" + handle.split("@")[0]], mode=GetSyncIqProtocolEntity.MODE_DELTA))
-                        self.yow.Ship(SubscribePresenceProtocolEntity(handle))
+                self.yow.Ship(GetSyncIqProtocolEntity(
+                    ["+" + handle.split("@")[0]], mode=GetSyncIqProtocolEntity.MODE_DELTA))
 
         def remove_buddy(self, handle, _group):
@@ -264 +280 @@
 
         def set_away(self, state, status):
-                # When our first status is set, we've finalised login.
-                # Which means sync the full contact list now.
-                if self.logging_in:
-                        self.logging_in = False
-                        self.send_initial_contacts()
-                
                 print "Trying to set status to %r, %r" % (state, status)
                 if state:
@@ -278 +288 @@
                 if status:
                         self.yow.Ship(SetStatusIqProtocolEntity(status))
-
-        def send_initial_contacts(self):
-                if not self.contacts:
-                        return
-                numbers = [("+" + x.split("@")[0]) for x in self.contacts]
-                self.yow.Ship(GetSyncIqProtocolEntity(numbers))
 
         def set_set_name(self, _key, value):