summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sleekxmpp/plugins/xep_0085/chat_states.py15
-rw-r--r--tests/test_stream_xep_0085.py59
2 files changed, 67 insertions, 7 deletions
diff --git a/sleekxmpp/plugins/xep_0085/chat_states.py b/sleekxmpp/plugins/xep_0085/chat_states.py
index a2feb531..4fb21ba0 100644
--- a/sleekxmpp/plugins/xep_0085/chat_states.py
+++ b/sleekxmpp/plugins/xep_0085/chat_states.py
@@ -14,7 +14,7 @@ from sleekxmpp.xmlstream.handler import Callback
from sleekxmpp.xmlstream.matcher import StanzaPath
from sleekxmpp.xmlstream import register_stanza_plugin, ElementBase, ET
from sleekxmpp.plugins.base import base_plugin
-from sleekxmpp.plugins.xep_0085 import stanza
+from sleekxmpp.plugins.xep_0085 import stanza, ChatState
log = logging.getLogger(__name__)
@@ -31,16 +31,17 @@ class xep_0085(base_plugin):
self.description = 'Chat State Notifications'
self.stanza = stanza
- self.xmpp.registerHandler(
- Callback('Chat States',
- StanzaPath('message/chat_state'),
- self._handle_chat_state))
+ for state in ChatState.states:
+ self.xmpp.register_handler(
+ Callback('Chat State: %s' % state,
+ StanzaPath('message@chat_state=%s' % state),
+ self._handle_chat_state))
- register_stanza_plugin(Message, stanza.ChatState)
+ register_stanza_plugin(Message, ChatState)
def post_init(self):
base_plugin.post_init(self)
- self.xmpp.plugin['xep_0030'].add_feature(stanza.ChatState.namepsace)
+ self.xmpp.plugin['xep_0030'].add_feature(ChatState.namespace)
def _handle_chat_state(self, msg):
state = msg['chat_state']
diff --git a/tests/test_stream_xep_0085.py b/tests/test_stream_xep_0085.py
new file mode 100644
index 00000000..2a814805
--- /dev/null
+++ b/tests/test_stream_xep_0085.py
@@ -0,0 +1,59 @@
+import threading
+import time
+
+from sleekxmpp.test import *
+
+
+class TestStreamChatStates(SleekTest):
+
+ def tearDown(self):
+ self.stream_close()
+
+ def testChatStates(self):
+ self.stream_start(mode='client', plugins=['xep_0030', 'xep_0085'])
+
+ results = []
+
+ def handle_state(msg):
+ results.append(msg['chat_state'])
+
+ self.xmpp.add_event_handler('chatstate_active', handle_state)
+ self.xmpp.add_event_handler('chatstate_inactive', handle_state)
+ self.xmpp.add_event_handler('chatstate_paused', handle_state)
+ self.xmpp.add_event_handler('chatstate_gone', handle_state)
+ self.xmpp.add_event_handler('chatstate_composing', handle_state)
+
+ self.recv("""
+ <message>
+ <active xmlns="http://jabber.org/protocol/chatstates" />
+ </message>
+ """)
+ self.recv("""
+ <message>
+ <inactive xmlns="http://jabber.org/protocol/chatstates" />
+ </message>
+ """)
+ self.recv("""
+ <message>
+ <paused xmlns="http://jabber.org/protocol/chatstates" />
+ </message>
+ """)
+ self.recv("""
+ <message>
+ <composing xmlns="http://jabber.org/protocol/chatstates" />
+ </message>
+ """)
+ self.recv("""
+ <message>
+ <gone xmlns="http://jabber.org/protocol/chatstates" />
+ </message>
+ """)
+
+ # Give event queue time to process
+ time.sleep(0.3)
+ expected = ['active', 'inactive', 'paused', 'composing', 'gone']
+ self.failUnless(results == expected,
+ "Chat state event not handled: %s" % results)
+
+
+suite = unittest.TestLoader().loadTestsFromTestCase(TestStreamChatStates)