xib: bot.py annotate

annotate bot.py @ 225:da8fbaf69242

fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Signed-off-by: Charly COSTE <changaco@changaco.net>

author	Charly COSTE <changaco@changaco.net>
date	Sun, 07 Mar 2010 19:01:57 +0100
parents	1a82d5d40d90
children	3c493741e53a

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: 122 diff changeset	18 import re
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	19 import sys
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	20 import threading
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	21 from time import sleep
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	22 import traceback
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	23 import xml.parsers.expat
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	24
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	25 import irclib
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	26 import muc
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	27 xmpp = muc.xmpp
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	28 del muc
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	29
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	30 from bridge import Bridge
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	31 from participant import Participant
134 931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	32 import commands
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	33 import say_levels
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	34
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	35
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	36 class Bot(threading.Thread):
99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	37
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	38 def __init__(self, jid, password, nickname, admins=[], error_fd=sys.stderr, debug=False):
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	39 threading.Thread.__init__(self)
155 63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	40 self.halt = False
171 489c157d9e82 display error when bot creation fails Charly COSTE <changaco@changaco.net> parents: 166 diff changeset	41 self.bridges = []
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	42 self.bare_jid = xmpp.protocol.JID(jid=jid)
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	43 self.bare_jid.setResource('')
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	44 self.nickname = nickname
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	45 self.password = password
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	46 self.error_fd = error_fd
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	47 self.debug = debug
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	48 self.admins = admins
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	49 self.xmpp_connections = {}
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	50 self.irc = irclib.IRC()
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	51 self.irc.bot = self
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	52 self.irc.add_global_handler('all_events', self._irc_event_handler)
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	53 self.irc_thread = threading.Thread(target=self.irc.process_forever)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	54 self.irc_thread.start()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	55 # Open connection with XMPP server
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	56 try:
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	57 self.xmpp_c = self.get_xmpp_connection(self.nickname)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	58 except:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	59 self.error(say_levels.error, 'XMPP Connection failed')
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	60 raise
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	61 self.xmpp_thread = threading.Thread(target=self._xmpp_loop)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	62 self.xmpp_thread.start()
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	63
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	64
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	65 def error(self, importance, message, debug=False, no_debug_add='', 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: 14 diff changeset	66 """Output an error message."""
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	67 if not self.debug:
de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	68 message += no_debug_add
86 bfa32b017fc9 First hack at an error notification system Charly COSTE <changaco@changaco.net> parents: 79 diff changeset	69 if send_to_admins == True:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	70 self._send_message_to_admins(importance, message)
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	71 if importance == -1:
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	72 return
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	73 if not debug:
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	74 self.error_fd.write(self.format_message(importance, message).encode('utf-8')+'\n')
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	75 elif self.debug:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	76 self.error_fd.write('='*importance+'> '+message.encode('utf-8')+'\n')
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	77
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	78
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	79 def _xmpp_loop(self):
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	80 """[Internal] XMPP infinite loop."""
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	81 i = 1
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	82 while True:
155 63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	83 if self.halt:
63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	84 s = len(self.xmpp_connections)
63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	85 for i in range(s):
63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	86 self.close_xmpp_connection(self.xmpp_connections.keys()[s-i-1], force=True)
63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	87 break
79 73a30fc1922b Fixed the XMPP loop (release the lock) Charly COSTE <changaco@changaco.net> parents: 78 diff changeset	88 unlock = False
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	89 try:
51 2737ed5b9003 Tried to improve the XMPP loop, again. Charly COSTE <changaco@changaco.net> parents: 50 diff changeset	90 if len(self.xmpp_connections) == 1:
2737ed5b9003 Tried to improve the XMPP loop, again. Charly COSTE <changaco@changaco.net> parents: 50 diff changeset	91 sleep(0.5) # avoid bot connection being locked all the time
101 29d3b85c6286 Minor fixes/improvements Charly COSTE <changaco@changaco.net> parents: 100 diff changeset	92 for j, c in enumerate(self.xmpp_connections.itervalues()):
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	93 i += 1
51 2737ed5b9003 Tried to improve the XMPP loop, again. Charly COSTE <changaco@changaco.net> parents: 50 diff changeset	94 if hasattr(c, 'lock'):
49 714e78fb912e Tried to improve thread-safety during XMPP connection closing. Charly COSTE <changaco@changaco.net> parents: 48 diff changeset	95 c.lock.acquire()
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	96 if i == j:
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	97 ping = xmpp.protocol.Iq(typ='get')
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	98 ping.addChild(name='ping', namespace='urn:xmpp:ping')
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	99 self.error(1, 'sending XMPP ping', debug=True)
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	100 c.pings.append(c.send(ping))
52 5aabf124c78d Fixed XMPP connection closing and the XMPP loop Charly COSTE <changaco@changaco.net> parents: 51 diff changeset	101 if hasattr(c, 'Process'):
5aabf124c78d Fixed XMPP connection closing and the XMPP loop Charly COSTE <changaco@changaco.net> parents: 51 diff changeset	102 c.Process(0.01)
5aabf124c78d Fixed XMPP connection closing and the XMPP loop Charly COSTE <changaco@changaco.net> parents: 51 diff changeset	103 c.lock.release()
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	104 if i > 5000:
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	105 i = 0
51 2737ed5b9003 Tried to improve the XMPP loop, again. Charly COSTE <changaco@changaco.net> parents: 50 diff changeset	106 except RuntimeError:
2737ed5b9003 Tried to improve the XMPP loop, again. Charly COSTE <changaco@changaco.net> parents: 50 diff changeset	107 pass
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	108 except (xml.parsers.expat.ExpatError, xmpp.protocol.XMLNotWellFormed):
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	109 self.error(1, 'invalid stanza', debug=True)
101 29d3b85c6286 Minor fixes/improvements Charly COSTE <changaco@changaco.net> parents: 100 diff changeset	110 self.reopen_xmpp_connection(c)
79 73a30fc1922b Fixed the XMPP loop (release the lock) Charly COSTE <changaco@changaco.net> parents: 78 diff changeset	111 unlock = True
91 69e4fc0f015c Tried to fix XMPP «Replaced by new connection» problem Charly COSTE <changaco@changaco.net> parents: 90 diff changeset	112 except xmpp.Conflict:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	113 self.error(1, 'conflict', debug=True)
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	114 self.reopen_xmpp_connection(c)
91 69e4fc0f015c Tried to fix XMPP «Replaced by new connection» problem Charly COSTE <changaco@changaco.net> parents: 90 diff changeset	115 unlock = True
51 2737ed5b9003 Tried to improve the XMPP loop, again. Charly COSTE <changaco@changaco.net> parents: 50 diff changeset	116 except:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	117 error = 'Unknown exception on XMPP thread:\n'+traceback.format_exc()
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	118 self.error(say_levels.error, error, send_to_admins=True)
79 73a30fc1922b Fixed the XMPP loop (release the lock) Charly COSTE <changaco@changaco.net> parents: 78 diff changeset	119 unlock = True
73a30fc1922b Fixed the XMPP loop (release the lock) Charly COSTE <changaco@changaco.net> parents: 78 diff changeset	120 if unlock == True:
73a30fc1922b Fixed the XMPP loop (release the lock) Charly COSTE <changaco@changaco.net> parents: 78 diff changeset	121 c.lock.release()
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	122
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	123
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	124 def _xmpp_presence_handler(self, dispatcher, presence):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	125 """[Internal] Manage XMPP presence."""
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	126
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	127 xmpp_c = dispatcher._owner
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	128
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	129 if xmpp_c.nickname != self.nickname:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	130 self.error(1, 'Skipping XMPP presence not received on bot connection.', 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: 14 diff changeset	131 return
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	132
202 2a1ee46f86af don't log presence from self Charly COSTE <changaco@changaco.net> parents: 201 diff changeset	133 from_ = xmpp.protocol.JID(presence.getFrom())
2a1ee46f86af don't log presence from self Charly COSTE <changaco@changaco.net> parents: 201 diff changeset	134 bare_jid = unicode(from_.getNode()+'@'+from_.getDomain())
2a1ee46f86af don't log presence from self Charly COSTE <changaco@changaco.net> parents: 201 diff changeset	135
2a1ee46f86af don't log presence from self Charly COSTE <changaco@changaco.net> parents: 201 diff changeset	136 if bare_jid == self.bare_jid:
2a1ee46f86af don't log presence from self Charly COSTE <changaco@changaco.net> parents: 201 diff changeset	137 self.error(1, 'Ignoring XMPP presence from self', debug=True)
2a1ee46f86af don't log presence from self Charly COSTE <changaco@changaco.net> parents: 201 diff changeset	138 return
2a1ee46f86af don't log presence from self Charly COSTE <changaco@changaco.net> parents: 201 diff changeset	139
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	140 self.error(2, 'Received XMPP presence.\n'+presence.__str__(fancy=1), debug=True)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	141
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	142 no_debug_add = '\n'+presence.__str__(fancy=1)
de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	143
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	144 for bridge in self.bridges:
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	145 if bare_jid == bridge.xmpp_room_jid:
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	146 # presence comes from a muc
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	147 resource = unicode(from_.getResource())
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	148
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	149 if resource == '':
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	150 # presence comes from the muc itself
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	151 pass
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	152
108 dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	153 elif resource == xmpp_c.nickname:
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	154 # presence comes from self
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	155 x = presence.getTag('x', namespace='http://jabber.org/protocol/muc#user')
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	156 if x:
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	157 d = x.getTag('destroy')
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	158 if d:
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	159 # room was destroyed
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	160 # problem is that this is used by some MUC servers when they shut down or restart
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	161 # considering this lack of semantic we have no choice but to do a check on the reason
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	162 reason = d.getTag('reason')
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	163 if reason:
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	164 r = reason.getData()
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	165 if r == 'The conference component is shutting down':
121 765e460bc20a Restart all bridges connected to a MUC server when it goes down Charly COSTE <changaco@changaco.net> parents: 119 diff changeset	166 # MUC server is going down, try to restart the bridges in 1 minute
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: 213 diff changeset	167 bridges = self.iter_bridges(patterns=[from_.getDomain()])
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	168 m = 'The MUC server '+from_.getDomain()+' seems to be going down, the bot will try to recreate all bridges related to this server in 1 minute'
190 6db99e458168 fixed calls to Bot.restart_bridges_delayed(), arguments changed in f52cb2f6e273328e73d75ab4ecf214c8dc9dfe1b Charly COSTE <changaco@changaco.net> parents: 188 diff changeset	169 error = [say_levels.warning, m]
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	170 self.restart_bridges_delayed(bridges, 60, error)
108 dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	171 return
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	172 elif r == '':
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	173 r = 'None given'
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	174 else:
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	175 r = 'None given'
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	176
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	177 # room has been destroyed, stop the bridge
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	178 self.error(say_levels.error, 'The MUC room of the bridge '+str(bridge)+' has been destroyed with reason "'+r+'", stopping the bridge', send_to_admins=True)
193 c2a8586e64b5 handle IRC inviteonlychan event, improved error messages Charly COSTE <changaco@changaco.net> parents: 190 diff changeset	179 bridge.stop(message='The MUC room has been destroyed with reason "'+r+'", stopping the bridge')
108 dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	180
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	181 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	182 # presence comes from a participant of the muc
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	183
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	184 x = presence.getTag('x', namespace='http://jabber.org/protocol/muc#user')
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	185 item = None
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	186 if x:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	187 item = x.getTag('item')
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	188
93 c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	189 if presence.getType() == 'unavailable':
96 dd7e1b935894 Code cleaning Charly COSTE <changaco@changaco.net> parents: 93 diff changeset	190 try:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	191 p = bridge.get_participant(resource)
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	192 except Bridge.NoSuchParticipantException:
96 dd7e1b935894 Code cleaning Charly COSTE <changaco@changaco.net> parents: 93 diff changeset	193 p = None
dd7e1b935894 Code cleaning Charly COSTE <changaco@changaco.net> parents: 93 diff changeset	194
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	195 if x and x.getTag('status', attrs={'code': '303'}):
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	196 # participant changed its nickname
93 c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	197 if p == None:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	198 return
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	199 if p.protocol != 'xmpp':
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	200 return
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	201 item = x.getTag('item')
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	202 if not item:
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	203 self.error(say_levels.debug, 'bad stanza, no item element', no_debug_add=no_debug_add)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	204 return
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	205 new_nick = item.getAttr('nick')
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	206 if not new_nick:
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	207 self.error(say_levels.debug, 'bad stanza, new nick is not given', no_debug_add=no_debug_add)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	208 return
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	209 p.change_nickname(new_nick, 'irc')
93 c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	210
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	211 elif x and x.getTag('status', attrs={'code': '307'}):
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	212 # participant was kicked
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	213 if p == None:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	214 bridge.xmpp_room.rejoin()
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	215 return
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	216 if isinstance(p.xmpp_c, xmpp.client.Client):
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	217 p.muc.rejoin()
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	218 else:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	219 if item:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	220 reason = item.getTag('reason')
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	221 actor = item.getTag('actor')
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	222 if actor and actor.has_attr('jid'):
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	223 kicker = actor.getAttr('jid')
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	224 s1 = 'Kicked by '+kicker
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	225 else:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	226 s1 = 'Kicked from XMPP'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	227 if reason:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	228 s2 = ' with reason: '+reason.getData()
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	229 else:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	230 s2 = ' (no reason was given)'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	231 else:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	232 s1 = 'Kicked from XMPP'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	233 s2 = ' (no reason was given)'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	234
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	235 bridge.remove_participant('xmpp', p.nickname, s1+s2)
93 c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	236
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	237 elif x and x.getTag('status', attrs={'code': '301'}):
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	238 # participant was banned
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	239 if p == None:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	240 bridge.say(say_levels.error, 'bot got banned from XMPP', on_xmpp=False, send_to_admins=True)
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	241 self.remove_bridge(bridge)
93 c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	242 return
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	243 if item:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	244 reason = item.getTag('reason')
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	245 actor = item.getTag('actor')
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	246 if actor and actor.has_attr('jid'):
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	247 kicker = actor.getAttr('jid')
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	248 s1 = 'Banned by '+kicker
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	249 else:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	250 s1 = 'Banned from XMPP'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	251 if reason:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	252 s2 = ' with reason: '+reason.getData()
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	253 else:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	254 s2 = ' (no reason was given)'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	255 else:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	256 s1 = 'Banned from XMPP'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	257 s2 = ' (no reason was given)'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	258
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	259 bridge.remove_participant('xmpp', p.nickname, s1+s2)
93 c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	260
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	261 else:
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	262 # participant left
99 5390e9abfa44 Don't try to remove a participant that does not exist Charly COSTE <changaco@changaco.net> parents: 96 diff changeset	263 if p != None:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	264 bridge.remove_participant('xmpp', resource, presence.getStatus())
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	265
111 59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	266 elif presence.getType() == 'error':
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	267 error = presence.getTag('error')
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	268 if error:
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	269 for c in error.getChildren():
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	270 if c.getNamespace() == 'urn:ietf:params:xml:ns:xmpp-stanzas' and c.getName() != 'text':
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	271 err = error.getAttr('type')+' '+c.getName()
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	272 if err == 'cancel remote-server-not-found':
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	273 # Remote server not found
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	274 # Stop bridges that depend on this server
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: 213 diff changeset	275 bridges = self.iter_bridges(patterns=[from_.getDomain()])
190 6db99e458168 fixed calls to Bot.restart_bridges_delayed(), arguments changed in f52cb2f6e273328e73d75ab4ecf214c8dc9dfe1b Charly COSTE <changaco@changaco.net> parents: 188 diff changeset	276 error = [say_levels.error, 'XMPP Remote server not found: '+from_.getDomain()]
6db99e458168 fixed calls to Bot.restart_bridges_delayed(), arguments changed in f52cb2f6e273328e73d75ab4ecf214c8dc9dfe1b Charly COSTE <changaco@changaco.net> parents: 188 diff changeset	277 self.restart_bridges_delayed(bridges, 60, error)
111 59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	278 else:
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	279 raise Exception(presence.__str__(fancy=1).encode('utf-8'))
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	280
96 dd7e1b935894 Code cleaning Charly COSTE <changaco@changaco.net> parents: 93 diff changeset	281 elif resource != bridge.bot.nickname:
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	282 real_jid = None
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	283 if item and item.has_attr('jid'):
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	284 real_jid = item.getAttr('jid')
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	285
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	286 p = bridge.add_participant('xmpp', resource, real_jid)
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	287
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	288 # if we have the real jid check if the participant is a bot admin
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	289 if real_jid and isinstance(p, Participant):
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	290 for admin in self.admins:
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	291 if xmpp.protocol.JID(admin.jid).bareMatch(real_jid):
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	292 p.bot_admin = True
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	293 break
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	294
96 dd7e1b935894 Code cleaning Charly COSTE <changaco@changaco.net> parents: 93 diff changeset	295 return
dd7e1b935894 Code cleaning Charly COSTE <changaco@changaco.net> parents: 93 diff changeset	296
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	297 return
200 740effa74c18 bugfix for previous commit, forgot "self" argument for say_on_XMPP_through_bridge Charly COSTE <changaco@changaco.net> parents: 199 diff changeset	298
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	299 self.error(say_levels.debug, 'Unhandled XMPP presence', no_debug_add='\n'+presence.__str__(fancy=1))
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	300
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	301
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	302 def _xmpp_iq_handler(self, dispatcher, iq):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	303 """[Internal] Manage XMPP IQs."""
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	304
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	305 xmpp_c = dispatcher._owner
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	306
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	307 # Ignore pongs
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	308 if iq.getType() in ['result', 'error'] and iq.getID() in xmpp_c.pings:
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	309 xmpp_c.pings.remove(iq.getID())
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	310 self.error(1, 'received XMPP pong', debug=True)
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	311 return
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	312
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	313 self.error(2, 'Received XMPP iq.\n'+iq.__str__(fancy=1), debug=True)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	314
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	315
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	316 def _xmpp_message_handler(self, dispatcher, message):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	317 """[Internal] Manage XMPP messages."""
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	318
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	319 xmpp_c = dispatcher._owner
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	320
34 57d0e66378b0 Fixed XMPP message handling and removed disconnect handler. Charly COSTE <changaco@changaco.net> parents: 33 diff changeset	321 if message.getBody() == None:
57d0e66378b0 Fixed XMPP message handling and removed disconnect handler. Charly COSTE <changaco@changaco.net> parents: 33 diff changeset	322 return
57d0e66378b0 Fixed XMPP message handling and removed disconnect handler. Charly COSTE <changaco@changaco.net> parents: 33 diff changeset	323
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	324 if message.getType() == 'chat':
11 79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	325 from_bare_jid = unicode(message.getFrom().getNode()+'@'+message.getFrom().getDomain())
79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	326 for bridge in self.bridges:
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	327 if from_bare_jid == bridge.xmpp_room_jid:
11 79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	328 # message comes from a room participant
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	329
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	330 self.error(2, 'Received XMPP chat message.\n'+message.__str__(fancy=1), debug=True)
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	331
11 79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	332 try:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	333 from_ = bridge.get_participant(message.getFrom().getResource())
2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	334 to_ = bridge.get_participant(xmpp_c.nickname)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	335
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	336 from_.say_on_irc_to(to_.nickname, message.getBody())
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	337
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	338 except Bridge.NoSuchParticipantException:
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	339 if xmpp_c.nickname == self.nickname:
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	340 r = self.respond(str(message.getBody()), participant=from_)
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	341 if isinstance(r, basestring) and len(r) > 0:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	342 s = xmpp.protocol.Message(to=message.getFrom(), body=r, typ='chat')
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	343 self.error(2, 'Sending\n'+s.__str__(fancy=1), debug=True)
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	344 xmpp_c.send(s)
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	345 else:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	346 self.error(1, 'won\'t answer.', debug=True)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	347 return
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	348 self.error(say_levels.debug, 'XMPP chat message not relayed', no_debug_add='\n'+message.__str__(fancy=1))
11 79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	349 return
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	350
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	351 # message does not come from a room
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	352 if xmpp_c.nickname == self.nickname:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	353 self.error(2, 'Received XMPP chat message.\n'+message.__str__(fancy=1), debug=True)
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	354
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	355 # Find out if the message comes from a bot admin
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	356 bot_admin = False
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	357 for admin in self.admins:
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	358 if xmpp.protocol.JID(admin.jid).bareMatch(message.getFrom()):
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	359 bot_admin = True
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	360 break
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	361
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	362 # Respond
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	363 r = self.respond(str(message.getBody()), bot_admin=bot_admin)
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	364 if isinstance(r, basestring) and len(r) > 0:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	365 s = xmpp.protocol.Message(to=message.getFrom(), body=r, typ='chat')
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	366 self.error(2, 'Sending\n'+s.__str__(fancy=1), debug=True)
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	367 xmpp_c.send(s)
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	368
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	369 else:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	370 self.error(1, 'Ignoring XMPP chat message not received on bot connection.', debug=True)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	371
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	372 elif message.getType() == 'groupchat':
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	373 # message comes from a room
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	374
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	375 for child in message.getChildren():
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	376 if child.getName() == 'delay':
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	377 # MUC delayed message
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	378 return
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	379
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	380 if xmpp_c.nickname != self.nickname:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	381 self.error(1, 'Ignoring XMPP MUC message not received on bot connection.', 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: 14 diff changeset	382 return
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	383
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	384
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	385 from_ = xmpp.protocol.JID(message.getFrom())
23 abdb7a2b6c6d Minor fixes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	386
abdb7a2b6c6d Minor fixes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	387 if unicode(from_.getResource()) == self.nickname:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	388 self.error(1, 'Ignoring XMPP MUC message sent by self.', debug=True)
23 abdb7a2b6c6d Minor fixes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	389 return
abdb7a2b6c6d Minor fixes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	390
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	391 room_jid = unicode(from_.getNode()+'@'+from_.getDomain())
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	392 for bridge in self.bridges:
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	393 if room_jid == bridge.xmpp_room_jid:
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	394 resource = unicode(from_.getResource())
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	395 if resource == '':
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	396 # message comes from the room itself
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	397 self.error(1, 'Ignoring XMPP groupchat message sent by the room.', 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: 14 diff changeset	398 return
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	399 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	400 # message comes from a participant of the room
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	401 self.error(2, 'Received XMPP groupchat message.\n'+message.__str__(fancy=1), 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: 14 diff changeset	402
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	403 try:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	404 participant = bridge.get_participant(resource)
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	405 except Bridge.NoSuchParticipantException:
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	406 if resource != self.nickname:
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	407 self.error(say_levels.debug, 'NoSuchParticipantException "'+resource+'" on "'+str(bridge)+'", WTF ?', no_debug_add='\n'+message.__str__(fancy=1))
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	408 return
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	409
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	410 participant.say_on_irc(message.getBody())
37 7e500d4064fb Cosmetics. Charly COSTE <changaco@changaco.net> parents: 35 diff changeset	411 return
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	412
105 d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	413 elif message.getType() == 'error':
d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	414 for b in self.bridges:
d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	415 if message.getFrom() == b.xmpp_room_jid:
d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	416 # message comes from a room
d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	417 for c in message.getChildren():
d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	418 if c.getName() == 'error':
d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	419 for cc in c.getChildren():
d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	420 if cc.getNamespace() == 'urn:ietf:params:xml:ns:xmpp-stanzas' and cc.getName() != 'text':
d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	421 err = cc.getName()
199 dcabe54deeba improved an XMPP error handling, created Participant.say_on_XMPP_through_bridge() Charly COSTE <changaco@changaco.net> parents: 198 diff changeset	422 if err in ['not-acceptable', 'not-allowed']:
105 d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	423 # we sent a message to a room we are not in
199 dcabe54deeba improved an XMPP error handling, created Participant.say_on_XMPP_through_bridge() Charly COSTE <changaco@changaco.net> parents: 198 diff changeset	424 # can be due to a MUC server restart
dcabe54deeba improved an XMPP error handling, created Participant.say_on_XMPP_through_bridge() Charly COSTE <changaco@changaco.net> parents: 198 diff changeset	425 # can be a concurrency bug
dcabe54deeba improved an XMPP error handling, created Participant.say_on_XMPP_through_bridge() Charly COSTE <changaco@changaco.net> parents: 198 diff changeset	426 if xmpp_c.nickname == self.nickname:
dcabe54deeba improved an XMPP error handling, created Participant.say_on_XMPP_through_bridge() Charly COSTE <changaco@changaco.net> parents: 198 diff changeset	427 b.restart(message='Automatic restart of bridge')
dcabe54deeba improved an XMPP error handling, created Participant.say_on_XMPP_through_bridge() Charly COSTE <changaco@changaco.net> parents: 198 diff changeset	428 else:
dcabe54deeba improved an XMPP error handling, created Participant.say_on_XMPP_through_bridge() Charly COSTE <changaco@changaco.net> parents: 198 diff changeset	429 try:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	430 p = b.get_participant(xmpp_c.nickname)
199 dcabe54deeba improved an XMPP error handling, created Participant.say_on_XMPP_through_bridge() Charly COSTE <changaco@changaco.net> parents: 198 diff changeset	431 p.say_on_XMPP_through_bridge(message.getBody())
dcabe54deeba improved an XMPP error handling, created Participant.say_on_XMPP_through_bridge() Charly COSTE <changaco@changaco.net> parents: 198 diff changeset	432 except Bridge.NoSuchParticipantException:
dcabe54deeba improved an XMPP error handling, created Participant.say_on_XMPP_through_bridge() Charly COSTE <changaco@changaco.net> parents: 198 diff changeset	433 b.restart(message='Automatic restart of bridge')
dcabe54deeba improved an XMPP error handling, created Participant.say_on_XMPP_through_bridge() Charly COSTE <changaco@changaco.net> parents: 198 diff changeset	434
105 d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	435 elif err == 'forbidden':
d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	436 # we don't have the permission to speak
d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	437 # let's remove the bridge and tell admins
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	438 self.error(say_levels.error, 'Not allowed to speak on the XMPP MUC of bridge '+str(b)+', stopping it', send_to_admins=True)
193 c2a8586e64b5 handle IRC inviteonlychan event, improved error messages Charly COSTE <changaco@changaco.net> parents: 190 diff changeset	439 b.stop(message='Not allowed to speak on the XMPP MUC, stopping the bridge')
105 d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	440 else:
200 740effa74c18 bugfix for previous commit, forgot "self" argument for say_on_XMPP_through_bridge Charly COSTE <changaco@changaco.net> parents: 199 diff changeset	441 self.error(say_levels.debug, 'recevied unknown error message\n'+message.__str__(fancy=1))
105 d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	442 return
d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	443
200 740effa74c18 bugfix for previous commit, forgot "self" argument for say_on_XMPP_through_bridge Charly COSTE <changaco@changaco.net> parents: 199 diff changeset	444 self.error(say_levels.debug, 'received unknown error message\n'+message.__str__(fancy=1))
105 d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	445
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	446 else:
200 740effa74c18 bugfix for previous commit, forgot "self" argument for say_on_XMPP_through_bridge Charly COSTE <changaco@changaco.net> parents: 199 diff changeset	447 self.error(say_levels.debug, 'Received XMPP message of unknown type "'+str(message.getType())+'".\n'+message.__str__(fancy=1))
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	448
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 def _irc_event_handler(self, connection, event):
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	451 """[Internal] Manage IRC events"""
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	452
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	453 # Answer ping
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	454 if event.eventtype() == 'ping':
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	455 connection.pong(connection.get_server_name())
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	456 return
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	457
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	458
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	459 # Events we always want to ignore
166 0fc24e232997 some fixes related to IRC nicknames Charly COSTE <changaco@changaco.net> parents: 156 diff changeset	460 if 'all' in event.eventtype() or 'motd' in event.eventtype() or event.eventtype() in ['nicknameinuse', 'nickcollision', 'erroneusnickname']:
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	461 return
225 da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	462 if event.eventtype() in ['pong', 'privnotice', 'ctcp', 'nochanmodes', 'notexttosend', 'currenttopic', 'topicinfo', '328', 'pubnotice', '042', 'umode', 'welcome', 'yourhost', 'created', 'myinfo', 'featurelist', 'luserclient', 'luserop', 'luserchannels', 'luserme', 'n_local', 'n_global', 'endofnames', 'luserunknown', 'luserconns', 'inviteonlychan', 'bannedfromchan', 'channelisfull', 'badchannelkey']:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	463 self.error(1, 'ignoring IRC '+event.eventtype(), 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: 14 diff changeset	464 return
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	465
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	466
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	467 nickname = None
220 5726a0833537 minor syntax change in bot.py Charly COSTE <changaco@changaco.net> parents: 219 diff changeset	468 if event.source() and '!' in event.source():
5726a0833537 minor syntax change in bot.py Charly COSTE <changaco@changaco.net> parents: 219 diff changeset	469 nickname = event.source().split('!')[0]
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	470
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	471
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	472 # A string representation of the event
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	473 event_str = '\nconnection='+connection.__str__()+'\neventtype='+event.eventtype()+'\nsource='+repr(event.source())+'\ntarget='+repr(event.target())+'\narguments='+repr(event.arguments())
de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	474 debug_str = 'Received IRC event.'+event_str
179 f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	475 printed_event = False
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	476
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	477
53 a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	478 if event.eventtype() in ['pubmsg', 'action', 'privmsg', 'quit', 'part', 'nick', 'kick']:
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	479 if nickname == None:
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	480 return
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	481
39 3b06450d60cd Improved debug output. Charly COSTE <changaco@changaco.net> parents: 37 diff changeset	482 handled = False
3b06450d60cd Improved debug output. Charly COSTE <changaco@changaco.net> parents: 37 diff changeset	483
179 f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	484 if event.eventtype() in ['quit', 'part'] and nickname == self.nickname:
f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	485 return
f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	486
53 a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	487 if event.eventtype() in ['quit', 'part', 'nick', 'kick']:
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	488 if connection.real_nickname != self.nickname:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	489 self.error(1, 'ignoring IRC '+event.eventtype()+' not received on bot connection', debug=True)
53 a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	490 return
a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	491 else:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	492 self.error(2, debug_str, debug=True)
179 f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	493 printed_event = True
53 a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	494
a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	495 if event.eventtype() == 'kick' and len(event.arguments()) < 1:
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	496 self.error(say_levels.debug, 'at least 1 argument is needed for a '+event.eventtype()+' event', no_debug_add=event_str)
53 a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	497 return
39 3b06450d60cd Improved debug output. Charly COSTE <changaco@changaco.net> parents: 37 diff changeset	498
54 2507f424773a Fixed a bug introduced in previous commit Charly COSTE <changaco@changaco.net> parents: 53 diff changeset	499 if event.eventtype() in ['pubmsg', 'action']:
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	500 if connection.real_nickname != self.nickname:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	501 self.error(1, 'ignoring IRC '+event.eventtype()+' not received on bot connection', debug=True)
54 2507f424773a Fixed a bug introduced in previous commit Charly COSTE <changaco@changaco.net> parents: 53 diff changeset	502 return
2507f424773a Fixed a bug introduced in previous commit Charly COSTE <changaco@changaco.net> parents: 53 diff changeset	503 if nickname == self.nickname:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	504 self.error(1, 'ignoring IRC '+event.eventtype()+' sent by self', debug=True)
54 2507f424773a Fixed a bug introduced in previous commit Charly COSTE <changaco@changaco.net> parents: 53 diff changeset	505 return
50 dbb7c29a71e2 Ignore messages sent by self Charly COSTE <changaco@changaco.net> parents: 49 diff changeset	506
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	507 # TODO: lock self.bridges for thread safety
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	508 for bridge in self.bridges:
32 8aa261545662 Implemented "/me" in the IRC->XMPP way (ie "action" event is now handled). Re-written bot.getBridges because the old one didn't always work and was slow. Charly COSTE <changaco@changaco.net> parents: 30 diff changeset	509 if connection.server != bridge.irc_server:
8aa261545662 Implemented "/me" in the IRC->XMPP way (ie "action" event is now handled). Re-written bot.getBridges because the old one didn't always work and was slow. Charly COSTE <changaco@changaco.net> parents: 30 diff changeset	510 continue
8aa261545662 Implemented "/me" in the IRC->XMPP way (ie "action" event is now handled). Re-written bot.getBridges because the old one didn't always work and was slow. Charly COSTE <changaco@changaco.net> parents: 30 diff changeset	511
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	512 try:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	513 from_ = bridge.get_participant(nickname)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	514
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	515 except Bridge.NoSuchParticipantException:
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	516 continue
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	517
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	518
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	519 # Private message
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	520 if event.eventtype() == 'privmsg':
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	521 if event.target() == None:
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	522 return
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	523
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	524 try:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	525 to_ = bridge.get_participant(event.target().split('!')[0])
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	526 self.error(2, debug_str, debug=True)
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	527 from_.say_on_xmpp_to(to_.nickname, event.arguments()[0])
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	528 return
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	529
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	530 except Bridge.NoSuchParticipantException:
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	531 if event.target().split('!')[0] == self.nickname:
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	532 # Message is for the bot
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	533 self.error(2, debug_str, debug=True)
18 3cdf7bb580da Fixed bot.respond(), boosted XMPP thread to lower latency, fixed mode notice. Charly COSTE <changaco@changaco.net> parents: 17 diff changeset	534 connection.privmsg(from_.nickname, self.respond(event.arguments()[0]))
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	535 return
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	536 else:
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	537 continue
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	538
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	539
92 aae8870b3727 Better handling of IRC kick Charly COSTE <changaco@changaco.net> parents: 91 diff changeset	540 # kick handling
53 a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	541 if event.eventtype() == 'kick':
a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	542 if event.target().lower() == bridge.irc_room:
a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	543 try:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	544 kicked = bridge.get_participant(event.arguments()[0])
72 6c4b841144f6 Better handling of participants Charly COSTE <changaco@changaco.net> parents: 70 diff changeset	545 if isinstance(kicked.irc_connection, irclib.ServerConnection):
53 a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	546 kicked.irc_connection.join(bridge.irc_room)
93 c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	547 else:
92 aae8870b3727 Better handling of IRC kick Charly COSTE <changaco@changaco.net> parents: 91 diff changeset	548 if len(event.arguments()) > 1:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	549 bridge.remove_participant('irc', kicked.nickname, 'Kicked by '+nickname+' with reason: '+event.arguments()[1])
92 aae8870b3727 Better handling of IRC kick Charly COSTE <changaco@changaco.net> parents: 91 diff changeset	550 else:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	551 bridge.remove_participant('irc', kicked.nickname, 'Kicked by '+nickname+' (no reason was given)')
58 92341dbfb8b7 Handle bannedfromchan IRC event Charly COSTE <changaco@changaco.net> parents: 56 diff changeset	552 return
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	553 except Bridge.NoSuchParticipantException:
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	554 self.error(say_levels.debug, 'a participant that was not here has been kicked ? WTF ?', no_debug_add=event_str)
53 a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	555 return
a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	556 else:
a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	557 continue
a2258a705a17 Handle kick (by simply rejoining) on IRC side Charly COSTE <changaco@changaco.net> parents: 52 diff changeset	558
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	559
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	560 # Leaving events
45 41394ddb3aff Lower before comparing strings. Charly COSTE <changaco@changaco.net> parents: 44 diff changeset	561 if event.eventtype() == 'quit' or event.eventtype() == 'part' and event.target().lower() == bridge.irc_room:
30 c0fb916cb0a0 Fixed IRC leaving events handling. Charly COSTE <changaco@changaco.net> parents: 29 diff changeset	562 if len(event.arguments()) > 0:
c0fb916cb0a0 Fixed IRC leaving events handling. Charly COSTE <changaco@changaco.net> parents: 29 diff changeset	563 leave_message = event.arguments()[0]
c0fb916cb0a0 Fixed IRC leaving events handling. Charly COSTE <changaco@changaco.net> parents: 29 diff changeset	564 elif event.eventtype() == 'quit':
c0fb916cb0a0 Fixed IRC leaving events handling. Charly COSTE <changaco@changaco.net> parents: 29 diff changeset	565 leave_message = 'Left server.'
c0fb916cb0a0 Fixed IRC leaving events handling. Charly COSTE <changaco@changaco.net> parents: 29 diff changeset	566 elif event.eventtype() == 'part':
c0fb916cb0a0 Fixed IRC leaving events handling. Charly COSTE <changaco@changaco.net> parents: 29 diff changeset	567 leave_message = 'Left channel.'
c0fb916cb0a0 Fixed IRC leaving events handling. Charly COSTE <changaco@changaco.net> parents: 29 diff changeset	568 else:
c0fb916cb0a0 Fixed IRC leaving events handling. Charly COSTE <changaco@changaco.net> parents: 29 diff changeset	569 leave_message = ''
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	570 bridge.remove_participant('irc', from_.nickname, leave_message)
39 3b06450d60cd Improved debug output. Charly COSTE <changaco@changaco.net> parents: 37 diff changeset	571 handled = True
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	572 continue
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	573
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	574
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	575 # Nickname change
41 4c4f4ee72e17 Fixed IRC "nick" event handling. Fixed bot's XMPP infinite loop. Charly COSTE <changaco@changaco.net> parents: 39 diff changeset	576 if event.eventtype() == 'nick':
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	577 from_.change_nickname(event.target(), 'xmpp')
39 3b06450d60cd Improved debug output. Charly COSTE <changaco@changaco.net> parents: 37 diff changeset	578 handled = True
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	579 continue
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	580
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	581
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	582 # Chan message
32 8aa261545662 Implemented "/me" in the IRC->XMPP way (ie "action" event is now handled). Re-written bot.getBridges because the old one didn't always work and was slow. Charly COSTE <changaco@changaco.net> parents: 30 diff changeset	583 if event.eventtype() in ['pubmsg', 'action']:
45 41394ddb3aff Lower before comparing strings. Charly COSTE <changaco@changaco.net> parents: 44 diff changeset	584 if bridge.irc_room == event.target().lower() and bridge.irc_server == connection.server:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	585 self.error(2, debug_str, debug=True)
32 8aa261545662 Implemented "/me" in the IRC->XMPP way (ie "action" event is now handled). Re-written bot.getBridges because the old one didn't always work and was slow. Charly COSTE <changaco@changaco.net> parents: 30 diff changeset	586 message = event.arguments()[0]
8aa261545662 Implemented "/me" in the IRC->XMPP way (ie "action" event is now handled). Re-written bot.getBridges because the old one didn't always work and was slow. Charly COSTE <changaco@changaco.net> parents: 30 diff changeset	587 if event.eventtype() == 'action':
213 fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py Charly COSTE <changaco@changaco.net> parents: 212 diff changeset	588 action = True
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py Charly COSTE <changaco@changaco.net> parents: 212 diff changeset	589 else:
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py Charly COSTE <changaco@changaco.net> parents: 212 diff changeset	590 action = False
fbe40b397f67 created Bridge.say_on_behalf in order to avoid code repetition in participant.py Charly COSTE <changaco@changaco.net> parents: 212 diff changeset	591 from_.say_on_xmpp(message, action=action)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	592 return
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	593 else:
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	594 continue
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	595
179 f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	596 if handled:
f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	597 return
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	598
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	599
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 151 diff changeset	600 if event.eventtype() in ['disconnect', 'kill', 'error']:
17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 151 diff changeset	601 if len(event.arguments()) > 0 and event.arguments()[0] == 'Connection reset by peer':
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	602 self.error(2, debug_str, debug=True)
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 151 diff changeset	603 else:
188 bd185885d4ca minor fixes in bot.py, error messages that weren't flagged as debug Charly COSTE <changaco@changaco.net> parents: 187 diff changeset	604 self.error(say_levels.debug, debug_str, send_to_admins=True)
179 f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	605 return
f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	606
f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	607
225 da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	608 # Chan errors
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	609 if event.eventtype() in ['cannotsendtochan', 'notonchannel']:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	610 self.error(2, debug_str, debug=True)
225 da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	611 bridge = self.get_bridge(irc_room=event.arguments()[0], irc_server=connection.server)
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	612
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	613 if event.eventtype() == 'cannotsendtochan':
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	614 if connection.real_nickname == self.nickname:
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	615 bridge._join_irc_failed(event.eventtype())
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	616 else:
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	617 p = bridge.get_participant(connection.real_nickname)
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	618 p._close_irc_connection(event.eventtype())
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	619 p.irc_connection = event.eventtype()
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	620
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	621 elif event.eventtype() == 'notonchannel':
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	622 if connection.real_nickname == self.nickname:
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	623 bridge.restart(message='Restarting bridge because we received the IRC event '+event.eventtype())
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	624 else:
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	625 p = bridge.get_participant(connection.real_nickname)
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	626 p.irc_connection.join(bridge.irc_room)
da8fbaf69242 fixed 'cannotsendtochan' and 'notonchannel' handling, ignore 'inviteonlychan', 'bannedfromchan', 'channelisfull' and 'badchannelkey' (handled via join callbacks) Charly COSTE <changaco@changaco.net> parents: 221 diff changeset	627
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 151 diff changeset	628 return
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	629
58 92341dbfb8b7 Handle bannedfromchan IRC event Charly COSTE <changaco@changaco.net> parents: 56 diff changeset	630
187 594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	631 # Ignore events not received on bot connection
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	632 if connection.real_nickname != self.nickname:
187 594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	633 self.error(1, 'ignoring IRC '+event.eventtype()+' not received on bridge connection', debug=True)
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	634 return
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	635
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	636
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	637 # Joining events
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	638 if event.eventtype() in ['namreply', 'join']:
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	639 if event.eventtype() == 'namreply':
212 aa03c7ca53cb use Bot.get_bridge instead of Bot.get_bridges in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 211 diff changeset	640 bridge = self.get_bridge(irc_room=event.arguments()[1].lower(), irc_server=connection.server)
aa03c7ca53cb use Bot.get_bridge instead of Bot.get_bridges in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 211 diff changeset	641 for nickname in re.split('(?:^[&@\+%]?\|(?: [&@\+%]?)*)', event.arguments()[2].strip()):
aa03c7ca53cb use Bot.get_bridge instead of Bot.get_bridges in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 211 diff changeset	642 if nickname == '' or nickname == self.nickname:
aa03c7ca53cb use Bot.get_bridge instead of Bot.get_bridges in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 211 diff changeset	643 continue
aa03c7ca53cb use Bot.get_bridge instead of Bot.get_bridges in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 211 diff changeset	644 bridge.add_participant('irc', nickname)
187 594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	645 return
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	646 elif event.eventtype() == 'join':
212 aa03c7ca53cb use Bot.get_bridge instead of Bot.get_bridges in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 211 diff changeset	647 bridge = self.get_bridge(irc_room=event.target().lower(), irc_server=connection.server)
221 1a82d5d40d90 moved irc_id handling to irclib Charly COSTE <changaco@changaco.net> parents: 220 diff changeset	648 bridge.add_participant('irc', nickname)
187 594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	649 return
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	650
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	651
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	652 # Mode event
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	653 if event.eventtype() == 'mode':
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	654 if len(event.arguments()) < 2:
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	655 self.error(2, debug_str, debug=True)
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	656 self.error(1, '2 arguments are needed for a '+event.eventtype()+' event', debug=True)
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	657 return
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	658 if event.arguments()[1] != self.nickname or not 'o' in event.arguments()[0]:
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	659 self.error(1, 'ignoring IRC mode "'+event.arguments()[0]+'" for "'+event.arguments()[1]+'"', debug=True)
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	660 return
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	661 self.error(2, debug_str, debug=True)
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: 213 diff changeset	662 bridges = self.iter_bridges(irc_room=event.target(), irc_server=connection.server)
187 594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	663 if len(bridges) > 1:
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	664 raise Exception, 'more than one bridge for one irc chan, WTF ?'
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	665 bridge = bridges[0]
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	666 if re.search('\+[^\-]*o', event.arguments()[0]):
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	667 # bot is channel operator
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	668 bridge.irc_op = True
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	669 self.error(say_levels.notice, 'bot has IRC operator privileges in '+event.target())
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	670 elif re.search('\-[^\+]*o', event.arguments()[0]):
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	671 # bot lost channel operator privileges
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	672 if bridge.irc_op:
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	673 self.error(say_levels.notice, 'bot lost IRC operator privileges in '+event.target(), send_to_admins=True)
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	674 bridge.irc_op = False
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	675 return
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	676
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	677
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	678 # Unhandled events
179 f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	679 if not printed_event:
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	680 self.error(say_levels.debug, 'The following IRC event was not handled:'+event_str+'\n', send_to_admins=True)
179 f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	681 else:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	682 self.error(1, 'event not handled', debug=True)
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	683 self._send_message_to_admins(say_levels.debug, 'The following IRC event was not handled:'+event_str)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	684
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	685
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	686 def _send_message_to_admins(self, importance, message):
86 bfa32b017fc9 First hack at an error notification system Charly COSTE <changaco@changaco.net> parents: 79 diff changeset	687 """[Internal] Send XMPP Message to bot admin(s)"""
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	688 for admin in self.admins:
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	689 if importance != -1:
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	690 if admin.say_level == say_levels.nothing or importance < admin.say_level:
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	691 continue
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	692 message = self.format_message(importance, message)
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	693
86 bfa32b017fc9 First hack at an error notification system Charly COSTE <changaco@changaco.net> parents: 79 diff changeset	694 try:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	695 self.xmpp_c.send(xmpp.protocol.Message(to=admin.jid, body=message, typ='chat'))
86 bfa32b017fc9 First hack at an error notification system Charly COSTE <changaco@changaco.net> parents: 79 diff changeset	696 except:
bfa32b017fc9 First hack at an error notification system Charly COSTE <changaco@changaco.net> parents: 79 diff changeset	697 pass
bfa32b017fc9 First hack at an error notification system Charly COSTE <changaco@changaco.net> parents: 79 diff changeset	698
bfa32b017fc9 First hack at an error notification system Charly COSTE <changaco@changaco.net> parents: 79 diff changeset	699
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: 171 diff changeset	700 def new_bridge(self, xmpp_room, irc_room, irc_server, mode, say_level, irc_port=6667, irc_connection_interval=1, irc_charsets=None):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	701 """Create a bridge between xmpp_room and irc_room at irc_server."""
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: 171 diff changeset	702 b = Bridge(self, xmpp_room, irc_room, irc_server, mode, say_level, irc_port=irc_port, irc_connection_interval=irc_connection_interval, irc_charsets=irc_charsets)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	703 self.bridges.append(b)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	704 return b
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	705
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	706
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	707 def format_message(self, importance, message):
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	708 if importance < 0 or importance >= len(say_levels.levels):
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	709 raise Exception('[Internal Error] unknown message importance')
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	710 return'['+str(say_levels.get(importance))+'] '+message
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	711
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	712
211 3fe9fed07b64 created Bot.get_bridge(), it calls Bot.get_bridges() and raises exceptions when there are 0 or more than 1 matches Charly COSTE <changaco@changaco.net> parents: 207 diff changeset	713 def get_bridge(self, **kwargs):
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: 213 diff changeset	714 """Calls self.iter_bridges and raises exceptions when there are 0 or more than 1 matches
211 3fe9fed07b64 created Bot.get_bridge(), it calls Bot.get_bridges() and raises exceptions when there are 0 or more than 1 matches Charly COSTE <changaco@changaco.net> parents: 207 diff changeset	715
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: 213 diff changeset	716 See Bot.iter_bridges for the list of args"""
211 3fe9fed07b64 created Bot.get_bridge(), it calls Bot.get_bridges() and raises exceptions when there are 0 or more than 1 matches Charly COSTE <changaco@changaco.net> parents: 207 diff changeset	717
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: 213 diff changeset	718 bridges = [b for b in self.iter_bridges(**kwargs)]
211 3fe9fed07b64 created Bot.get_bridge(), it calls Bot.get_bridges() and raises exceptions when there are 0 or more than 1 matches Charly COSTE <changaco@changaco.net> parents: 207 diff changeset	719 if len(bridges) == 0:
3fe9fed07b64 created Bot.get_bridge(), it calls Bot.get_bridges() and raises exceptions when there are 0 or more than 1 matches Charly COSTE <changaco@changaco.net> parents: 207 diff changeset	720 raise Exception, 'no bridge matching '+str(kwargs)
3fe9fed07b64 created Bot.get_bridge(), it calls Bot.get_bridges() and raises exceptions when there are 0 or more than 1 matches Charly COSTE <changaco@changaco.net> parents: 207 diff changeset	721 elif len(bridges) > 1:
3fe9fed07b64 created Bot.get_bridge(), it calls Bot.get_bridges() and raises exceptions when there are 0 or more than 1 matches Charly COSTE <changaco@changaco.net> parents: 207 diff changeset	722 raise Exception, 'more than one bridge matching '+str(kwargs)+'\n'+'\n'.join([str(b) for b in bridges])
3fe9fed07b64 created Bot.get_bridge(), it calls Bot.get_bridges() and raises exceptions when there are 0 or more than 1 matches Charly COSTE <changaco@changaco.net> parents: 207 diff changeset	723 return bridges[0]
3fe9fed07b64 created Bot.get_bridge(), it calls Bot.get_bridges() and raises exceptions when there are 0 or more than 1 matches Charly COSTE <changaco@changaco.net> parents: 207 diff changeset	724
3fe9fed07b64 created Bot.get_bridge(), it calls Bot.get_bridges() and raises exceptions when there are 0 or more than 1 matches Charly COSTE <changaco@changaco.net> parents: 207 diff changeset	725
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: 213 diff changeset	726 def iter_bridges(self, irc_room=None, irc_server=None, xmpp_room_jid=None, patterns=None):
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: 213 diff changeset	727 for bridge in self.bridges:
32 8aa261545662 Implemented "/me" in the IRC->XMPP way (ie "action" event is now handled). Re-written bot.getBridges because the old one didn't always work and was slow. Charly COSTE <changaco@changaco.net> parents: 30 diff changeset	728 if irc_room != None and bridge.irc_room != irc_room:
8aa261545662 Implemented "/me" in the IRC->XMPP way (ie "action" event is now handled). Re-written bot.getBridges because the old one didn't always work and was slow. Charly COSTE <changaco@changaco.net> parents: 30 diff changeset	729 continue
8aa261545662 Implemented "/me" in the IRC->XMPP way (ie "action" event is now handled). Re-written bot.getBridges because the old one didn't always work and was slow. Charly COSTE <changaco@changaco.net> parents: 30 diff changeset	730 if irc_server != None and bridge.irc_server != irc_server:
8aa261545662 Implemented "/me" in the IRC->XMPP way (ie "action" event is now handled). Re-written bot.getBridges because the old one didn't always work and was slow. Charly COSTE <changaco@changaco.net> parents: 30 diff changeset	731 continue
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	732 if xmpp_room_jid != None and bridge.xmpp_room_jid != xmpp_room_jid:
32 8aa261545662 Implemented "/me" in the IRC->XMPP way (ie "action" event is now handled). Re-written bot.getBridges because the old one didn't always work and was slow. Charly COSTE <changaco@changaco.net> parents: 30 diff changeset	733 continue
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: 213 diff changeset	734 if patterns != None:
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: 213 diff changeset	735 for pattern in patterns:
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: 213 diff changeset	736 if not pattern in str(bridge):
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: 213 diff changeset	737 continue
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: 213 diff changeset	738 yield bridge
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	739
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	740
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	741 def get_xmpp_connection(self, nickname):
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	742 if self.xmpp_connections.has_key(nickname):
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	743 c = self.xmpp_connections[nickname]
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	744 c.used_by += 1
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	745 self.error(3, 'using existing XMPP connection for "'+nickname+'", now used by '+str(c.used_by)+' bridges', 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: 14 diff changeset	746 return c
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	747 self.error(3, 'opening new XMPP connection for "'+nickname+'"', 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	748 c = xmpp.client.Client(self.bare_jid.getDomain(), debug=[])
35 ebf516b2e5c9 Switched from Lock() to RLock(). Charly COSTE <changaco@changaco.net> parents: 34 diff changeset	749 c.lock = threading.RLock()
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	750 c.lock.acquire()
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	751 self.xmpp_connections[nickname] = c
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	752 c.used_by = 1
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	753 c.nickname = nickname
90 965dd6f5fcc3 Tried to improve XMPP disconnections handling Charly COSTE <changaco@changaco.net> parents: 88 diff changeset	754 c.mucs = []
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	755 c.pings = []
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	756 c.connect()
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	757 c.auth(self.bare_jid.getNode(), self.password)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	758 c.RegisterHandler('presence', self._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: 14 diff changeset	759 c.RegisterHandler('iq', self._xmpp_iq_handler)
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	760 c.RegisterHandler('message', self._xmpp_message_handler)
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	761 c.sendInitPresence()
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	762 if nickname == self.nickname:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	763 c.send(xmpp.protocol.Presence(priority=127))
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	764 c.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: 14 diff changeset	765 return c
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	766
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	767
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	768 def reopen_xmpp_connection(self, c):
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	769 if not isinstance(c, xmpp.client.Client):
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	770 return
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	771 bot_connection = False
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	772 if c == self.xmpp_c:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	773 bot_connection = True
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	774 mucs = c.mucs
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	775 nickname = c.nickname
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	776 used_by = c.used_by
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	777 participants = []
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	778 for b in self.bridges:
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	779 for p in b.participants:
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	780 if p.xmpp_c == c:
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	781 participants.append(p)
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	782 p.xmpp_c = None
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	783 self.error(3, 'reopening XMPP connection for "'+nickname+'"', debug=True)
122 9e90e15913a7 bug fixes Charly COSTE <changaco@changaco.net> parents: 121 diff changeset	784 if self.xmpp_connections.has_key(nickname):
9e90e15913a7 bug fixes Charly COSTE <changaco@changaco.net> parents: 121 diff changeset	785 self.xmpp_connections.pop(nickname)
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	786 c.send(xmpp.protocol.Presence(typ='unavailable'))
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	787 del c
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	788 c = self.get_xmpp_connection(nickname)
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	789 c.used_by = used_by
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	790 if bot_connection:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	791 self.xmpp_c = c
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	792 for p in participants:
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	793 p.xmpp_c = c
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	794 c.mucs = mucs
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	795 for m in c.mucs:
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	796 m.rejoin()
122 9e90e15913a7 bug fixes Charly COSTE <changaco@changaco.net> parents: 121 diff changeset	797 return c
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	798
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	799
155 63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	800 def close_xmpp_connection(self, nickname, force=False):
29 a694ffe6a973 Fixed nickname change. Charly COSTE <changaco@changaco.net> parents: 27 diff changeset	801 if not self.xmpp_connections.has_key(nickname):
a694ffe6a973 Fixed nickname change. Charly COSTE <changaco@changaco.net> parents: 27 diff changeset	802 return
37 7e500d4064fb Cosmetics. Charly COSTE <changaco@changaco.net> parents: 35 diff changeset	803 c = self.xmpp_connections[nickname]
42 b8c9ddf320f8 Thread safety for bot.close_xmpp_connection(). Charly COSTE <changaco@changaco.net> parents: 41 diff changeset	804 c.lock.acquire()
37 7e500d4064fb Cosmetics. Charly COSTE <changaco@changaco.net> parents: 35 diff changeset	805 c.used_by -= 1
155 63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	806 if c.used_by < 1 or force:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	807 self.error(3, 'closing XMPP connection for "'+nickname+'"', debug=True)
37 7e500d4064fb Cosmetics. Charly COSTE <changaco@changaco.net> parents: 35 diff changeset	808 self.xmpp_connections.pop(nickname)
52 5aabf124c78d Fixed XMPP connection closing and the XMPP loop Charly COSTE <changaco@changaco.net> parents: 51 diff changeset	809 c.send(xmpp.protocol.Presence(typ='unavailable'))
49 714e78fb912e Tried to improve thread-safety during XMPP connection closing. Charly COSTE <changaco@changaco.net> parents: 48 diff changeset	810 c.lock.release()
37 7e500d4064fb Cosmetics. Charly COSTE <changaco@changaco.net> parents: 35 diff changeset	811 del c
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	812 else:
42 b8c9ddf320f8 Thread safety for bot.close_xmpp_connection(). Charly COSTE <changaco@changaco.net> parents: 41 diff changeset	813 c.lock.release()
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	814 self.error(3, 'XMPP connection for "'+nickname+'" is now used by '+str(c.used_by)+' bridges', 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: 14 diff changeset	815
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	816
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	817 def remove_bridge(self, bridge, message='Removing bridge', log=True):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	818 self.bridges.remove(bridge)
193 c2a8586e64b5 handle IRC inviteonlychan event, improved error messages Charly COSTE <changaco@changaco.net> parents: 190 diff changeset	819 bridge.stop(message=message, log=log)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	820
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	821
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	822 def respond(self, message, participant=None, bot_admin=False):
134 931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	823 if isinstance(participant, Participant):
931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	824 bridge = participant.bridge
931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	825 if bot_admin != participant.bot_admin:
931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	826 bot_admin = participant.bot_admin
931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	827 else:
931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	828 bridge = None
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	829
134 931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	830 return commands.execute(self, message, bot_admin, bridge)
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	831
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	832
207 a97a7e930697 added optionnal "message" argument to Bot.restart() Charly COSTE <changaco@changaco.net> parents: 203 diff changeset	833 def restart(self, message='Restarting bot'):
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	834 # Stop the bridges
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	835 for b in self.bridges:
207 a97a7e930697 added optionnal "message" argument to Bot.restart() Charly COSTE <changaco@changaco.net> parents: 203 diff changeset	836 b.stop(message=message, log=False)
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	837
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	838 # Reopen the bot's XMPP connection
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	839 self.reopen_xmpp_connection(self.xmpp_c)
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	840
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	841 # Restart the bridges
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	842 for b in self.bridges:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	843 b.init2()
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	844
207 a97a7e930697 added optionnal "message" argument to Bot.restart() Charly COSTE <changaco@changaco.net> parents: 203 diff changeset	845 self.error(-1, 'Bot restarted with message: '+message, send_to_admins=True)
11 79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	846
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	847
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	848 def restart_bridges_delayed(self, bridges, delay, error, protocol='xmpp'):
121 765e460bc20a Restart all bridges connected to a MUC server when it goes down Charly COSTE <changaco@changaco.net> parents: 119 diff changeset	849 if len(bridges) > 0:
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	850 found = False
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	851 error[1] += '\nThese bridges will be stopped:'
121 765e460bc20a Restart all bridges connected to a MUC server when it goes down Charly COSTE <changaco@changaco.net> parents: 119 diff changeset	852 for b in bridges:
177 d1686164b9e3 improved Bot.restart_bridges_delayed(), it can now be used when the IRC server is the problem Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	853 if protocol == 'xmpp':
d1686164b9e3 improved Bot.restart_bridges_delayed(), it can now be used when the IRC server is the problem Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	854 leave_message = 'Could not connect to the MUC server ('+b.xmpp_room_jid+')'
121 765e460bc20a Restart all bridges connected to a MUC server when it goes down Charly COSTE <changaco@changaco.net> parents: 119 diff changeset	855 else:
177 d1686164b9e3 improved Bot.restart_bridges_delayed(), it can now be used when the IRC server is the problem Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	856 leave_message = 'Could not connect to the IRC server ('+b.irc_connection._server_str()+')'
d1686164b9e3 improved Bot.restart_bridges_delayed(), it can now be used when the IRC server is the problem Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	857
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	858 if not b.reconnecting:
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	859 found = True
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	860 error[1] += '\n'+str(b)
177 d1686164b9e3 improved Bot.restart_bridges_delayed(), it can now be used when the IRC server is the problem Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	861 leave_message += 'will try to recreate the bridge in '+str(delay)+' seconds'
d1686164b9e3 improved Bot.restart_bridges_delayed(), it can now be used when the IRC server is the problem Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	862 b.reconnecting = True
121 765e460bc20a Restart all bridges connected to a MUC server when it goes down Charly COSTE <changaco@changaco.net> parents: 119 diff changeset	863 self.irc.execute_delayed(delay, b.init2)
177 d1686164b9e3 improved Bot.restart_bridges_delayed(), it can now be used when the IRC server is the problem Charly COSTE <changaco@changaco.net> parents: 172 diff changeset	864
193 c2a8586e64b5 handle IRC inviteonlychan event, improved error messages Charly COSTE <changaco@changaco.net> parents: 190 diff changeset	865 b.stop(message=leave_message, log=False)
121 765e460bc20a Restart all bridges connected to a MUC server when it goes down Charly COSTE <changaco@changaco.net> parents: 119 diff changeset	866
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	867 if found:
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	868 self.error(error[0], error[1], send_to_admins=True)
121 765e460bc20a Restart all bridges connected to a MUC server when it goes down Charly COSTE <changaco@changaco.net> parents: 119 diff changeset	869
765e460bc20a Restart all bridges connected to a MUC server when it goes down Charly COSTE <changaco@changaco.net> parents: 119 diff changeset	870
129 b13ca9cefe1c tried to fix the halt command (added Bot.stop()) Charly COSTE <changaco@changaco.net> parents: 127 diff changeset	871 def stop(self, message='Stopping bot'):
193 c2a8586e64b5 handle IRC inviteonlychan event, improved error messages Charly COSTE <changaco@changaco.net> parents: 190 diff changeset	872 self.error(-1, message, send_to_admins=True)
17 32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots. Charly COSTE <changaco@changaco.net> parents: 14 diff changeset	873 for bridge in self.bridges:
193 c2a8586e64b5 handle IRC inviteonlychan event, improved error messages Charly COSTE <changaco@changaco.net> parents: 190 diff changeset	874 bridge.stop(message=message, log=False)
129 b13ca9cefe1c tried to fix the halt command (added Bot.stop()) Charly COSTE <changaco@changaco.net> parents: 127 diff changeset	875
b13ca9cefe1c tried to fix the halt command (added Bot.stop()) Charly COSTE <changaco@changaco.net> parents: 127 diff changeset	876
b13ca9cefe1c tried to fix the halt command (added Bot.stop()) Charly COSTE <changaco@changaco.net> parents: 127 diff changeset	877 def __del__(self):
155 63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	878 for bridge in self.bridges:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	879 self.remove_bridge(bridge, message='Stopping bot', log=False)
155 63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	880 self.halt = True

Mercurial > xib

annotate bot.py @ 225:da8fbaf69242