Mercurial > xib

changeset 25:a9066c416533

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added an XMPP disconnect handler, fixed XMPP message handling. Signed-off-by: Charly COSTE <changaco@changaco.net>
author Charly COSTE <changaco@changaco.net>
date Fri, 21 Aug 2009 00:23:14 +0200
parents 4e1f27ea527b
children 1691ab4d131f
files bot.py
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/bot.py
+++ b/bot.py
@@ -91,6 +91,11 @@ class bot(Thread):
 				continue
 	
 	
+	def _xmpp_disconnect_handler(self, xmpp_c):
+		xmpp_c.reconnectAndReauth()
+		return
+	
+	
 	def _xmpp_presence_handler(self, dispatcher, presence):
 		"""[Internal] Manage XMPP presence."""
 		
@@ -221,8 +226,7 @@ class bot(Thread):
 								self.error('=> Debug: NoSuchParticipantException "'+resource+'", WTF ?', debug=True)
 							return
 						
-						if participant_.protocol == 'xmpp':
-							participant_.sayOnIRC(message.getBody())
+						participant_.sayOnIRC(message.getBody())
 		
 		else:
 			self.error('==> Debug: Received XMPP message of unknown type "'+message.getType()+'".', debug=True)
@@ -328,8 +332,7 @@ class bot(Thread):
 				# Chan message
 				if event.eventtype() == 'pubmsg':
 					if bridge.irc_room == event.target() and bridge.irc_server == connection.server:
-						if from_.protocol != 'xmpp':
-							from_.sayOnXMPP(event.arguments()[0])
+						from_.sayOnXMPP(event.arguments()[0])
 						return
 					else:
 						continue
@@ -430,6 +433,7 @@ class bot(Thread):
 		c.RegisterHandler('presence', self._xmpp_presence_handler)
 		c.RegisterHandler('iq', self._xmpp_iq_handler)
 		c.RegisterHandler('message', self._xmpp_message_handler)
+		c.DisconnectHandler = self._xmpp_disconnect_handler(c)
 		c.sendInitPresence()
 		c.lock.release()
 		return c