cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Set default XMPP message type to 'chat'.

Browse source 
This enables sending messages to partychat-like services (e.g. im.partych.at).
This commit also fixes handling of 'to' argument for non-chatroom recipients.
This commit is contained in:
Lukasz Kawczynski 2013-07-24 21:28:21 +01:00
parent 2da5dc7886
commit adbeffb714
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
notification/jabber
View file

@ -100,7 +100,10 @@ def main():
server = jid.getDomain() server = jid.getDomain()
port = module.params['port'] port = module.params['port']
password = module.params['password'] password = module.params['password']
to, nick = re.split( r'/', module.params['to']) try:
to, nick = module.params['to'].split('/', 1)
except ValueError:
to, nick = module.params['to'], None
if module.params['host']: if module.params['host']:
host = module.params['host'] host = module.params['host']
@ -125,6 +128,8 @@ def main():
msg.setTag('x', namespace='http://jabber.org/protocol/muc#user') msg.setTag('x', namespace='http://jabber.org/protocol/muc#user')
conn.send(xmpp.Presence(to=module.params['to'])) conn.send(xmpp.Presence(to=module.params['to']))
time.sleep(1) time.sleep(1)
else:
msg.setType('chat')
msg.setTo(to) msg.setTo(to)
if not module.check_mode: if not module.check_mode: