Mercurial > xib

comparison bridge.py @ 120:de00bbe026a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfix related to the bypass mode Signed-off-by: Charly COSTE <changaco@changaco.net>
author Charly COSTE <changaco@changaco.net>
date Sat, 05 Dec 2009 11:44:59 +0100
parents b29fd5696a78
children 9e90e15913a7
comparison
equal deleted inserted replaced
119:ae55fc0d783d 120:de00bbe026a7
139 self.bot.error('===> Debug: not adding self ('+self.bot.nickname+') to bridge "'+str(self)+'"', debug=True) 139 self.bot.error('===> Debug: not adding self ('+self.bot.nickname+') to bridge "'+str(self)+'"', debug=True)
140 return 140 return
141 try: 141 try:
142 p = self.getParticipant(nickname) 142 p = self.getParticipant(nickname)
143 if p.protocol != from_protocol: 143 if p.protocol != from_protocol:
144 if from_protocol == 'irc' and isinstance(p.irc_connection, ServerConnection) and p.irc_connection.really_connected == True or from_protocol == 'xmpp' and isinstance(p.xmpp_c, xmpp.client.Client) and isinstance(p.muc, xmpp.muc): 144 if from_protocol == 'irc' and isinstance(p.irc_connection, ServerConnection) and p.irc_connection.really_connected == True and p.irc_connection.real_nickname == nickname or from_protocol == 'xmpp' and isinstance(p.xmpp_c, xmpp.client.Client) and isinstance(p.muc, xmpp.muc) and p.xmpp_c.nickname == nickname:
145 if irc_id: 145 if irc_id:
146 p.irc_connection.irc_id = irc_id 146 p.irc_connection.irc_id = irc_id
147 return p 147 return p
148 self.bot.error('===> Debug: "'+nickname+'" is on both sides of bridge "'+str(self)+'"', debug=True) 148 self.bot.error('===> Debug: "'+nickname+'" is on both sides of bridge "'+str(self)+'"', debug=True)
149 self.say('[Warning] The nickname "'+nickname+'" is used on both sides of the bridge, please avoid that if possible') 149 self.say('[Warning] The nickname "'+nickname+'" is used on both sides of the bridge, please avoid that if possible')