Mercurial > xib

changeset 170:11717d14e22f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
created muc._send(), should have been done ages ago Signed-off-by: Charly COSTE <changaco@changaco.net>
author Charly COSTE <changaco@changaco.net>
date Sat, 30 Jan 2010 14:34:43 +0100
parents 271c35321497
children 489c157d9e82
files muc.py
diffstat 1 files changed, 10 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/muc.py
+++ b/muc.py
@@ -41,13 +41,17 @@ class muc:
 		self.callback = callback
 		self.xmpp_c.RegisterHandler('presence', self._xmpp_presence_handler)
 		s = xmpp.protocol.Presence(to=self.jid, status=self.status, payload=[xmpp.simplexml.Node(tag='x', attrs={'xmlns': 'http://jabber.org/protocol/muc'}, payload=[xmpp.simplexml.Node(tag='history', attrs={'maxchars': '0'})])])
+		self._send(s)
+	
+	
+	def _send(self, stanza):
 		try:
-			self.xmpp_c.send(s)
+			self.xmpp_c.send(stanza)
 		except IOError, xmpp.Conflict:
 			self.xmpp_c.reconnectAndReauth()
 			for m in self.xmpp_c.mucs:
 				m.rejoin()
-			self.xmpp_c.send(s)
+			self.xmpp_c.send(stanza)
 	
 	
 	def join(self, xmpp_c, nickname, status=None, callback=None):
@@ -109,13 +113,7 @@ class muc:
 		"""Say message in the room"""
 		self.xmpp_c.lock.acquire()
 		s = xmpp.protocol.Message(to=self.room_jid, typ='groupchat', body=message)
-		try:
-			self.xmpp_c.send(s)
-		except IOError, xmpp.Conflict:
-			self.xmpp_c.reconnectAndReauth()
-			for m in self.xmpp_c.mucs:
-				m.rejoin()
-			self.xmpp_c.send(s)
+		self._send(s)
 		self.xmpp_c.lock.release()
 	
 	
@@ -123,13 +121,7 @@ class muc:
 		"""Send a private message"""
 		self.xmpp_c.lock.acquire()
 		s = xmpp.protocol.Message(to=self.room_jid+'/'+to, typ='chat', body=message)
-		try:
-			self.xmpp_c.send(s)
-		except IOError, xmpp.Conflict:
-			self.xmpp_c.reconnectAndReauth()
-			for m in self.xmpp_c.mucs:
-				m.rejoin()
-			self.xmpp_c.send(s)
+		self._send(s)
 		self.xmpp_c.lock.release()
 	
 	
@@ -140,13 +132,7 @@ class muc:
 		self.xmpp_c.RegisterHandler('presence', self._xmpp_presence_handler)
 		self.xmpp_c.lock.acquire()
 		s = xmpp.protocol.Presence(to=self.jid, status=status)
-		try:
-			self.xmpp_c.send(s)
-		except IOError, xmpp.Conflict:
-			self.xmpp_c.reconnectAndReauth()
-			for m in self.xmpp_c.mucs:
-				m.rejoin()
-			self.xmpp_c.send(s)
+		self._send(s)
 		self.xmpp_c.lock.release()
 	
 	
@@ -154,13 +140,7 @@ class muc:
 		"""Leave the room"""
 		self.xmpp_c.lock.acquire()
 		s = xmpp.protocol.Presence(to=self.jid, typ='unavailable', status=message)
-		try:
-			self.xmpp_c.send(s)
-		except IOError, xmpp.Conflict:
-			self.xmpp_c.reconnectAndReauth()
-			for m in self.xmpp_c.mucs:
-				m.rejoin()
-			self.xmpp_c.send(s)
+		self._send(s)
 		self.connected = False
 		self.xmpp_c.lock.release()