Changeset 2b4402f

Timestamp:

2015-05-20T12:56:47Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

b09ce17

Parents:

5f8ad281

Message:

Fixed bugs by not doing things according to the docs but according to the
example implementation.

Contact list handling works better now. It figures out which contacts are
valid and which ones are not, etc. Also, status/presence is starting to
work though for some reason yowsup is not giving me the incoming presence
stanzas. Yeah no idea why. \o/

File:

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

python/wa.py

@@ -3 +3 @@
 import logging
 import threading
+import time
 
 import yowsup
@@ -21 +22 @@
 from yowsup.layers.network                     import YowNetworkLayer
 from yowsup.layers.coder                       import YowCoderLayer
-from yowsup.stacks import YowStack
+from yowsup.stacks import YowStack, YowStackBuilder
 from yowsup.common import YowConstants
 from yowsup.layers import YowLayerEvent
@@ -60 +61 @@
 
         def receive(self, entity):
-                print "Received: %s" % entity.getTag()
+                print "Received: %r" % entity
                 print entity
                 super(BitlBeeLayer, self).receive(entity)
@@ -94 +95 @@
         @ProtocolEntityCallback("presence")
         def onPresence(self, pres):
-                print pres
+                status = 8 # MOBILE
+                online = isinstance(pres, AvailablePresenceProtocolEntity)
+                if online:
+                        status += 1 # ONLINE
+                imcb_buddy_status(pres.getFrom(), status, None, None)
         
         @ProtocolEntityCallback("message")
@@ -110 +115 @@
                 self.toLower(ack)
 
+        @ProtocolEntityCallback("iq")
+        def onIq(self, entity):
+                if isinstance(entity, ResultSyncIqProtocolEntity):
+                        return self.onSyncResult(entity)
+        
+        def onSyncResult(self, entity):
+                # TODO HERE AND ELSEWHERE: Threat idiocy happens when going
+                # from here to the IMPlugin. Check how bjsonrpc lets me solve that.
+                ok = set(num.lstrip("+") for num in entity.inNumbers)
+                for handle in self.b.contacts:
+                        if handle.split("@")[0] in ok:
+                                self.toLower(SubscribePresenceProtocolEntity(handle))
+                                self.cb.add_buddy(handle, "")
+                if entity.outNumbers:
+                        self.cb.error("Not on WhatsApp: %s" % ", ".join(entity.outNumbers))
+                if entity.invalidNumbers:
+                        self.cb.error("Invalid numbers: %s" % ", ".join(entity.invalidNumbers))
+
+        @ProtocolEntityCallback("notification")
+        def onNotification(self, ent):
+                if isinstance(ent, StatusNotificationProtocolEntity):
+                        return self.onStatusNotification(ent)
+        
+        def onStatusNotification(self, status):
+                print "New status for %s: %s" % (status.getFrom(), status.status)
+
         @ProtocolEntityCallback("chatstate")
         def onChatstate(self, entity):
@@ -133 +164 @@
                 # of their event loop :-(
                 raise YowsupDaemon.Terminate
+
 
 class YowsupIMPlugin(implugin.BitlBeeIMPlugin):
@@ -158 +190 @@
                 self.bee.log("Started yowsup thread")
                 
+                self.logging_in = True
                 self.contacts = set()
 
@@ -172 +205 @@
 
         def add_buddy(self, handle, _group):
-                self.yow.Ship(SubscribePresenceProtocolEntity(handle))
-                # Need to confirm additions. See if this can be done based on server ACKs.
-                self.bee.add_buddy(handle, "")
+                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))
 
         def remove_buddy(self, handle, _group):
@@ -180 +217 @@
 
         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()
+                
                 # I think state is not supported?
                 print "Trying to set status to %r, %r" % (_state, 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):
-                self.yow.Ship(PresenceProtocolEntity(value))
+                self.yow.Ship(PresenceProtocolEntity(name=value))
 
         def build_stack(self, account):
-                layers = (
-                        BitlBeeLayer,
-                        
-                        (
-                         YowAckProtocolLayer,
-                         YowAuthenticationProtocolLayer,
-                         YowIbProtocolLayer,
-                         YowIqProtocolLayer,
-                         YowMessagesProtocolLayer,
-                         YowNotificationsProtocolLayer,
-                         YowPresenceProtocolLayer,
-                         YowReceiptProtocolLayer,
-                        )
-
-                ) + YOWSUP_CORE_LAYERS
-                
                 creds = (account["user"].split("@")[0], account["pass"])
 
-                stack = YowStack(layers)
+                stack = (YowStackBuilder()
+                         .pushDefaultLayers(False)
+                         .push(BitlBeeLayer)
+                         .build())
                 stack.setProp(YowAuthenticationProtocolLayer.PROP_CREDENTIALS, creds)
                 stack.setProp(YowNetworkLayer.PROP_ENDPOINT, YowConstants.ENDPOINTS[0])