diff --git a/src/jcl/jabber/component.py b/src/jcl/jabber/component.py index 06a5b75..a71c2bc 100644 --- a/src/jcl/jabber/component.py +++ b/src/jcl/jabber/component.py @@ -535,17 +535,6 @@ class JCLComponent(Component, object): """Handle subscribed presence from user """ self.__logger.debug("PRESENCE_SUBSCRIBED") - name = stanza.get_to().node - from_jid = stanza.get_from() - base_from_jid = unicode(from_jid.bare()) -# accounts = self.account_class.select(\ -# self.account_class.q.user_jid == base_from_jid -# and self.account_class.q.name == name) -# if accounts.count() >= 1: -# _account = list(accounts)[0] -# self._send_presence_available(_account, "show", lang_class) - # TODO : send presence available to subscribed user - # is it necessary to send available presence ? return 1 def handle_presence_unsubscribe(self, stanza): diff --git a/tests/jcl/jabber/test_component.py b/tests/jcl/jabber/test_component.py index 23689bb..75df31e 100644 --- a/tests/jcl/jabber/test_component.py +++ b/tests/jcl/jabber/test_component.py @@ -1421,7 +1421,13 @@ class JCLComponent_TestCase(unittest.TestCase): presence_sent = self.comp.stream.sent self.assertEqual(len(presence_sent), 0) - def test_handle_presence_unsubscribe(self): + def test_handle_presence_subscribed(self): + self.comp.stream = MockStream() + self.comp.stream_class = MockStream + self.comp.handle_presence_subscribed(None) + self.assertEqual(len(self.comp.stream.sent), 0) + + def test_handle_presence_unsubscribe_to_account(self): self.comp.stream = MockStream() self.comp.stream_class = MockStream account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)