xib: bridge.py annotate

annotate bridge.py @ 189:e04410e7e527

split the leaving process in two, first call to Bridge.removeParticipant() calls Participant.leave(), second call (when the bot receives the part or quit event) removes it from Bridge.participants Signed-off-by: Charly COSTE <changaco@changaco.net>

author	Charly COSTE <changaco@changaco.net>
date	Sat, 20 Feb 2010 23:08:39 +0100
parents	594f570f4657
children	6db99e458168

rev	line source
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	1 #!/usr/bin/env python
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	2 # -- coding: utf-8 --
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	3
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	4 # This program is free software: you can redistribute it and/or modify
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	5 # it under the terms of the GNU General Public License as published by
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	6 # the Free Software Foundation, either version 3 of the License, or
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	7 # (at your option) any later version.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	8 #
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	9 # This program is distributed in the hope that it will be useful,
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	12 # GNU General Public License for more details.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	13 #
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	14 # You should have received a copy of the GNU General Public License
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	16
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	17
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	18 import re
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	19 import threading
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	20 import traceback
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	21
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	22 from irclib import ServerConnection
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	23 import muc
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	24 xmpp = muc.xmpp
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	25 del muc
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	26
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	27 from participant import Participant
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	28 import say_levels
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	29
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	30
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	31 class Bridge:
21 801160b4136f Introduced a bridge's "say" attribute to offer more flexibility in what the bot says. Charly COSTE <changaco@changaco.net> parents: 19 diff changeset	32
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	33 modes = ['bypass', 'normal', 'limited', 'minimal']
21 801160b4136f Introduced a bridge's "say" attribute to offer more flexibility in what the bot says. Charly COSTE <changaco@changaco.net> parents: 19 diff changeset	34
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	35 class NoSuchParticipantException(Exception): pass
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	36
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	37
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	38 def __init__(self, owner_bot, xmpp_room_jid, irc_room, irc_server, mode, say_level, irc_port=6667, irc_connection_interval=None, irc_charsets=None):
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	39 """Create a new bridge."""
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	40 self.bot = owner_bot
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	41 self.irc_server = irc_server
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	42 self.irc_port = irc_port
45 41394ddb3aff Lower before comparing strings. Charly COSTE <changaco@changaco.net> parents: 40 diff changeset	43 self.irc_room = irc_room.lower()
150 e0eea72ea493 new bridge attribute "irc_connection_interval" (in seconds) Charly COSTE <changaco@changaco.net> parents: 139 diff changeset	44 self.irc_connection_interval = irc_connection_interval
172 64a0e9636ae6 removed encoding.py, charsets handling is now in irclib and custom charsets can be set per server in the configuration file Charly COSTE <changaco@changaco.net> parents: 169 diff changeset	45 self.irc_charsets = irc_charsets
187 594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 182 diff changeset	46 self.irc_op = False
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	47 self.xmpp_room_jid = xmpp_room_jid
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	48 self.say_level = say_level
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	49 self.participants = []
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	50 if mode not in self.__class__.modes:
21 801160b4136f Introduced a bridge's "say" attribute to offer more flexibility in what the bot says. Charly COSTE <changaco@changaco.net> parents: 19 diff changeset	51 raise Exception('[Error] "'+mode+'" is not a correct value for a bridge\'s "mode" attribute')
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	52 self.mode = mode
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	53
40 faa468731d8a Tried to get thread safety and handle disconnections in muc.py Charly COSTE <changaco@changaco.net> parents: 38 diff changeset	54 self.lock = threading.RLock()
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	55
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	56 self.init2()
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	57
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	58
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	59 def init2(self):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	60 # Join XMPP room
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	61 self.xmpp_room = xmpp.muc(self.xmpp_room_jid)
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	62 self.xmpp_room.join(self.bot.xmpp_c, self.bot.nickname, callback=self._xmpp_join_callback)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	63
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	64 # Join IRC room
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	65 self.irc_connection = self.bot.irc.open_connection(self.irc_server, self.irc_port, self.bot.nickname, delay=self.irc_connection_interval)
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	66 self.irc_connection.connect(nick_callback=self._irc_nick_callback, charsets=self.irc_charsets)
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	67
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	68 self.bot.error(say_levels.notice, 'bridge "'+str(self)+'" is running in '+self.mode+' mode and a say_level of "'+str(self.say_level)+'"')
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	69
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	70
179 f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 176 diff changeset	71 def _join_irc_failed(self):
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	72 self.bot.error(say_levels.error, 'failed to connect to the IRC chan of bridge "'+str(self)+'", stopping bridge', send_to_admins=True)
179 f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 176 diff changeset	73 self.stop(message='failed to connect to the IRC chan')
f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 176 diff changeset	74
f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 176 diff changeset	75
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	76 def _irc_nick_callback(self, error, arguments=[]):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	77 if error == None:
85 dfa030c141f1 Fixed callbacks in bridge.py Charly COSTE <changaco@changaco.net> parents: 84 diff changeset	78 if self.mode == None:
dfa030c141f1 Fixed callbacks in bridge.py Charly COSTE <changaco@changaco.net> parents: 84 diff changeset	79 return
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	80 self.irc_connection.join(self.irc_room)
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	81 self.bot.error(3, 'successfully connected on IRC side of bridge "'+str(self)+'"', debug=True)
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	82 self.say(say_levels.notice, 'bridge "'+str(self)+'" is running in '+self.mode+' mode', on_xmpp=False)
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	83 if self.mode not in ['normal', 'bypass']:
c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	84 self.show_participants_list_on(protocols=['irc'])
84 844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	85 else:
85 dfa030c141f1 Fixed callbacks in bridge.py Charly COSTE <changaco@changaco.net> parents: 84 diff changeset	86 self.mode = None
101 29d3b85c6286 Minor fixes/improvements Charly COSTE <changaco@changaco.net> parents: 100 diff changeset	87 if self.xmpp_room.connected == True:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	88 self.say(say_levels.error, 'failed to connect to the IRC chan, leaving ...', on_irc=False)
84 844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	89 try:
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	90 if error == 'nicknameinuse':
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	91 raise Exception('[Error] "'+self.bot.nickname+'" is already used in the IRC chan or reserved on the IRC server of bridge "'+str(self)+'"')
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	92 elif error == 'nickcollision':
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	93 raise Exception('[Error] "'+self.bot.nickname+'" is already used or reserved on the IRC server of bridge "'+str(self)+'"')
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	94 elif error == 'erroneusnickname':
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	95 raise Exception('[Error] "'+self.bot.nickname+'" got "erroneusnickname" on bridge "'+str(self)+'"')
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	96 elif error == 'nicknametoolong':
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	97 raise Exception('[Error] "'+self.bot.nickname+'" got "nicknametoolong" on bridge "'+str(self)+'", limit seems to be '+str(arguments[0]))
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	98 else:
169 271c35321497 minor fix in bridge.py Charly COSTE <changaco@changaco.net> parents: 155 diff changeset	99 raise Exception('[Error] unknown error for "'+self.bot.nickname+'" on bridge "'+str(self)+'"')
84 844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	100 except:
176 bca516d04bdb attach traceback to error message when joining IRC or XMPP fails Charly COSTE <changaco@changaco.net> parents: 175 diff changeset	101 trace = traceback.format_exc()
179 f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 176 diff changeset	102 self._join_irc_failed()
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	103
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	104
135 922858915907 handle xmpp.muc.RemoteServerNotFound Charly COSTE <changaco@changaco.net> parents: 132 diff changeset	105 def _RemoteServerNotFound_handler(self):
922858915907 handle xmpp.muc.RemoteServerNotFound Charly COSTE <changaco@changaco.net> parents: 132 diff changeset	106 server = xmpp.protocol.JID(self.xmpp_room_jid).getDomain()
922858915907 handle xmpp.muc.RemoteServerNotFound Charly COSTE <changaco@changaco.net> parents: 132 diff changeset	107 bridges = self.bot.findBridges([server])
922858915907 handle xmpp.muc.RemoteServerNotFound Charly COSTE <changaco@changaco.net> parents: 132 diff changeset	108 error_message = '[Warning] The MUC server '+server+' seems to be down, the bot will try to recreate all bridges related to this server in 5 minutes'
922858915907 handle xmpp.muc.RemoteServerNotFound Charly COSTE <changaco@changaco.net> parents: 132 diff changeset	109 self.bot.restart_bridges_delayed(bridges, 300, error_message)
922858915907 handle xmpp.muc.RemoteServerNotFound Charly COSTE <changaco@changaco.net> parents: 132 diff changeset	110
922858915907 handle xmpp.muc.RemoteServerNotFound Charly COSTE <changaco@changaco.net> parents: 132 diff changeset	111
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	112 def _xmpp_join_callback(self, errors):
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	113 """Called by muc._xmpp_presence_handler"""
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	114 if len(errors) == 0:
113 6daf0854aa9f added "--show-say-level" and "--show-participants" options to the "bridges" command, renamed {irc,xmpp}_participants commands Charly COSTE <changaco@changaco.net> parents: 112 diff changeset	115 if hasattr(self, 'reconnecting'):
111 59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 109 diff changeset	116 del self.reconnecting
85 dfa030c141f1 Fixed callbacks in bridge.py Charly COSTE <changaco@changaco.net> parents: 84 diff changeset	117 if self.mode == None:
dfa030c141f1 Fixed callbacks in bridge.py Charly COSTE <changaco@changaco.net> parents: 84 diff changeset	118 return
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	119 self.bot.error(3, 'succesfully connected on XMPP side of bridge "'+str(self)+'"', debug=True)
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	120 self.say(say_levels.notice, 'bridge "'+str(self)+'" is running in '+self.mode+' mode', on_irc=False)
84 844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	121 else:
85 dfa030c141f1 Fixed callbacks in bridge.py Charly COSTE <changaco@changaco.net> parents: 84 diff changeset	122 self.mode = None
84 844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	123 if self.irc_connection.really_connected == True:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	124 self.say(say_levels.error, 'failed to connect to the XMPP room, leaving ...', on_xmpp=False)
84 844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	125 for error in errors:
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	126 try:
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	127 raise error
135 922858915907 handle xmpp.muc.RemoteServerNotFound Charly COSTE <changaco@changaco.net> parents: 132 diff changeset	128 except xmpp.muc.RemoteServerNotFound:
922858915907 handle xmpp.muc.RemoteServerNotFound Charly COSTE <changaco@changaco.net> parents: 132 diff changeset	129 self._RemoteServerNotFound_handler()
84 844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	130 except:
176 bca516d04bdb attach traceback to error message when joining IRC or XMPP fails Charly COSTE <changaco@changaco.net> parents: 175 diff changeset	131 trace = traceback.format_exc()
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	132 self.bot.error(say_levels.error, 'failed to connect to the XMPP room of bridge "'+str(self)+'", stopping bridge\n'+trace, send_to_admins=True)
112 a817ad05dd1d stop bridge on error instead of removing it Charly COSTE <changaco@changaco.net> parents: 111 diff changeset	133 self.stop(message='failed to connect to the XMPP room')
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	134
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	135
115 0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 114 diff changeset	136 def addParticipant(self, from_protocol, nickname, real_jid=None, irc_id=None):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	137 """Add a participant to the bridge."""
175 8378da7844f2 minor fix in Bridge.addParticipant(), don't rely on Bridge.irc_connection or Bridge.xmpp_room when not necessary Charly COSTE <changaco@changaco.net> parents: 174 diff changeset	138 if (from_protocol == 'irc' and nickname == self.bot.nickname) or (from_protocol == 'xmpp' and nickname == self.bot.nickname):
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	139 self.bot.error(3, 'not adding self ('+self.bot.nickname+') to bridge "'+str(self)+'"', debug=True)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	140 return
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	141 try:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	142 p = self.getParticipant(nickname)
72 6c4b841144f6 Better handling of participants Charly COSTE <changaco@changaco.net> parents: 64 diff changeset	143 if p.protocol != from_protocol:
120 de00bbe026a7 bugfix related to the bypass mode Charly COSTE <changaco@changaco.net> parents: 118 diff changeset	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:
115 0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 114 diff changeset	145 if irc_id:
0ae0f8836a7a split long messages when sending on IRC Charly COSTE <changaco@changaco.net> parents: 114 diff changeset	146 p.irc_connection.irc_id = irc_id
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	147 return p
123 75a03f10a863 Code refactoring (new method participant.set_both_sides()) Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	148 p.set_both_sides()
109 970a6b4ac6ce Minor fixes Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	149 return p
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	150 except self.NoSuchParticipantException:
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	151 pass
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	152
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	153 if nickname == 'ChanServ' and from_protocol == 'irc':
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	154 return
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	155
97 c71861491968 bridge.addParticipant improvements Charly COSTE <changaco@changaco.net> parents: 86 diff changeset	156 self.lock.acquire()
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	157 self.bot.error(3, 'adding participant "'+nickname+'" from "'+from_protocol+'" to bridge "'+str(self)+'"', debug=True)
21 801160b4136f Introduced a bridge's "say" attribute to offer more flexibility in what the bot says. Charly COSTE <changaco@changaco.net> parents: 19 diff changeset	158 try:
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	159 p = Participant(self, from_protocol, nickname, real_jid=real_jid)
22 e2bd4de698e5 Solved an XMPP resource conflict that would have happened when someone on IRC changed its nickname and later its old nickname would be used again. In other words, the bot no longer uses nicknames as XMPP resources. Charly COSTE <changaco@changaco.net> parents: 21 diff changeset	160 except IOError:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	161 self.bot.error(3, 'IOError while adding participant "'+nickname+'" from "'+from_protocol+'" to bridge "'+str(self)+'", reconnectiong ...', debug=True)
22 e2bd4de698e5 Solved an XMPP resource conflict that would have happened when someone on IRC changed its nickname and later its old nickname would be used again. In other words, the bot no longer uses nicknames as XMPP resources. Charly COSTE <changaco@changaco.net> parents: 21 diff changeset	162 p.xmpp_c.reconnectAndReauth()
21 801160b4136f Introduced a bridge's "say" attribute to offer more flexibility in what the bot says. Charly COSTE <changaco@changaco.net> parents: 19 diff changeset	163 except:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	164 self.bot.error(3, 'unknown error while adding participant "'+nickname+'" from "'+from_protocol+'" to bridge "'+str(self)+'"', debug=True)
21 801160b4136f Introduced a bridge's "say" attribute to offer more flexibility in what the bot says. Charly COSTE <changaco@changaco.net> parents: 19 diff changeset	165 traceback.print_exc()
801160b4136f Introduced a bridge's "say" attribute to offer more flexibility in what the bot says. Charly COSTE <changaco@changaco.net> parents: 19 diff changeset	166 return
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	167 self.participants.append(p)
97 c71861491968 bridge.addParticipant improvements Charly COSTE <changaco@changaco.net> parents: 86 diff changeset	168 self.lock.release()
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	169 if self.mode not in ['normal', 'bypass']:
102 b3eba9489329 In minimal mode, display the participants' list on XMPP when someone joins on IRC Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	170 if from_protocol == 'xmpp':
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	171 self.show_participants_list_on(protocols=['irc'])
102 b3eba9489329 In minimal mode, display the participants' list on XMPP when someone joins on IRC Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	172 elif self.mode == 'minimal' and from_protocol == 'irc':
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	173 self.show_participants_list_on(protocols=['xmpp'])
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	174 return p
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	175
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	176
132 6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	177 def createDuplicatesOn(self, protocols):
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	178 for p in self.participants:
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	179 if p.protocol == 'xmpp' and 'irc' in protocols:
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	180 p.createDuplicateOnIRC()
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	181 elif p.protocol == 'irc' and 'xmpp' in protocols:
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	182 p.createDuplicateOnXMPP()
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	183
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	184
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	185 def changeMode(self, new_mode):
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	186 if new_mode == self.mode:
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	187 return 'Mode is already equal to '+self.mode
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	188
132 6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	189 old_mode = self.mode
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	190 self.mode = new_mode
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	191
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	192 unhandled = False
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	193
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	194 if new_mode in ['normal', 'bypass']:
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	195
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	196 if old_mode == 'limited':
17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	197 # From limited to {normal,bypass}
132 6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	198 self.createDuplicatesOn(['irc'])
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	199
132 6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	200 elif old_mode in ['minimal', 'normal']:
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	201 # From {minimal,normal} to {normal,bypass}
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	202 self.createDuplicatesOn(['irc', 'xmpp'])
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	203
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	204 elif old_mode == 'bypass':
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	205 # From bypass to normal
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	206 pass # Handled below
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	207
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	208 else:
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	209 # Unhandled mode changing
132 6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	210 unhandled = True
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	211
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	212 elif new_mode == 'limited':
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	213
139 38eb220142a1 fixed minimal→limited mode changing Charly COSTE <changaco@changaco.net>* parents: 137 diff changeset	214 if old_mode == 'minimal':
38eb220142a1 fixed minimal→limited mode changing Charly COSTE <changaco@changaco.net>* parents: 137 diff changeset	215 self.createDuplicatesOn(['xmpp'])
38eb220142a1 fixed minimal→limited mode changing Charly COSTE <changaco@changaco.net>* parents: 137 diff changeset	216
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	217 i = 0
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	218 for p in self.participants:
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	219 if p.protocol == 'xmpp':
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	220 i += 1
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	221 p._close_irc_connection('Bridge is switching to limited mode')
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	222
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	223 self.show_participants_list_on(protocols=['irc'])
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	224
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	225 elif new_mode == 'minimal':
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	226 for p in self.participants:
132 6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	227 p.leave('Bridge is switching to minimal mode')
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	228
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	229 else:
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	230 # Unhandled mode changing
132 6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	231 unhandled = True
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	232
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	233 if unhandled:
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	234 self.mode = old_mode
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	235 return 'Error: unhandled mode changing from '+self.mode+' to '+new_mode
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	236
132 6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	237 if old_mode == 'bypass':
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	238 # From bypass to *
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	239 for p in self.participants:
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	240 if p.nickname != p.duplicate_nickname:
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	241 p.leave('Bridge is switching to '+new_mode+' mode')
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn()) Charly COSTE <changaco@changaco.net> parents: 131 diff changeset	242
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	243 self.say(say_levels.notice, 'Bridge is switching from '+old_mode+' to '+new_mode+' mode.', log=True)
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	244
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	245
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	246 def getParticipant(self, nickname):
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	247 """Returns a participant object if there is a participant using nickname in the bridge. Raises a NoSuchParticipantException otherwise."""
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	248 self.lock.acquire()
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	249 for p in self.participants:
b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	250 if nickname in [p.nickname, p.duplicate_nickname]:
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	251 self.lock.release()
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	252 return p
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	253 self.lock.release()
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	254 raise self.NoSuchParticipantException('there is no participant using the nickname "'+nickname+'" in this bridge')
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	255
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	256
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	257 def get_participants_nicknames_list(self, protocols=['irc', 'xmpp']):
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	258 """Returns a list of the nicknames of the bridge's participants that are connected on the XMPP side."""
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	259 self.lock.acquire()
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	260 participants_nicknames = []
11 79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	261 for p in self.participants:
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	262 if p.protocol in protocols:
18 3cdf7bb580da Fixed bot.respond(), boosted XMPP thread to lower latency, fixed mode notice. Charly COSTE <changaco@changaco.net> parents: 17 diff changeset	263 participants_nicknames.append('"'+p.nickname+'"')
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	264 self.lock.release()
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	265 return participants_nicknames
11 79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	266
79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	267
62 61491895c607 Added bridge.hasParticipant() and fixed participant.changeNickname() Charly COSTE <changaco@changaco.net> parents: 60 diff changeset	268 def hasParticipant(self, nickname):
61491895c607 Added bridge.hasParticipant() and fixed participant.changeNickname() Charly COSTE <changaco@changaco.net> parents: 60 diff changeset	269 try:
61491895c607 Added bridge.hasParticipant() and fixed participant.changeNickname() Charly COSTE <changaco@changaco.net> parents: 60 diff changeset	270 self.getParticipant(nickname)
61491895c607 Added bridge.hasParticipant() and fixed participant.changeNickname() Charly COSTE <changaco@changaco.net> parents: 60 diff changeset	271 return True
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 123 diff changeset	272 except self.NoSuchParticipantException:
62 61491895c607 Added bridge.hasParticipant() and fixed participant.changeNickname() Charly COSTE <changaco@changaco.net> parents: 60 diff changeset	273 return False
61491895c607 Added bridge.hasParticipant() and fixed participant.changeNickname() Charly COSTE <changaco@changaco.net> parents: 60 diff changeset	274
61491895c607 Added bridge.hasParticipant() and fixed participant.changeNickname() Charly COSTE <changaco@changaco.net> parents: 60 diff changeset	275
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	276 def removeParticipant(self, left_protocol, nickname, leave_message):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	277 """Remove the participant using nickname from the bridge. Raises a NoSuchParticipantException if nickname is not used in the bridge."""
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	278
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	279 was_on_both = None
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	280 p = self.getParticipant(nickname)
189 e04410e7e527 split the leaving process in two, first call to Bridge.removeParticipant() calls Participant.leave(), second call (when the bot receives the part or quit event) removes it from Bridge.participants Charly COSTE <changaco@changaco.net> parents: 187 diff changeset	281
e04410e7e527 split the leaving process in two, first call to Bridge.removeParticipant() calls Participant.leave(), second call (when the bot receives the part or quit event) removes it from Bridge.participants Charly COSTE <changaco@changaco.net> parents: 187 diff changeset	282 if p.left:
e04410e7e527 split the leaving process in two, first call to Bridge.removeParticipant() calls Participant.leave(), second call (when the bot receives the part or quit event) removes it from Bridge.participants Charly COSTE <changaco@changaco.net> parents: 187 diff changeset	283 self.lock.acquire()
e04410e7e527 split the leaving process in two, first call to Bridge.removeParticipant() calls Participant.leave(), second call (when the bot receives the part or quit event) removes it from Bridge.participants Charly COSTE <changaco@changaco.net> parents: 187 diff changeset	284 self.participants.remove(p)
e04410e7e527 split the leaving process in two, first call to Bridge.removeParticipant() calls Participant.leave(), second call (when the bot receives the part or quit event) removes it from Bridge.participants Charly COSTE <changaco@changaco.net> parents: 187 diff changeset	285 del p
e04410e7e527 split the leaving process in two, first call to Bridge.removeParticipant() calls Participant.leave(), second call (when the bot receives the part or quit event) removes it from Bridge.participants Charly COSTE <changaco@changaco.net> parents: 187 diff changeset	286 self.lock.release()
e04410e7e527 split the leaving process in two, first call to Bridge.removeParticipant() calls Participant.leave(), second call (when the bot receives the part or quit event) removes it from Bridge.participants Charly COSTE <changaco@changaco.net> parents: 187 diff changeset	287 return
e04410e7e527 split the leaving process in two, first call to Bridge.removeParticipant() calls Participant.leave(), second call (when the bot receives the part or quit event) removes it from Bridge.participants Charly COSTE <changaco@changaco.net> parents: 187 diff changeset	288
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	289 if p.protocol == 'xmpp':
84 844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	290 if p.irc_connection == 'both':
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	291 was_on_both = True
84 844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	292 if left_protocol == 'xmpp':
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	293 p.protocol = 'irc'
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	294 p.createDuplicateOnXMPP()
84 844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	295 elif left_protocol == 'irc':
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	296 p.createDuplicateOnIRC()
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	297 else:
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 97 diff changeset	298 if left_protocol == 'xmpp':
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 97 diff changeset	299 was_on_both = False
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 97 diff changeset	300 elif left_protocol == 'irc':
189 e04410e7e527 split the leaving process in two, first call to Bridge.removeParticipant() calls Participant.leave(), second call (when the bot receives the part or quit event) removes it from Bridge.participants Charly COSTE <changaco@changaco.net> parents: 187 diff changeset	301 # got disconnected somehow
131 46af7f2744a9 added irclib.ServerConnection.left_channels Charly COSTE <changaco@changaco.net> parents: 125 diff changeset	302 if isinstance(p.irc_connection, ServerConnection):
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 97 diff changeset	303 p.irc_connection.join(self.irc_room)
131 46af7f2744a9 added irclib.ServerConnection.left_channels Charly COSTE <changaco@changaco.net> parents: 125 diff changeset	304 else:
46af7f2744a9 added irclib.ServerConnection.left_channels Charly COSTE <changaco@changaco.net> parents: 125 diff changeset	305 c = self.bot.irc.get_connection(self.irc_server, self.irc_port, p.duplicate_nickname)
46af7f2744a9 added irclib.ServerConnection.left_channels Charly COSTE <changaco@changaco.net> parents: 125 diff changeset	306 if not (c and self.irc_room in c.left_channels):
46af7f2744a9 added irclib.ServerConnection.left_channels Charly COSTE <changaco@changaco.net> parents: 125 diff changeset	307 p._close_irc_connection(leave_message)
46af7f2744a9 added irclib.ServerConnection.left_channels Charly COSTE <changaco@changaco.net> parents: 125 diff changeset	308 p.createDuplicateOnIRC()
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 97 diff changeset	309 return
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	310
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	311 elif p.protocol == 'irc':
84 844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	312 if p.xmpp_c == 'both':
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	313 was_on_both = True
84 844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	314 if left_protocol == 'irc':
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	315 p.protocol = 'xmpp'
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	316 p.createDuplicateOnIRC()
84 844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	317 elif left_protocol == 'xmpp':
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	318 p.createDuplicateOnXMPP()
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	319 else:
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 97 diff changeset	320 if left_protocol == 'irc':
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 97 diff changeset	321 was_on_both = False
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 97 diff changeset	322 elif left_protocol == 'xmpp':
189 e04410e7e527 split the leaving process in two, first call to Bridge.removeParticipant() calls Participant.leave(), second call (when the bot receives the part or quit event) removes it from Bridge.participants Charly COSTE <changaco@changaco.net> parents: 187 diff changeset	323 # got disconnected somehow
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 97 diff changeset	324 if isinstance(p.xmpp_c, xmpp.client.Client):
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 97 diff changeset	325 self.bot.reopen_xmpp_connection(p.xmpp_c)
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 97 diff changeset	326 return
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	327
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	328 else:
19 c1b84196c100 Changed format of non-debug error messages, fixed IRC namreply handling, prevented crash when receiving bad XMPP stanza. Charly COSTE <changaco@changaco.net> parents: 18 diff changeset	329 raise Exception('[Internal Error] bad protocol')
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	330
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	331 if was_on_both == True:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	332 self.bot.error(3, '"'+nickname+'" was on both sides of bridge "'+str(self)+'" but left '+left_protocol, debug=True)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	333
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	334 elif was_on_both == False:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	335 self.bot.error(3, 'removing participant "'+nickname+'" from bridge "'+str(self)+'"', debug=True)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	336 p.leave(leave_message)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	337 if left_protocol == 'xmpp':
118 b29fd5696a78 new mode bypass and new method bridge.changeMode Charly COSTE <changaco@changaco.net> parents: 115 diff changeset	338 if self.mode not in ['normal', 'bypass']:
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	339 self.show_participants_list_on(protocols=['irc'])
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	340 elif left_protocol == 'irc':
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	341 if self.mode == 'minimal':
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	342 self.show_participants_list_on(protocols=['xmpp'])
189 e04410e7e527 split the leaving process in two, first call to Bridge.removeParticipant() calls Participant.leave(), second call (when the bot receives the part or quit event) removes it from Bridge.participants Charly COSTE <changaco@changaco.net> parents: 187 diff changeset	343
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	344 else:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	345 self.bot.error(1, 'Bad decision tree, p.protocol='+p.protocol+' left_protocol='+left_protocol+'\np.xmpp_c='+str(p.xmpp_c)+'\np.irc_connection='+str(p.irc_connection), debug=True)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	346
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	347
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	348 def restart(self):
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	349 """Restart the bridge"""
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	350
105 d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	351 # Tell admins
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	352 self.bot.error(-1, 'Restarting bridge '+str(self), send_to_admins=True)
105 d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	353
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	354 # Stop the bridge
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	355 self.stop(message='Restarting bridge')
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	356
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	357 # Recreate the bridge
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	358 self.init2()
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	359
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	360
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	361 def say(self, importance, message, on_irc=True, on_xmpp=True, log=False, send_to_admins=False):
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 15 diff changeset	362 """Make the bot say something."""
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	363 if log or send_to_admins:
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	364 self.bot.error(importance, message+' ('+str(self)+')', send_to_admins=send_to_admins)
182 60ee2b914616 minor fix in bridge.py, importance was printed twice Charly COSTE <changaco@changaco.net> parents: 180 diff changeset	365 message = self.bot.format_message(importance, message)
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	366 if importance < self.say_level:
21 801160b4136f Introduced a bridge's "say" attribute to offer more flexibility in what the bot says. Charly COSTE <changaco@changaco.net> parents: 19 diff changeset	367 return
11 79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	368 if on_xmpp == True:
79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	369 self.xmpp_room.say(message)
79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	370 if on_irc == True:
56 b048c4c03b00 Fixed encoding issues Charly COSTE <changaco@changaco.net> parents: 45 diff changeset	371 self.irc_connection.privmsg(self.irc_room, message)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	372
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	373
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	374 def show_participants_list_on(self, protocols=[]):
174 c158ad24ef3c moved irc connection interval handling to irclib Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	375 if 'irc' in protocols and self.irc_connection.really_connected:
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	376 xmpp_participants_nicknames = self.get_participants_nicknames_list(protocols=['xmpp'])
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	377 self.say(say_levels.info, 'Participants on XMPP: '+' '.join(xmpp_participants_nicknames), on_xmpp=False)
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	378 if 'xmpp' in protocols:
17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	379 irc_participants_nicknames = self.get_participants_nicknames_list(protocols=['irc'])
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	380 self.say(say_levels.info, 'Participants on IRC: '+' '.join(irc_participants_nicknames), on_irc=False)
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	381
17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 150 diff changeset	382
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	383 def stop(self, message='Stopping bridge'):
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	384 """Stop the bridge"""
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	385
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	386 # Close IRC connection if not used by an other bridge, just leave the room otherwise
109 970a6b4ac6ce Minor fixes Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	387 if isinstance(self.irc_connection, ServerConnection):
970a6b4ac6ce Minor fixes Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	388 self.irc_connection.used_by -= 1
970a6b4ac6ce Minor fixes Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	389 if self.irc_connection.used_by < 1:
970a6b4ac6ce Minor fixes Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	390 self.irc_connection.close(message)
970a6b4ac6ce Minor fixes Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	391 else:
970a6b4ac6ce Minor fixes Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	392 self.irc_connection.part(self.irc_room, message=message)
970a6b4ac6ce Minor fixes Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	393 self.irc_connection = None
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	394
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	395 # Leave the MUC
109 970a6b4ac6ce Minor fixes Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	396 if isinstance(self.xmpp_room, xmpp.muc):
970a6b4ac6ce Minor fixes Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	397 self.xmpp_room.leave(message=message)
970a6b4ac6ce Minor fixes Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	398 self.xmpp_room.__del__()
970a6b4ac6ce Minor fixes Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	399 self.xmpp_room = None
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	400
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	401 # Delete participants objects
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	402 for p in self.participants:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	403 p.leave(message)
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	404 self.participants = []
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	405
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	406
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	407 def __str__(self):
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	408 return self.irc_room+'@'+self.irc_server+' <-> '+self.xmpp_room_jid
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	409
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	410
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	411 def __del__(self):
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 102 diff changeset	412 self.stop(message='Removing bridge')

Mercurial > xib

annotate bridge.py @ 189:e04410e7e527