Changeset b09ce17

Timestamp:

2015-05-21T03:43:06Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

433c90b

Parents:

2b4402f

Message:

Improvements: presence and minimal group support.

Presence depends on ​https://github.com/tgalal/yowsup/pull/796. :-(

Files:

• protocols/rpc/rpc.c (modified) (1 diff)
• python/implugin.py (modified) (1 diff)
• python/wa.py (modified) (11 diffs)

protocols/rpc/rpc.c

@@ -714 +714 @@
         { "imcb_rename_buddy", imcb_rename_buddy, rpc_imcb_add_buddy, "ss" },
         { "imcb_buddy_nick_hint", imcb_buddy_nick_hint, rpc_imcb_add_buddy, "ss" },
-        { "imcb_buddy_status", imcb_buddy_status, rpc_imcb_buddy_status, "snss" },
+        { "imcb_buddy_status", imcb_buddy_status, rpc_imcb_buddy_status, "siss" },
         { "imcb_buddy_status_msg", imcb_buddy_status_msg, rpc_imcb_add_buddy, "ss" },
         { "imcb_buddy_times", imcb_buddy_times, rpc_imcb_buddy_times, "sii" },

python/implugin.py

@@ -107 +107 @@
         
         def setting(self, key):
+                """Throws KeyError if the setting does not exist!"""
                 return self._settings_values[key]
 

python/wa.py

@@ -62 +62 @@
         def receive(self, entity):
                 print "Received: %r" % entity
-                print entity
+                #print entity
                 super(BitlBeeLayer, self).receive(entity)
 
@@ -68 +68 @@
                 """Send an entity into Yowsup, but through the correct thread."""
                 print "Queueing: %s" % entity.getTag()
-                print entity
+                #print entity
                 def doit():
                         self.toLower(entity)
@@ -79 +79 @@
                 self.b.yow = self
                 self.cb.connected()
-                self.toLower(AvailablePresenceProtocolEntity())
+                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.
         
         @ProtocolEntityCallback("failure")
@@ -89 +94 @@
 
         def onEvent(self, event):
-                print event
+                print "Received event: %s name %s" % (event, event.getName())
                 if event.getName() == "disconnect":
                         self.getStack().execDetached(self.daemon.StopDaemon)
@@ -96 +101 @@
         def onPresence(self, pres):
                 status = 8 # MOBILE
-                online = isinstance(pres, AvailablePresenceProtocolEntity)
-                if online:
-                        status += 1 # ONLINE
-                imcb_buddy_status(pres.getFrom(), status, None, None)
+                if pres.getType() != "unavailable":
+                        status |= 1 # ONLINE
+                self.cb.buddy_status(pres.getFrom(), status, None, None)
         
         @ProtocolEntityCallback("message")
         def onMessage(self, msg):
-                self.cb.buddy_msg(msg.getFrom(), msg.getBody(), 0, msg.getTimestamp())
-
                 receipt = OutgoingReceiptProtocolEntity(msg.getId(), msg.getFrom())
                 self.toLower(receipt)
+
+                if msg.getParticipant():
+                        group = self.b.groups.get(msg.getFrom(), None)
+                        if not group:
+                                self.cb.log("Warning: Activity in room %s" % msg.getFrom())
+                                return
+                        self.cb.chat_msg(group["id"], msg.getParticipant(), msg.getBody(), 0, msg.getTimestamp())
+                else:
+                        self.cb.buddy_msg(msg.getFrom(), msg.getBody(), 0, msg.getTimestamp())
 
         @ProtocolEntityCallback("receipt")
@@ -141 +152 @@
                 print "New status for %s: %s" % (status.getFrom(), status.status)
 
-        @ProtocolEntityCallback("chatstate")
-        def onChatstate(self, entity):
-                print(entity)
+        #@ProtocolEntityCallback("chatstate")
+        #def onChatstate(self, entity):
+        #       print(entity)
 
 
@@ -176 +187 @@
                 },
         }
-        AWAY_STATES = ["Available"]
+        AWAY_STATES = ["Away"]
         ACCOUNT_FLAGS = 14 # HANDLE_DOMAINS + STATUS_MESSAGE + LOCAL_CONTACTS
         # TODO: LOCAL LIST CAUSES CRASH!
@@ -192 +203 @@
                 self.logging_in = True
                 self.contacts = set()
+                self.groups = {}
+                self.groups_by_id = {}
 
         def keepalive(self):
-                self.yow.Ship(PingIqProtocolEntity(to="s.whatsapp.net"))
+                # Too noisy while debugging
+                pass
+                #self.yow.Ship(PingIqProtocolEntity(to="s.whatsapp.net"))
 
         def logout(self):
@@ -216 +231 @@
                 self.yow.Ship(UnsubscribePresenceProtocolEntity(handle))
 
-        def set_away(self, _state, status):
+        def set_away(self, state, status):
                 # When our first status is set, we've finalised login.
                 # Which means sync the full contact list now.
@@ -223 +238 @@
                         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))
+                print "Trying to set status to %r, %r" % (state, status)
+                if state:
+                        # Only one option offered so None = available, not None = away.
+                        self.yow.Ship(AvailablePresenceProtocolEntity())
+                else:
+                        self.yow.Ship(UnavailablePresenceProtocolEntity())
+                if status:
+                        self.yow.Ship(SetStatusIqProtocolEntity(status))
 
         def send_initial_contacts(self):
@@ -236 +256 @@
                 self.yow.Ship(PresenceProtocolEntity(name=value))
 
+        def chat_join(self, id, name, _nick, _password, settings):
+                print "New chat created with id: %d" % id
+                self.groups[name] = {"id": id, "name": name}
+                self.groups_by_id[id] = self.groups[name]
+                self.bee.chat_add_buddy(id, self.account["user"])
+        
+        def chat_msg(self, id, text, flags):
+                msg = TextMessageProtocolEntity(text, to=self.groups_by_id[id]["name"])
+                self.yow.Ship(msg)
+
         def build_stack(self, account):
+                self.account = account
                 creds = (account["user"].split("@")[0], account["pass"])