Mercurial > xib

annotate bridge.py @ 242:60645c505f11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ignore IRC server-wide events not received on bot connection Signed-off-by: Charly COSTE <changaco@changaco.net>
author Charly COSTE <changaco@changaco.net>
date Mon, 08 Mar 2010 18:12:17 +0100
parents ebd67e3e4866
children 430eb5052e4d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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):
195
e4ceefab8ba5 fixed Bot.restart_bridges_delayed(), don't send the message to admins more than once
Charly COSTE <changaco@changaco.net>
parents: 193
diff changeset
60 self.reconnecting = False
e4ceefab8ba5 fixed Bot.restart_bridges_delayed(), don't send the message to admins more than once
Charly COSTE <changaco@changaco.net>
parents: 193
diff changeset
61
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
62 # Join XMPP room
174
c158ad24ef3c moved irc connection interval handling to irclib
Charly COSTE <changaco@changaco.net>
parents: 172
diff changeset
63 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
64 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
65
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
66 # Join IRC room
174
c158ad24ef3c moved irc connection interval handling to irclib
Charly COSTE <changaco@changaco.net>
parents: 172
diff changeset
67 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
68 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
69
180
102f895347ff added a required "importance" argument to Bot.error()
Charly COSTE <changaco@changaco.net>
parents: 179
diff changeset
70 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
71
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
72
193
c2a8586e64b5 handle IRC inviteonlychan event, improved error messages
Charly COSTE <changaco@changaco.net>
parents: 192
diff changeset
73 def _join_irc_failed(self, reason):
c2a8586e64b5 handle IRC inviteonlychan event, improved error messages
Charly COSTE <changaco@changaco.net>
parents: 192
diff changeset
74 self.bot.error(say_levels.error, 'failed to connect to the IRC chan of bridge '+str(self)+'\nreason: '+reason, send_to_admins=True)
c2a8586e64b5 handle IRC inviteonlychan event, improved error messages
Charly COSTE <changaco@changaco.net>
parents: 192
diff changeset
75 self.stop(message='Failed to connect to the IRC chan, stopping bridge', log=False)
179
f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins
Charly COSTE <changaco@changaco.net>
parents: 176
diff changeset
76
f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins
Charly COSTE <changaco@changaco.net>
parents: 176
diff changeset
77
231
5f1e9211af03 fix for 48ad162772b79740e8ff580bde2c250b9957c126, we do need arguments in nick callbacks
Charly COSTE <changaco@changaco.net>
parents: 226
diff changeset
78 def _irc_nick_callback(self, error, arguments=None):
226
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
79 if not error:
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
80 if not self.mode:
85
dfa030c141f1 Fixed callbacks in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 84
diff changeset
81 return
226
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
82 self.irc_connection.join(self.irc_room, callback=self._irc_join_callback)
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
83
84
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 72
diff changeset
84 else:
85
dfa030c141f1 Fixed callbacks in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 84
diff changeset
85 self.mode = None
192
12fa9bb73b1d check connection in Bridge.say(), use Bridge.say() in Participant.sayOn{IRC,XMPP}()
Charly COSTE <changaco@changaco.net>
parents: 191
diff changeset
86 self.say(say_levels.error, 'failed to connect to the IRC chan, leaving ...', on_irc=False)
193
c2a8586e64b5 handle IRC inviteonlychan event, improved error messages
Charly COSTE <changaco@changaco.net>
parents: 192
diff changeset
87 if error in ['nicknameinuse', 'nickcollision']:
c2a8586e64b5 handle IRC inviteonlychan event, improved error messages
Charly COSTE <changaco@changaco.net>
parents: 192
diff changeset
88 reason = '"'+self.bot.nickname+'" is already used or reserved on the IRC server'
c2a8586e64b5 handle IRC inviteonlychan event, improved error messages
Charly COSTE <changaco@changaco.net>
parents: 192
diff changeset
89 elif error == 'erroneusnickname':
c2a8586e64b5 handle IRC inviteonlychan event, improved error messages
Charly COSTE <changaco@changaco.net>
parents: 192
diff changeset
90 reason = '"'+self.bot.nickname+'" got "erroneusnickname"'
c2a8586e64b5 handle IRC inviteonlychan event, improved error messages
Charly COSTE <changaco@changaco.net>
parents: 192
diff changeset
91 elif error == 'nicknametoolong':
219
63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in
Charly COSTE <changaco@changaco.net>
parents: 216
diff changeset
92 reason = '"'+self.bot.nickname+'" got "nicknametoolong", limit seems to be '+str(len(self.irc_connection.real_nickname))
193
c2a8586e64b5 handle IRC inviteonlychan event, improved error messages
Charly COSTE <changaco@changaco.net>
parents: 192
diff changeset
93 else:
c2a8586e64b5 handle IRC inviteonlychan event, improved error messages
Charly COSTE <changaco@changaco.net>
parents: 192
diff changeset
94 reason = error
c2a8586e64b5 handle IRC inviteonlychan event, improved error messages
Charly COSTE <changaco@changaco.net>
parents: 192
diff changeset
95 self._join_irc_failed(reason)
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
96
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
97
226
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
98 def _irc_join_callback(self, channel, error):
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
99 if not error:
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
100 self.bot.error(3, 'successfully joined IRC side of bridge "'+str(self)+'"', debug=True)
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
101 self.say(say_levels.notice, 'bridge "'+str(self)+'" is running in '+self.mode+' mode', on_xmpp=False)
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
102 if self.mode not in ['normal', 'bypass']:
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
103 self.show_participants_list_on(protocols=['irc'])
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
104
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
105 else:
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
106 self._join_irc_failed(error)
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
107
0d85049ac68d switch to IRC join callbacks in bridge.py and participant.py
Charly COSTE <changaco@changaco.net>
parents: 221
diff changeset
108
135
922858915907 handle xmpp.muc.RemoteServerNotFound
Charly COSTE <changaco@changaco.net>
parents: 132
diff changeset
109 def _RemoteServerNotFound_handler(self):
922858915907 handle xmpp.muc.RemoteServerNotFound
Charly COSTE <changaco@changaco.net>
parents: 132
diff changeset
110 server = xmpp.protocol.JID(self.xmpp_room_jid).getDomain()
216
d527d7b75f56 merged Bot.find_bridges and Bot.get_bridges into Bot.iter_bridges, btw we don't need to lock Bot.bridges because lists don't raise RuntimeError
Charly COSTE <changaco@changaco.net>
parents: 215
diff changeset
111 bridges = self.bot.iter_bridges(patterns=[server])
190
6db99e458168 fixed calls to Bot.restart_bridges_delayed(), arguments changed in f52cb2f6e273328e73d75ab4ecf214c8dc9dfe1b
Charly COSTE <changaco@changaco.net>
parents: 189
diff changeset
112 error = [say_levels.warning, 'The MUC server '+server+' seems to be down, the bot will try to recreate all bridges related to this server in 5 minutes']
6db99e458168 fixed calls to Bot.restart_bridges_delayed(), arguments changed in f52cb2f6e273328e73d75ab4ecf214c8dc9dfe1b
Charly COSTE <changaco@changaco.net>
parents: 189
diff changeset
113 self.bot.restart_bridges_delayed(bridges, 300, error)
135
922858915907 handle xmpp.muc.RemoteServerNotFound
Charly COSTE <changaco@changaco.net>
parents: 132
diff changeset
114
922858915907 handle xmpp.muc.RemoteServerNotFound
Charly COSTE <changaco@changaco.net>
parents: 132
diff changeset
115
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
116 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
117 """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
118 if len(errors) == 0:
206
ba5ecd71065f bugfix, we don't delete Bridge.reconnecting since 3518e463b82185bde91a61a810d38dbf58e55147
Charly COSTE <changaco@changaco.net>
parents: 205
diff changeset
119 self.reconnecting = False
85
dfa030c141f1 Fixed callbacks in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 84
diff changeset
120 if self.mode == None:
dfa030c141f1 Fixed callbacks in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 84
diff changeset
121 return
180
102f895347ff added a required "importance" argument to Bot.error()
Charly COSTE <changaco@changaco.net>
parents: 179
diff changeset
122 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
123 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
124 else:
85
dfa030c141f1 Fixed callbacks in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 84
diff changeset
125 self.mode = None
192
12fa9bb73b1d check connection in Bridge.say(), use Bridge.say() in Participant.sayOn{IRC,XMPP}()
Charly COSTE <changaco@changaco.net>
parents: 191
diff changeset
126 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
127 for error in errors:
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 72
diff changeset
128 try:
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 72
diff changeset
129 raise error
135
922858915907 handle xmpp.muc.RemoteServerNotFound
Charly COSTE <changaco@changaco.net>
parents: 132
diff changeset
130 except xmpp.muc.RemoteServerNotFound:
922858915907 handle xmpp.muc.RemoteServerNotFound
Charly COSTE <changaco@changaco.net>
parents: 132
diff changeset
131 self._RemoteServerNotFound_handler()
84
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 72
diff changeset
132 except:
176
bca516d04bdb attach traceback to error message when joining IRC or XMPP fails
Charly COSTE <changaco@changaco.net>
parents: 175
diff changeset
133 trace = traceback.format_exc()
180
102f895347ff added a required "importance" argument to Bot.error()
Charly COSTE <changaco@changaco.net>
parents: 179
diff changeset
134 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)
193
c2a8586e64b5 handle IRC inviteonlychan event, improved error messages
Charly COSTE <changaco@changaco.net>
parents: 192
diff changeset
135 self.stop(message='Failed to connect to the XMPP room, stopping bridge')
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
136
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
137
221
1a82d5d40d90 moved irc_id handling to irclib
Charly COSTE <changaco@changaco.net>
parents: 219
diff changeset
138 def add_participant(self, from_protocol, nickname, real_jid=None):
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
139 """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
140 if (from_protocol == 'irc' and nickname == self.bot.nickname) or (from_protocol == 'xmpp' and nickname == self.bot.nickname):
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
141 return
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
142 try:
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
143 p = self.get_participant(nickname)
72
6c4b841144f6 Better handling of participants
Charly COSTE <changaco@changaco.net>
parents: 64
diff changeset
144 if p.protocol != from_protocol:
219
63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in
Charly COSTE <changaco@changaco.net>
parents: 216
diff changeset
145 if from_protocol == 'irc' and isinstance(p.irc_connection, ServerConnection) and p.irc_connection.logged_in 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:
118
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
146 return p
123
75a03f10a863 Code refactoring (new method participant.set_both_sides())
Charly COSTE <changaco@changaco.net>
parents: 122
diff changeset
147 p.set_both_sides()
109
970a6b4ac6ce Minor fixes
Charly COSTE <changaco@changaco.net>
parents: 105
diff changeset
148 return p
124
99f3dee1fad7 code cleaning
Charly COSTE <changaco@changaco.net>
parents: 123
diff changeset
149 except self.NoSuchParticipantException:
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
150 pass
118
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
151
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
152 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
153 return
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
154
180
102f895347ff added a required "importance" argument to Bot.error()
Charly COSTE <changaco@changaco.net>
parents: 179
diff changeset
155 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
156 try:
124
99f3dee1fad7 code cleaning
Charly COSTE <changaco@changaco.net>
parents: 123
diff changeset
157 p = Participant(self, from_protocol, nickname, real_jid=real_jid)
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 except:
201
de574314990e log some more things when Bot.debug is False
Charly COSTE <changaco@changaco.net>
parents: 197
diff changeset
159 self.bot.error(say_levels.debug, 'unknown error while adding participant "'+nickname+'" from "'+from_protocol+'" to bridge "'+str(self)+'"\n'+traceback.format_exc())
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
160 return
191
ac89a4a72a62 removed buggy exception catch in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 190
diff changeset
161 self.lock.acquire()
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
162 self.participants.append(p)
97
c71861491968 bridge.addParticipant improvements
Charly COSTE <changaco@changaco.net>
parents: 86
diff changeset
163 self.lock.release()
118
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
164 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
165 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
166 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
167 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
168 self.show_participants_list_on(protocols=['xmpp'])
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
169 return p
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
170
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
171
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
172 def create_duplicates_on(self, protocols):
132
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
173 for p in self.participants:
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
174 if p.protocol == 'xmpp' and 'irc' in protocols:
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
175 p.create_duplicate_on_irc()
132
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
176 elif p.protocol == 'irc' and 'xmpp' in protocols:
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
177 p.create_duplicate_on_xmpp()
132
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
178
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
179
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
180 def change_mode(self, new_mode):
118
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
181 if new_mode == self.mode:
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
182 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
183
132
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
184 old_mode = self.mode
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
185 self.mode = new_mode
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
186
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
187 unhandled = False
118
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
188
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
189 if new_mode in ['normal', 'bypass']:
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
190
152
17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on())
Charly COSTE <changaco@changaco.net>
parents: 150
diff changeset
191 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
192 # From limited to {normal,bypass}
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
193 self.create_duplicates_on(['irc'])
118
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
194
132
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
195 elif old_mode in ['minimal', 'normal']:
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
196 # From {minimal,normal} to {normal,bypass}
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
197 self.create_duplicates_on(['irc', 'xmpp'])
132
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
198
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
199 elif old_mode == 'bypass':
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
200 # From bypass to normal
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
201 pass # Handled below
118
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
202
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
203 else:
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
204 # Unhandled mode changing
132
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
205 unhandled = True
118
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
206
152
17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on())
Charly COSTE <changaco@changaco.net>
parents: 150
diff changeset
207 elif new_mode == 'limited':
118
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
208
139
38eb220142a1 fixed minimal→*limited mode changing
Charly COSTE <changaco@changaco.net>
parents: 137
diff changeset
209 if old_mode == 'minimal':
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
210 self.create_duplicates_on(['xmpp'])
139
38eb220142a1 fixed minimal→*limited mode changing
Charly COSTE <changaco@changaco.net>
parents: 137
diff changeset
211
118
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
212 i = 0
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
213 for p in self.participants:
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
214 if p.protocol == 'xmpp':
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
215 i += 1
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
216 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
217
152
17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on())
Charly COSTE <changaco@changaco.net>
parents: 150
diff changeset
218 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
219
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
220 elif new_mode == 'minimal':
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
221 for p in self.participants:
132
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
222 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
223
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
224 else:
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
225 # Unhandled mode changing
132
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
226 unhandled = True
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
227
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
228 if unhandled:
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
229 self.mode = old_mode
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
230 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
231
132
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
232 if old_mode == 'bypass':
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
233 # From bypass to *
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
234 for p in self.participants:
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
235 if p.nickname != p.duplicate_nickname:
6a6885dbed25 handle more mode changing cases (added bridge.createDuplicatesOn())
Charly COSTE <changaco@changaco.net>
parents: 131
diff changeset
236 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
237
180
102f895347ff added a required "importance" argument to Bot.error()
Charly COSTE <changaco@changaco.net>
parents: 179
diff changeset
238 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
239
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
240
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
241 def get_participant(self, nickname):
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
242 """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
243 self.lock.acquire()
118
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
244 for p in self.participants:
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
245 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
246 self.lock.release()
118
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
247 return p
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.release()
124
99f3dee1fad7 code cleaning
Charly COSTE <changaco@changaco.net>
parents: 123
diff changeset
249 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
250
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
251
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
252 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
253 """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
254 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
255 participants_nicknames = []
11
79b0a7f48a3e Introduced the command mechanism and fixed a bug
Charly COSTE <changaco@changaco.net>
parents: 10
diff changeset
256 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
257 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
258 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
259 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
260 return participants_nicknames
11
79b0a7f48a3e Introduced the command mechanism and fixed a bug
Charly COSTE <changaco@changaco.net>
parents: 10
diff changeset
261
79b0a7f48a3e Introduced the command mechanism and fixed a bug
Charly COSTE <changaco@changaco.net>
parents: 10
diff changeset
262
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
263 def has_participant(self, nickname):
62
61491895c607 Added bridge.hasParticipant() and fixed participant.changeNickname()
Charly COSTE <changaco@changaco.net>
parents: 60
diff changeset
264 try:
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
265 self.get_participant(nickname)
62
61491895c607 Added bridge.hasParticipant() and fixed participant.changeNickname()
Charly COSTE <changaco@changaco.net>
parents: 60
diff changeset
266 return True
124
99f3dee1fad7 code cleaning
Charly COSTE <changaco@changaco.net>
parents: 123
diff changeset
267 except self.NoSuchParticipantException:
62
61491895c607 Added bridge.hasParticipant() and fixed participant.changeNickname()
Charly COSTE <changaco@changaco.net>
parents: 60
diff changeset
268 return False
61491895c607 Added bridge.hasParticipant() and fixed participant.changeNickname()
Charly COSTE <changaco@changaco.net>
parents: 60
diff changeset
269
61491895c607 Added bridge.hasParticipant() and fixed participant.changeNickname()
Charly COSTE <changaco@changaco.net>
parents: 60
diff changeset
270
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
271 def remove_participant(self, left_protocol, nickname, leave_message):
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
272 """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
273
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
274 was_on_both = None
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
275 p = self.get_participant(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
276
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
277 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
278 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
279 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
280 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
281 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
282 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
283
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
284 if p.protocol == 'xmpp':
84
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 72
diff changeset
285 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
286 was_on_both = True
84
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 72
diff changeset
287 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
288 p.protocol = 'irc'
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
289 p.create_duplicate_on_xmpp()
84
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 72
diff changeset
290 elif left_protocol == 'irc':
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
291 p.create_duplicate_on_irc()
84
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 72
diff changeset
292 else:
100
6289ac5a2db7 Reconnect when a connection is closed
Charly COSTE <changaco@changaco.net>
parents: 97
diff changeset
293 if left_protocol == 'xmpp':
6289ac5a2db7 Reconnect when a connection is closed
Charly COSTE <changaco@changaco.net>
parents: 97
diff changeset
294 was_on_both = False
6289ac5a2db7 Reconnect when a connection is closed
Charly COSTE <changaco@changaco.net>
parents: 97
diff changeset
295 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
296 # got disconnected somehow
131
46af7f2744a9 added irclib.ServerConnection.left_channels
Charly COSTE <changaco@changaco.net>
parents: 125
diff changeset
297 if isinstance(p.irc_connection, ServerConnection):
233
4ad8e985c7d3 tried to fix Bridge.remove_participant
Charly COSTE <changaco@changaco.net>
parents: 231
diff changeset
298 if p.irc_connection.socket == 'closed':
4ad8e985c7d3 tried to fix Bridge.remove_participant
Charly COSTE <changaco@changaco.net>
parents: 231
diff changeset
299 return
100
6289ac5a2db7 Reconnect when a connection is closed
Charly COSTE <changaco@changaco.net>
parents: 97
diff changeset
300 p.irc_connection.join(self.irc_room)
131
46af7f2744a9 added irclib.ServerConnection.left_channels
Charly COSTE <changaco@changaco.net>
parents: 125
diff changeset
301 else:
46af7f2744a9 added irclib.ServerConnection.left_channels
Charly COSTE <changaco@changaco.net>
parents: 125
diff changeset
302 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
303 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
304 p._close_irc_connection(leave_message)
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
305 p.create_duplicate_on_irc()
100
6289ac5a2db7 Reconnect when a connection is closed
Charly COSTE <changaco@changaco.net>
parents: 97
diff changeset
306 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
307
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
308 elif p.protocol == 'irc':
84
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 72
diff changeset
309 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
310 was_on_both = True
84
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 72
diff changeset
311 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
312 p.protocol = 'xmpp'
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
313 p.create_duplicate_on_irc()
84
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 72
diff changeset
314 elif left_protocol == 'xmpp':
203
2a81c480439a renamed camelCased functions
Charly COSTE <changaco@changaco.net>
parents: 201
diff changeset
315 p.create_duplicate_on_xmpp()
84
844ccdcf66be Fixed callbacks, addParticipant, removeParticipant and __del__ in bridge.py
Charly COSTE <changaco@changaco.net>
parents: 72
diff changeset
316 else:
100
6289ac5a2db7 Reconnect when a connection is closed
Charly COSTE <changaco@changaco.net>
parents: 97
diff changeset
317 if left_protocol == 'irc':
6289ac5a2db7 Reconnect when a connection is closed
Charly COSTE <changaco@changaco.net>
parents: 97
diff changeset
318 was_on_both = False
6289ac5a2db7 Reconnect when a connection is closed
Charly COSTE <changaco@changaco.net>
parents: 97
diff changeset
319 elif left_protocol == 'xmpp':
240
ebd67e3e4866 fix for Bridge.remove_participant, bug introduced in d875cbf0a544e6ad0c640f3afedbc2c87fb4db9c
Charly COSTE <changaco@changaco.net>
parents: 237
diff changeset
320 if isinstance(p.muc, xmpp.muc) and not p.muc.connected:
233
4ad8e985c7d3 tried to fix Bridge.remove_participant
Charly COSTE <changaco@changaco.net>
parents: 231
diff changeset
321 return
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
322 # got disconnected somehow
100
6289ac5a2db7 Reconnect when a connection is closed
Charly COSTE <changaco@changaco.net>
parents: 97
diff changeset
323 if isinstance(p.xmpp_c, xmpp.client.Client):
6289ac5a2db7 Reconnect when a connection is closed
Charly COSTE <changaco@changaco.net>
parents: 97
diff changeset
324 self.bot.reopen_xmpp_connection(p.xmpp_c)
6289ac5a2db7 Reconnect when a connection is closed
Charly COSTE <changaco@changaco.net>
parents: 97
diff changeset
325 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
326
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
327 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
328 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
329
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 if was_on_both == True:
180
102f895347ff added a required "importance" argument to Bot.error()
Charly COSTE <changaco@changaco.net>
parents: 179
diff changeset
331 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
332
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 elif was_on_both == False:
180
102f895347ff added a required "importance" argument to Bot.error()
Charly COSTE <changaco@changaco.net>
parents: 179
diff changeset
334 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
335 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
336 if left_protocol == 'xmpp':
118
b29fd5696a78 new mode bypass and new method bridge.changeMode
Charly COSTE <changaco@changaco.net>
parents: 115
diff changeset
337 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
338 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
339 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
340 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
341 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
342
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
343 else:
201
de574314990e log some more things when Bot.debug is False
Charly COSTE <changaco@changaco.net>
parents: 197
diff changeset
344 self.bot.error(say_levels.debug, '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), send_to_admins=True)
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
345
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
346
205
85a8b457c4b4 bugfix, added optional "message" argument to Bridge.restart(), needed since fa73f1292eafabf2ef868c2b056fe045a0704e97
Charly COSTE <changaco@changaco.net>
parents: 203
diff changeset
347 def restart(self, message='Restarting bridge', log=True):
103
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
348 """Restart the bridge"""
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
349
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
350 # Stop the bridge
205
85a8b457c4b4 bugfix, added optional "message" argument to Bridge.restart(), needed since fa73f1292eafabf2ef868c2b056fe045a0704e97
Charly COSTE <changaco@changaco.net>
parents: 203
diff changeset
351 self.stop(message=message, log=log)
103
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
352
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
353 # Recreate the bridge
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
354 self.init2()
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
355
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
356
180
102f895347ff added a required "importance" argument to Bot.error()
Charly COSTE <changaco@changaco.net>
parents: 179
diff changeset
357 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
358 """Make the bot say something."""
180
102f895347ff added a required "importance" argument to Bot.error()
Charly COSTE <changaco@changaco.net>
parents: 179
diff changeset
359 if log or send_to_admins:
102f895347ff added a required "importance" argument to Bot.error()
Charly COSTE <changaco@changaco.net>
parents: 179
diff changeset
360 self.bot.error(importance, message+' ('+str(self)+')', send_to_admins=send_to_admins)
197
4a379eb359dd bugfix, forgot "importance" argument of Bridge.say() in c5922031a4ac09c95713c4a4a18b1e0a0aad3e54
Charly COSTE <changaco@changaco.net>
parents: 195
diff changeset
361 if importance != -1:
4a379eb359dd bugfix, forgot "importance" argument of Bridge.say() in c5922031a4ac09c95713c4a4a18b1e0a0aad3e54
Charly COSTE <changaco@changaco.net>
parents: 195
diff changeset
362 message = self.bot.format_message(importance, message)
4a379eb359dd bugfix, forgot "importance" argument of Bridge.say() in c5922031a4ac09c95713c4a4a18b1e0a0aad3e54
Charly COSTE <changaco@changaco.net>
parents: 195
diff changeset
363 if importance < self.say_level:
4a379eb359dd bugfix, forgot "importance" argument of Bridge.say() in c5922031a4ac09c95713c4a4a18b1e0a0aad3e54
Charly COSTE <changaco@changaco.net>
parents: 195
diff changeset
364 return
213
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
365 if on_xmpp:
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
366 self._say_on_xmpp(message)
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
367 if on_irc:
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
368 self._say_on_irc(message)
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
369
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
370
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
371 def say_on_behalf(self, nickname, message, on_protocol, action=False):
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
372 if action:
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
373 message = '* '+nickname+' '+message
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
374 else:
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
375 message = '<'+nickname+'> '+message
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
376
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
377 if on_protocol == 'xmpp':
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
378 self._say_on_xmpp(message)
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
379 elif on_protocol == 'irc':
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
380 self._say_on_irc(message)
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
381
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
382
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
383 def _say_on_irc(self, message):
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
384 self.irc_connection.privmsg(self.irc_room, message)
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
385
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
386
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
387 def _say_on_xmpp(self, message):
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py
Charly COSTE <changaco@changaco.net>
parents: 206
diff changeset
388 self.xmpp_room.say(message)
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
389
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
390
152
17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on())
Charly COSTE <changaco@changaco.net>
parents: 150
diff changeset
391 def show_participants_list_on(self, protocols=[]):
219
63289aa1dea7 moved "nicknametoolong" and ServerConnection.really_connected handling to irclib, renamed ServerConnection.really_connected to .logged_in
Charly COSTE <changaco@changaco.net>
parents: 216
diff changeset
392 if 'irc' in protocols and self.irc_connection.logged_in:
152
17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on())
Charly COSTE <changaco@changaco.net>
parents: 150
diff changeset
393 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
394 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
395 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
396 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
397 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
398
17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on())
Charly COSTE <changaco@changaco.net>
parents: 150
diff changeset
399
237
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
400 def soft_restart(self, message='Softly restarting bridge', log=True):
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
401 """Make the bot leave and rejoin, avoid presence flood but can leave ghosts"""
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
402
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
403 if log:
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
404 self.bot.error(-1, message+' '+str(self), send_to_admins=True)
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
405
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
406 # Leave
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
407 if isinstance(self.irc_connection, ServerConnection) and isinstance(self.xmpp_room, xmpp.muc):
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
408 self.irc_connection.part(self.irc_room, message=message)
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
409 self.xmpp_room.leave(message=message)
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
410 else:
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
411 self.stop()
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
412 self.init2()
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
413 return
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
414
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
415 # Rejoin
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
416 self.irc_connection.join(self.irc_room, callback=self._irc_join_callback)
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
417 self.xmpp_room.rejoin(callback=self._xmpp_join_callback)
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
418
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
419
193
c2a8586e64b5 handle IRC inviteonlychan event, improved error messages
Charly COSTE <changaco@changaco.net>
parents: 192
diff changeset
420 def stop(self, message='Stopping bridge', log=True):
103
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
421 """Stop the bridge"""
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
422
237
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
423 if log:
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
424 self.bot.error(-1, message+' '+str(self), send_to_admins=True)
71c23e30cd6c created Bridge.soft_restart
Charly COSTE <changaco@changaco.net>
parents: 233
diff changeset
425
103
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
426 # 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
427 if isinstance(self.irc_connection, ServerConnection):
970a6b4ac6ce Minor fixes
Charly COSTE <changaco@changaco.net>
parents: 105
diff changeset
428 self.irc_connection.used_by -= 1
970a6b4ac6ce Minor fixes
Charly COSTE <changaco@changaco.net>
parents: 105
diff changeset
429 if self.irc_connection.used_by < 1:
970a6b4ac6ce Minor fixes
Charly COSTE <changaco@changaco.net>
parents: 105
diff changeset
430 self.irc_connection.close(message)
970a6b4ac6ce Minor fixes
Charly COSTE <changaco@changaco.net>
parents: 105
diff changeset
431 else:
970a6b4ac6ce Minor fixes
Charly COSTE <changaco@changaco.net>
parents: 105
diff changeset
432 self.irc_connection.part(self.irc_room, message=message)
970a6b4ac6ce Minor fixes
Charly COSTE <changaco@changaco.net>
parents: 105
diff changeset
433 self.irc_connection = None
103
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
434
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
435 # Leave the MUC
109
970a6b4ac6ce Minor fixes
Charly COSTE <changaco@changaco.net>
parents: 105
diff changeset
436 if isinstance(self.xmpp_room, xmpp.muc):
970a6b4ac6ce Minor fixes
Charly COSTE <changaco@changaco.net>
parents: 105
diff changeset
437 self.xmpp_room.leave(message=message)
970a6b4ac6ce Minor fixes
Charly COSTE <changaco@changaco.net>
parents: 105
diff changeset
438 self.xmpp_room.__del__()
970a6b4ac6ce Minor fixes
Charly COSTE <changaco@changaco.net>
parents: 105
diff changeset
439 self.xmpp_room = None
103
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
440
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
441 # Delete participants objects
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
442 for p in self.participants:
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
443 p.leave(message)
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
444 self.participants = []
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
445
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
446
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
447 def __str__(self):
103
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
448 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
449
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
450
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
451 def __del__(self):
103
23416c27b592 New command system
Charly COSTE <changaco@changaco.net>
parents: 102
diff changeset
452 self.stop(message='Removing bridge')