david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HelpMessageHandler filter corrections

Browse Source 
darcs-hash:20080520062733-86b55-8c84151b75f97df4df86055f148841753ba18708.gz
This commit is contained in:
David Rousselie
2008-05-20 08:27:33 +02:00
parent 3d286c3efe
commit c9f1f19aec
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/jcl/jabber/disco.py
View File

@@ -93,7 +93,7 @@ class RootDiscoGetItemsHandler(DiscoHandler):
def __init__(self, component): def __init__(self, component):
DiscoHandler.__init__(self, component) DiscoHandler.__init__(self, component)
self.__logger = logging.getLogger("jcl.jabber.RootDiscoGetItemsHandler") self.__logger = logging.getLogger("jcl.jabber.RootDiscoGetItemsHandler")
def handle(self, stanza, lang_class, node, disco_obj, data): def handle(self, stanza, lang_class, node, disco_obj, data):
"""Discovery get_items on root node""" """Discovery get_items on root node"""
from_jid = stanza.get_from() from_jid = stanza.get_from()
@@ -127,7 +127,7 @@ class AccountTypeDiscoGetItemsHandler(DiscoHandler):
def __init__(self, component): def __init__(self, component):
DiscoHandler.__init__(self, component) DiscoHandler.__init__(self, component)
self.__logger = logging.getLogger("jcl.jabber.AccountTypeDiscoGetItemsHandler") self.__logger = logging.getLogger("jcl.jabber.AccountTypeDiscoGetItemsHandler")
def handle(self, stanza, lang_class, node, disco_obj, data): def handle(self, stanza, lang_class, node, disco_obj, data):
"""Discovery get_items on an account type node""" """Discovery get_items on an account type node"""
account_type = data account_type = data

9
src/jcl/jabber/message.py
View File

@@ -72,8 +72,13 @@ class HelpMessageHandler(Handler):
""" """
Test if stanza body match the help regexp. Test if stanza body match the help regexp.
""" """
return self.help_regexp.search(stanza.get_body()) \ body = stanza.get_body()
or self.help_regexp.search(stanza.get_subject()) subject = stanza.get_subject()
if subject and self.help_regexp.search(subject):
return subject
if body and self.help_regexp.search(body):
return body
return None
def handle(self, stanza, lang_class, data): def handle(self, stanza, lang_class, data):
""" """