Mercurial > xib
diff bridge.py @ 64:8fc496eaa17b
Handle IRC "nickcollision" event
Signed-off-by: Charly COSTE <changaco@changaco.net>
author | Charly COSTE <changaco@changaco.net> |
---|---|
date | Sun, 30 Aug 2009 01:18:34 +0200 |
parents | 71508f22edb4 |
children | 6c4b841144f6 |
line wrap: on
line diff
--- a/bridge.py +++ b/bridge.py @@ -84,6 +84,9 @@ class bridge: if error == 'nicknameinuse': self.bot.error('[Error] "'+self.bot.nickname+'" is already used in the IRC chan or reserved on the IRC server of bridge "'+str(self)+'"') raise Exception('[Error] "'+self.bot.nickname+'" is already used in the IRC chan or reserved on the IRC server of bridge "'+str(self)+'"') + if error == 'nickcollision': + self.bot.error('[Error] "'+self.bot.nickname+'" is already used or reserved on the IRC server of bridge "'+str(self)+'"') + raise Exception('[Error] "'+self.bot.nickname+'" is already used or reserved on the IRC server of bridge "'+str(self)+'"') elif error == 'erroneusnickname': self.bot.error('[Error] "'+self.bot.nickname+'" got "erroneusnickname" on bridge "'+str(self)+'"') raise Exception('[Error] "'+self.bot.nickname+'" got "erroneusnickname" on bridge "'+str(self)+'"') @@ -266,7 +269,7 @@ class bridge: if p.protocol == 'xmpp': i += 1 if p.irc_connection != None: - p.irc_connection.close('Bridge is switching to limited mode', volontary=True) + p.irc_connection.close('Bridge is switching to limited mode') p.irc_connection = None self.irc_connections_limit = i self.bot.error('===> Bridge is switching to limited mode. Limit seems to be '+str(self.irc_connections_limit)+' on "'+self.irc_server+'".') @@ -289,7 +292,7 @@ class bridge: # Close IRC connection if not used by an other bridge, just leave the room otherwise self.irc_connection.used_by -= 1 if self.irc_connection.used_by < 1: - self.irc_connection.close('Removing bridge', volontary=True) + self.irc_connection.close('Removing bridge') else: self.irc_connection.part('Removing bridge') del self.irc_connection