In normal conversations: Send composing and active chat states

and display the state of the remote contact

1 files changed, 56 insertions, 9 deletions

diff --git a/src/core.py b/src/core.py
index 88f3fd07..d0714c39 100644
--- a/src/core.py
+++ b/src/core.py
@@ -170,7 +170,11 @@ class Core(object):
         self.xmpp.add_event_handler("changed_status", self.on_presence)
         self.xmpp.add_event_handler("changed_subscription", self.on_changed_subscription)
         self.xmpp.add_event_handler("message_xform", self.on_data_form)
-
+        self.xmpp.add_event_handler("chatstate_active", self.on_chatstate_active)
+        self.xmpp.add_event_handler("chatstate_composing", self.on_chatstate_composing)
+        self.xmpp.add_event_handler("chatstate_paused", self.on_chatstate_paused)
+        self.xmpp.add_event_handler("chatstate_gone", self.on_chatstate_gone)
+        self.xmpp.add_event_handler("chatstate_inactive", self.on_chatstate_inactive)
         self.information(_('Welcome to poezio!'))
         self.refresh_window()
 
@@ -214,6 +218,32 @@ class Core(object):
         """
         self.information('%s' % messsage)
 
+    def on_chatstate_active(self, message):
+        if message['type'] == 'chat': # normal conversation
+            self.on_chatstate_normal_conversation("active")
+
+    def on_chatstate_inactive(self, message):
+        if message['type'] == 'chat': # normal conversation
+            self.on_chatstate_normal_conversation("inactive")
+
+    def on_chatstate_composing(self, message):
+        if message['type'] == 'chat':
+            self.on_chatstate_normal_conversation("composing")
+
+    def on_chatstate_paused(self, message):
+        if message['type'] == 'chat':
+            self.on_chatstate_normal_conversation("paused")
+
+    def on_chatstate_gone(self, message):
+        if message['type'] == 'chat':
+            self.on_chatstate_normal_conversation("gone")
+
+    def on_chatstate_normal_conversation(self, state):
+        tab = self.get_tab_of_conversation_with_jid(message['from'], False)
+        if not tab:
+            return
+        tab.chatstate = state
+
     def open_new_form(self, form, on_cancel, on_send, **kwargs):
         """
         Open a new tab containing the form
@@ -577,27 +607,44 @@ class Core(object):
             if tab.get_name() == tab_name:
                 self.command_win('%s' % (tab.nb,))
 
-    def on_normal_message(self, message):
+    def get_tab_of_conversation_with_jid(self, jid, create=True):
         """
-        When receiving "normal" messages (from someone in our roster)
+        From a JID, get the tab containing the conversation with it.
+        If none already exist, and create is "True", we create it
+        and return it. Otherwise, we return None
         """
-        jid = message['from']
-        body = message['body']
-        if not body:
-            return
         # We first check if we have a conversation opened with this precise resource
         conversation = self.get_tab_by_name(jid.full, tabs.ConversationTab)
         if not conversation:
             # If not, we search for a conversation with the bare jid
             conversation = self.get_tab_by_name(jid.bare, tabs.ConversationTab)
             if not conversation:
-                # We create the conversation with the bare Jid if nothing was found
-                conversation = self.open_conversation_window(jid.bare, False)
+                if create:
+                    # We create the conversation with the bare Jid if nothing was found
+                    conversation = self.open_conversation_window(jid.bare, False)
+                else:
+                    conversation = None
+        return conversation
+
+    def on_normal_message(self, message):
+        """
+        When receiving "normal" messages (from someone in our roster)
+        """
+        jid = message['from']
+        body = message['body']
+        if not body:
+            return
+        conversation = self.get_tab_of_conversation_with_jid(jid, create=True)
         if roster.get_contact_by_jid(jid.bare):
             remote_nick = roster.get_contact_by_jid(jid.bare).get_name() or jid.user
         else:
             remote_nick = jid.user
         conversation.get_room().add_message(body, None, remote_nick, False, theme.COLOR_REMOTE_USER)
+        if conversation.remote_wants_chatstates is None:
+            if message['chat_state']:
+                conversation.remote_wants_chatstates = True
+            else:
+                conversation.remote_wants_chatstates = False
         logger.log_message(jid.bare, remote_nick, body)
         if self.current_tab() is not conversation:
             conversation.set_color_state(theme.COLOR_TAB_PRIVATE)