xib: bot.py annotate

annotate bot.py @ 275:09a5bde70919 default tip master

minor fix in Participant Signed-off-by: Changaco <changaco ατ changaco δοτ net>

author	Changaco <changaco ατ changaco δοτ net>
date	Wed, 05 May 2010 23:36:13 +0200
parents	db77ef37ff2c
children

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."""
246 5e65f52be453 make sure Bot.error doesn't raise a transcoding exception and uses repr() when there is a problem Charly COSTE <changaco@changaco.net> parents: 243 diff changeset	67 try:
5e65f52be453 make sure Bot.error doesn't raise a transcoding exception and uses repr() when there is a problem Charly COSTE <changaco@changaco.net> parents: 243 diff changeset	68 message = message.encode('utf-8')
5e65f52be453 make sure Bot.error doesn't raise a transcoding exception and uses repr() when there is a problem Charly COSTE <changaco@changaco.net> parents: 243 diff changeset	69 except:
5e65f52be453 make sure Bot.error doesn't raise a transcoding exception and uses repr() when there is a problem Charly COSTE <changaco@changaco.net> parents: 243 diff changeset	70 message = repr(message)
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	71 if not self.debug:
de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	72 message += no_debug_add
86 bfa32b017fc9 First hack at an error notification system Charly COSTE <changaco@changaco.net> parents: 79 diff changeset	73 if send_to_admins == True:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	74 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	75 if importance == -1:
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	76 return
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	77 if not debug:
246 5e65f52be453 make sure Bot.error doesn't raise a transcoding exception and uses repr() when there is a problem Charly COSTE <changaco@changaco.net> parents: 243 diff changeset	78 self.error_fd.write(self.format_message(importance, message)+'\n')
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	79 elif self.debug:
246 5e65f52be453 make sure Bot.error doesn't raise a transcoding exception and uses repr() when there is a problem Charly COSTE <changaco@changaco.net> parents: 243 diff changeset	80 self.error_fd.write('='*importance+'> '+message+'\n')
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	81
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	82
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	83 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	84 """[Internal] XMPP infinite loop."""
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	85 i = 1
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	86 while True:
155 63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	87 if self.halt:
63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	88 s = len(self.xmpp_connections)
63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	89 for i in range(s):
63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	90 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	91 break
79 73a30fc1922b Fixed the XMPP loop (release the lock) Charly COSTE <changaco@changaco.net> parents: 78 diff changeset	92 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	93 try:
51 2737ed5b9003 Tried to improve the XMPP loop, again. Charly COSTE <changaco@changaco.net> parents: 50 diff changeset	94 if len(self.xmpp_connections) == 1:
2737ed5b9003 Tried to improve the XMPP loop, again. Charly COSTE <changaco@changaco.net> parents: 50 diff changeset	95 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	96 for j, c in enumerate(self.xmpp_connections.itervalues()):
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	97 i += 1
51 2737ed5b9003 Tried to improve the XMPP loop, again. Charly COSTE <changaco@changaco.net> parents: 50 diff changeset	98 if hasattr(c, 'lock'):
49 714e78fb912e Tried to improve thread-safety during XMPP connection closing. Charly COSTE <changaco@changaco.net> parents: 48 diff changeset	99 c.lock.acquire()
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	100 if i == j:
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	101 ping = xmpp.protocol.Iq(typ='get')
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	102 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	103 self.error(1, 'sending XMPP ping', debug=True)
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	104 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	105 if hasattr(c, 'Process'):
5aabf124c78d Fixed XMPP connection closing and the XMPP loop Charly COSTE <changaco@changaco.net> parents: 51 diff changeset	106 c.Process(0.01)
5aabf124c78d Fixed XMPP connection closing and the XMPP loop Charly COSTE <changaco@changaco.net> parents: 51 diff changeset	107 c.lock.release()
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	108 if i > 5000:
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	109 i = 0
51 2737ed5b9003 Tried to improve the XMPP loop, again. Charly COSTE <changaco@changaco.net> parents: 50 diff changeset	110 except RuntimeError:
2737ed5b9003 Tried to improve the XMPP loop, again. Charly COSTE <changaco@changaco.net> parents: 50 diff changeset	111 pass
24 4e1f27ea527b First hack at locks for thread safety. Some other minor changes. Charly COSTE <changaco@changaco.net> parents: 23 diff changeset	112 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	113 self.error(1, 'invalid stanza', debug=True)
101 29d3b85c6286 Minor fixes/improvements Charly COSTE <changaco@changaco.net> parents: 100 diff changeset	114 self.reopen_xmpp_connection(c)
79 73a30fc1922b Fixed the XMPP loop (release the lock) Charly COSTE <changaco@changaco.net> parents: 78 diff changeset	115 unlock = True
91 69e4fc0f015c Tried to fix XMPP «Replaced by new connection» problem Charly COSTE <changaco@changaco.net> parents: 90 diff changeset	116 except xmpp.Conflict:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	117 self.error(1, 'conflict', debug=True)
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	118 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	119 unlock = True
51 2737ed5b9003 Tried to improve the XMPP loop, again. Charly COSTE <changaco@changaco.net> parents: 50 diff changeset	120 except:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	121 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	122 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	123 unlock = True
73a30fc1922b Fixed the XMPP loop (release the lock) Charly COSTE <changaco@changaco.net> parents: 78 diff changeset	124 if unlock == True:
73a30fc1922b Fixed the XMPP loop (release the lock) Charly COSTE <changaco@changaco.net> parents: 78 diff changeset	125 c.lock.release()
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	126
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	127
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	128 def _xmpp_presence_handler(self, dispatcher, presence):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	129 """[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	130
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	131 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	132
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	133 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	134 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	135 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	136
202 2a1ee46f86af don't log presence from self Charly COSTE <changaco@changaco.net> parents: 201 diff changeset	137 from_ = xmpp.protocol.JID(presence.getFrom())
2a1ee46f86af don't log presence from self Charly COSTE <changaco@changaco.net> parents: 201 diff changeset	138 bare_jid = unicode(from_.getNode()+'@'+from_.getDomain())
2a1ee46f86af don't log presence from self Charly COSTE <changaco@changaco.net> parents: 201 diff changeset	139
2a1ee46f86af don't log presence from self Charly COSTE <changaco@changaco.net> parents: 201 diff changeset	140 if bare_jid == self.bare_jid:
2a1ee46f86af don't log presence from self Charly COSTE <changaco@changaco.net> parents: 201 diff changeset	141 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	142 return
2a1ee46f86af don't log presence from self Charly COSTE <changaco@changaco.net> parents: 201 diff changeset	143
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	144 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	145
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	146 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	147
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	148 for bridge in self.bridges:
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	149 if bare_jid == bridge.xmpp_room_jid:
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	150 # presence comes from a muc
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	151 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	152
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	153 if resource == '':
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	154 # presence comes from the muc itself
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	155 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	156
108 dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	157 elif resource == xmpp_c.nickname:
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	158 # presence comes from self
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	159 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	160 if x:
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	161 d = x.getTag('destroy')
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	162 if d:
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	163 # room was destroyed
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	164 # 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	165 # 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	166 reason = d.getTag('reason')
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	167 if reason:
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	168 r = reason.getData()
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	169 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	170 # 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	171 bridges = self.iter_bridges(patterns=[from_.getDomain()])
262 db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	172 m = 'The MUC server '+from_.getDomain()+' seems to be going down'
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	173 self.restart_bridges_delayed(bridges, 60, say_levels.warning, m)
108 dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	174 return
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	175 elif r == '':
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	176 r = 'None given'
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	177 else:
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	178 r = 'None given'
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	179
dff9746aa508 XMPP room deletion (and server shut down) handling Charly COSTE <changaco@changaco.net> parents: 105 diff changeset	180 # 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	181 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	182 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	183
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	184 else:
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	185 # 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	186
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	187 x = presence.getTag('x', namespace='http://jabber.org/protocol/muc#user')
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	188 item = None
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	189 if x:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	190 item = x.getTag('item')
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	191
93 c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	192 if presence.getType() == 'unavailable':
96 dd7e1b935894 Code cleaning Charly COSTE <changaco@changaco.net> parents: 93 diff changeset	193 try:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	194 p = bridge.get_participant(resource)
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	195 except Bridge.NoSuchParticipantException:
96 dd7e1b935894 Code cleaning Charly COSTE <changaco@changaco.net> parents: 93 diff changeset	196 p = None
dd7e1b935894 Code cleaning Charly COSTE <changaco@changaco.net> parents: 93 diff changeset	197
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	198 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	199 # participant changed its nickname
93 c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	200 if p == None:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	201 return
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	202 if p.protocol != 'xmpp':
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	203 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	204 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	205 if not item:
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	206 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	207 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	208 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	209 if not new_nick:
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	210 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	211 return
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	212 p.change_nickname(new_nick, 'irc')
93 c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	213
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	214 elif x and x.getTag('status', attrs={'code': '307'}):
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	215 # participant was kicked
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	216 if p == None:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	217 bridge.xmpp_room.rejoin()
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	218 return
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	219 if isinstance(p.xmpp_c, xmpp.client.Client):
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	220 p.muc.rejoin()
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	221 else:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	222 if item:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	223 reason = item.getTag('reason')
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	224 actor = item.getTag('actor')
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	225 if actor and actor.has_attr('jid'):
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	226 kicker = actor.getAttr('jid')
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	227 s1 = 'Kicked by '+kicker
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	228 else:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	229 s1 = 'Kicked from XMPP'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	230 if reason:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	231 s2 = ' with reason: '+reason.getData()
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	232 else:
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 else:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	235 s1 = 'Kicked from XMPP'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	236 s2 = ' (no reason was given)'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	237
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	238 bridge.remove_participant('xmpp', p.nickname, s1+s2)
93 c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	239
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	240 elif x and x.getTag('status', attrs={'code': '301'}):
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	241 # participant was banned
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	242 if p == None:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	243 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	244 self.remove_bridge(bridge)
93 c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	245 return
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	246 if item:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	247 reason = item.getTag('reason')
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	248 actor = item.getTag('actor')
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	249 if actor and actor.has_attr('jid'):
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	250 kicker = actor.getAttr('jid')
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	251 s1 = 'Banned by '+kicker
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	252 else:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	253 s1 = 'Banned from XMPP'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	254 if reason:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	255 s2 = ' with reason: '+reason.getData()
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	256 else:
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 else:
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	259 s1 = 'Banned from XMPP'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	260 s2 = ' (no reason was given)'
c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	261
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	262 bridge.remove_participant('xmpp', p.nickname, s1+s2)
93 c95fe0b319d9 XMPP kick and ban handling Charly COSTE <changaco@changaco.net> parents: 92 diff changeset	263
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	264 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	265 # participant left
99 5390e9abfa44 Don't try to remove a participant that does not exist Charly COSTE <changaco@changaco.net> parents: 96 diff changeset	266 if p != None:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	267 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	268
111 59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	269 elif presence.getType() == 'error':
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	270 error = presence.getTag('error')
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	271 if error:
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	272 for c in error.getChildren():
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	273 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	274 err = error.getAttr('type')+' '+c.getName()
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	275 if err == 'cancel remote-server-not-found':
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	276 # Remote server not found
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	277 # 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	278 bridges = self.iter_bridges(patterns=[from_.getDomain()])
262 db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	279 m = 'XMPP Remote server not found: '+from_.getDomain()
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	280 self.restart_bridges_delayed(bridges, 60, say_levels.error, m)
111 59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	281 else:
59401ac0f47a handle XMPP remote-server-not-found Charly COSTE <changaco@changaco.net> parents: 110 diff changeset	282 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	283
96 dd7e1b935894 Code cleaning Charly COSTE <changaco@changaco.net> parents: 93 diff changeset	284 elif resource != bridge.bot.nickname:
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	285 real_jid = None
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	286 if item and item.has_attr('jid'):
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	287 real_jid = item.getAttr('jid')
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	288
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	289 p = bridge.add_participant('xmpp', resource, real_jid=real_jid)
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	290
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	291 # 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	292 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	293 for admin in self.admins:
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	294 if xmpp.protocol.JID(admin.jid).bareMatch(real_jid):
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	295 p.bot_admin = True
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	296 break
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	297
96 dd7e1b935894 Code cleaning Charly COSTE <changaco@changaco.net> parents: 93 diff changeset	298 return
dd7e1b935894 Code cleaning Charly COSTE <changaco@changaco.net> parents: 93 diff changeset	299
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	300 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	301
201 de574314990e log some more things when Bot.debug is False Charly COSTE <changaco@changaco.net> parents: 200 diff changeset	302 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	303
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	304
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	305 def _xmpp_iq_handler(self, dispatcher, iq):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	306 """[Internal] Manage XMPP IQs."""
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	307
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	308 xmpp_c = dispatcher._owner
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	309
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	310 # Ignore pongs
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	311 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	312 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	313 self.error(1, 'received XMPP pong', debug=True)
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	314 return
6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	315
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	316 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	317
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	318
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	319 def _xmpp_message_handler(self, dispatcher, message):
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	320 """[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	321
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	322 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	323
34 57d0e66378b0 Fixed XMPP message handling and removed disconnect handler. Charly COSTE <changaco@changaco.net> parents: 33 diff changeset	324 if message.getBody() == None:
57d0e66378b0 Fixed XMPP message handling and removed disconnect handler. Charly COSTE <changaco@changaco.net> parents: 33 diff changeset	325 return
57d0e66378b0 Fixed XMPP message handling and removed disconnect handler. Charly COSTE <changaco@changaco.net> parents: 33 diff changeset	326
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	327
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	328 # Private message
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	329 if message.getType() == 'chat':
11 79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	330 from_bare_jid = unicode(message.getFrom().getNode()+'@'+message.getFrom().getDomain())
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	331
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	332 try:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	333 bridge = self.get_bridge(xmpp_room_jid=from_bare_jid)
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	334 except KeyError:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	335 bridge = None
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	336
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	337 if bridge:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	338 # message comes from a room participant
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	339 self.error(2, 'Received XMPP chat message.\n'+message.__str__(fancy=1), debug=True)
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	340
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	341 try:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	342 from_ = bridge.get_participant(message.getFrom().getResource())
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	343 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	344
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	345 from_.say_on_irc_to(to_.nickname, message.getBody())
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	346
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	347 except Bridge.NoSuchParticipantException:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	348 if xmpp_c.nickname == self.nickname:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	349 r = self.respond(str(message.getBody()), participant=from_)
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	350 if isinstance(r, basestring) and len(r) > 0:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	351 s = xmpp.protocol.Message(to=message.getFrom(), body=r, typ='chat')
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	352 self.error(2, 'Sending\n'+s.__str__(fancy=1), debug=True)
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	353 xmpp_c.send(s)
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	354 else:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	355 self.error(1, 'won\'t answer.', debug=True)
11 79b0a7f48a3e Introduced the command mechanism and fixed a bug Charly COSTE <changaco@changaco.net> parents: 10 diff changeset	356 return
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	357 self.error(say_levels.debug, 'XMPP chat message not relayed', no_debug_add='\n'+message.__str__(fancy=1))
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	358 return
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	359
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	360 else:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	361 # message does not come from a room participant
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	362 if xmpp_c.nickname != self.nickname:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	363 self.error(1, 'Ignoring XMPP chat message not received on bot connection.', debug=True)
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	364 return
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	365
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	366 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	367
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	368 # Find out if the message comes from a bot admin
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	369 bot_admin = False
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	370 for admin in self.admins:
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	371 if xmpp.protocol.JID(admin.jid).bareMatch(message.getFrom()):
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	372 bot_admin = True
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	373 break
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	374
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	375 # Respond
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	376 r = self.respond(str(message.getBody()), bot_admin=bot_admin)
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	377 if isinstance(r, basestring) and len(r) > 0:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	378 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	379 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	380 xmpp_c.send(s)
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	381
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	382
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	383 # MUC message
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	384 elif message.getType() == 'groupchat':
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	385
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	386 for child in message.getChildren():
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	387 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	388 # MUC delayed message
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	389 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	390
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	391 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	392 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	393 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	394
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	395 from_ = xmpp.protocol.JID(message.getFrom())
23 abdb7a2b6c6d Minor fixes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	396
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	397 resource = unicode(from_.getResource())
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	398
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	399 if resource == self.nickname:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	400 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	401 return
abdb7a2b6c6d Minor fixes. Charly COSTE <changaco@changaco.net> parents: 22 diff changeset	402
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	403 room_jid = unicode(from_.getNode()+'@'+from_.getDomain())
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	404 bridge = self.get_bridge(xmpp_room_jid=room_jid)
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	405
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	406 if resource == '':
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	407 # message comes from the room itself
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	408 self.error(1, 'Ignoring XMPP groupchat message sent by the room.', debug=True)
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	409 return
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	410 else:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	411 # message comes from a participant of the room
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	412 self.error(2, 'Received XMPP groupchat message.\n'+message.__str__(fancy=1), debug=True)
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	413
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	414 try:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	415 participant = bridge.get_participant(resource)
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	416 participant.say_on_irc(message.getBody())
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	417 except Bridge.NoSuchParticipantException:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	418 bridge.say_on_behalf(resource, message.getBody(), 'irc', action=(message.getBody()[:4] == '/me '))
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	419
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	420 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	421
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	422
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	423 # Error message
105 d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	424 elif message.getType() == 'error':
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	425 try:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	426 b = self.get_bridge(xmpp_room_jid=message.getFrom())
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	427 except KeyError:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	428 self.error(say_levels.debug, 'received unknown error message\n'+message.__str__(fancy=1))
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	429 return
105 d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	430
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	431 for c in message.getChildren():
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	432 if c.getName() == 'error':
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	433 for cc in c.getChildren():
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	434 if cc.getNamespace() == 'urn:ietf:params:xml:ns:xmpp-stanzas' and cc.getName() != 'text':
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	435 err = cc.getName()
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	436 if err in ['not-acceptable', 'not-allowed']:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	437 # we sent a message to a room we are not in
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	438 # can be due to a MUC server restart
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	439 # can be a concurrency bug
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	440 if xmpp_c.nickname == self.nickname:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	441 b.restart(message='Automatic restart of bridge')
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	442 else:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	443 try:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	444 p = b.get_participant(xmpp_c.nickname)
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	445 p.say_on_XMPP_through_bridge(message.getBody())
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	446 except Bridge.NoSuchParticipantException:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	447 b.restart(message='Automatic restart of bridge')
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	448
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	449 elif err == 'forbidden':
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	450 # we don't have the permission to speak
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	451 # let's remove the bridge and tell admins
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	452 self.error(say_levels.error, 'Not allowed to speak on the XMPP MUC of bridge '+str(b)+', stopping it', send_to_admins=True)
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	453 b.stop(message='Not allowed to speak on the XMPP MUC, stopping the bridge')
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	454 else:
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	455 self.error(say_levels.debug, 'recevied unknown error message\n'+message.__str__(fancy=1))
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	456
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	457 return
105 d8acff763731 Handle MUC error messages Charly COSTE <changaco@changaco.net> parents: 103 diff changeset	458
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	459
02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	460 # Unknown message type
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	461 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	462 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	463
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	464
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	465 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	466 """[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	467
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	468 # Answer ping
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	469 if event.eventtype() == 'ping':
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	470 connection.pong(connection.get_server_name())
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	471 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	472
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	473
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	474 # Events we always want to ignore
166 0fc24e232997 some fixes related to IRC nicknames Charly COSTE <changaco@changaco.net> parents: 156 diff changeset	475 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	476 return
243 c9652650d5b5 ignore "noorigin" IRC event Charly COSTE <changaco@changaco.net> parents: 242 diff changeset	477 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', 'topic', 'noorigin']:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	478 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	479 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	480
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
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	482 source_nickname = None
220 5726a0833537 minor syntax change in bot.py Charly COSTE <changaco@changaco.net> parents: 219 diff changeset	483 if event.source() and '!' in event.source():
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	484 source_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	485
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	486
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	487 # 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	488 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	489 debug_str = 'Received IRC event.'+event_str
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	490
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	491 handled = 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	492
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	493 # Private message
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	494 if event.eventtype() in ['privmsg', '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	495
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	496 if event.target() == self.nickname:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	497 # message is for the bot
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	498 connection.privmsg(source_nickname, self.respond(event.arguments()[0]))
179 f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	499 return
f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	500
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	501 elif not irclib.is_channel(event.target()[0]):
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	502 # search if the IRC user who sent the message is in one of the bridges
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	503 for bridge in self.iter_bridges(irc_server=connection.server):
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	504 try:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	505 from_ = bridge.get_participant(source_nickname)
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	506 # he is, forward the message on XMPP
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	507 if event.eventtype() == 'action':
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	508 action = True
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	509 else:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	510 action = False
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	511 from_.say_on_xmpp_to(connection.nickname, event.arguments()[0], action=action)
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	512 return
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	513 except Bridge.NoSuchParticipantException:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	514 continue
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	515
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	516 # he isn't, send an error
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	517 connection.privmsg(source_nickname, 'XIB error: you cannot send a private message to an XMPP user if you are not in one of the chans he is in')
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	518
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	519
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	520 # Connection errors
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 151 diff changeset	521 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	522 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	523 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	524 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	525 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	526 return
f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	527
f6c6708c6c0e handle IRC events cannotsendtochan and notonchannel, send unhandled events to bot admins Charly COSTE <changaco@changaco.net> parents: 177 diff changeset	528
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	529 # 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	530 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	531 self.error(2, debug_str, debug=True)
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	532
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	533 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	534
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	535 if event.eventtype() == 'cannotsendtochan':
236 8acbfda313b9 use ServerConnection.nickname instead of .real_nickname in most cases, make sure we put a string in .real_nickname Charly COSTE <changaco@changaco.net> parents: 235 diff changeset	536 if connection.nickname == self.nickname:
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	537 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	538 else:
236 8acbfda313b9 use ServerConnection.nickname instead of .real_nickname in most cases, make sure we put a string in .real_nickname Charly COSTE <changaco@changaco.net> parents: 235 diff changeset	539 p = bridge.get_participant(connection.nickname)
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	540 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	541 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	542
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	543 elif event.eventtype() == 'notonchannel':
236 8acbfda313b9 use ServerConnection.nickname instead of .real_nickname in most cases, make sure we put a string in .real_nickname Charly COSTE <changaco@changaco.net> parents: 235 diff changeset	544 if connection.nickname == self.nickname:
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	545 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	546 else:
236 8acbfda313b9 use ServerConnection.nickname instead of .real_nickname in most cases, make sure we put a string in .real_nickname Charly COSTE <changaco@changaco.net> parents: 235 diff changeset	547 p = bridge.get_participant(connection.nickname)
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	548 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	549
152 17305e57f71d removed automatic switching to limited mode (created Bridge.show_participants_list_on()) Charly COSTE <changaco@changaco.net> parents: 151 diff changeset	550 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	551
58 92341dbfb8b7 Handle bannedfromchan IRC event Charly COSTE <changaco@changaco.net> parents: 56 diff changeset	552
187 594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	553 # Ignore events not received on bot connection
236 8acbfda313b9 use ServerConnection.nickname instead of .real_nickname in most cases, make sure we put a string in .real_nickname Charly COSTE <changaco@changaco.net> parents: 235 diff changeset	554 if connection.nickname != self.nickname:
187 594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	555 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	556 return
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	557
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	558
242 60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	559 # Server events
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	560 if event.eventtype() in ['quit', 'nick']:
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	561 for bridge in self.iter_bridges(irc_server=connection.server):
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	562
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	563 try:
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	564 from_ = bridge.get_participant(source_nickname)
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	565 except Bridge.NoSuchParticipantException:
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	566 continue
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	567
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	568 handled = True
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	569
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	570 # Quit event
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	571 if event.eventtype() == 'quit':
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	572 if len(event.arguments()) > 0:
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	573 leave_message = event.arguments()[0]
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	574 else:
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	575 leave_message = 'Left server.'
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	576 bridge.remove_participant('irc', from_.nickname, leave_message)
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	577 continue
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	578
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	579 # Nickname change
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	580 if event.eventtype() == 'nick':
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	581 from_.change_nickname(event.target(), 'xmpp')
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	582 continue
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	583
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	584 if handled:
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	585 return
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	586
60645c505f11 ignore IRC server-wide events not received on bot connection Charly COSTE <changaco@changaco.net> parents: 241 diff changeset	587
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	588 # Chan events
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	589 if event.eventtype() in ['pubmsg', 'action', 'part', 'kick', 'mode', 'join']:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	590
238 a6c37733357a some more fixes for Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 236 diff changeset	591 if event.eventtype() in ['pubmsg', 'action', 'part', 'kick', 'join'] and not source_nickname:
250 5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	592 self.error(say_levels.debug, 'a source is needed for a '+event.eventtype()+' event'+event_str)
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	593 return
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	594
250 5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	595 if event.eventtype() in ['kick', 'mode'] and len(event.arguments()) == 0:
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	596 self.error(say_levels.debug, 'at least 1 argument is needed for a '+event.eventtype()+' event'+event_str)
238 a6c37733357a some more fixes for Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 236 diff changeset	597 return
a6c37733357a some more fixes for Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 236 diff changeset	598
a6c37733357a some more fixes for Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 236 diff changeset	599 chan = event.target().lower()
a6c37733357a some more fixes for Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 236 diff changeset	600
a6c37733357a some more fixes for Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 236 diff changeset	601 bridge = self.get_bridge(irc_room=chan, irc_server=connection.server)
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	602
255 38dd27098fef minor fix in _irc_event_handler, check source_nickname before giving it to Bridge.get_participant Charly COSTE <changaco@changaco.net> parents: 250 diff changeset	603 from_ = None
38dd27098fef minor fix in _irc_event_handler, check source_nickname before giving it to Bridge.get_participant Charly COSTE <changaco@changaco.net> parents: 250 diff changeset	604 if source_nickname:
38dd27098fef minor fix in _irc_event_handler, check source_nickname before giving it to Bridge.get_participant Charly COSTE <changaco@changaco.net> parents: 250 diff changeset	605 try:
38dd27098fef minor fix in _irc_event_handler, check source_nickname before giving it to Bridge.get_participant Charly COSTE <changaco@changaco.net> parents: 250 diff changeset	606 from_ = bridge.get_participant(source_nickname)
38dd27098fef minor fix in _irc_event_handler, check source_nickname before giving it to Bridge.get_participant Charly COSTE <changaco@changaco.net> parents: 250 diff changeset	607 except Bridge.NoSuchParticipantException:
38dd27098fef minor fix in _irc_event_handler, check source_nickname before giving it to Bridge.get_participant Charly COSTE <changaco@changaco.net> parents: 250 diff changeset	608 pass
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	609
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	610
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	611 # Join event
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	612 if event.eventtype() == 'join':
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	613 bridge.add_participant('irc', source_nickname)
187 594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	614 return
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	615
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	616
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	617 # kick handling
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	618 if event.eventtype() == 'kick':
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	619 try:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	620 kicked = bridge.get_participant(event.arguments()[0])
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	621 except Bridge.NoSuchParticipantException:
250 5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	622 self.error(say_levels.debug, 'a participant that was not here has been kicked ? WTF ?'+event_str)
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	623 return
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	624
258 3b4826e14642 fixed an UnboundLocalError in IRC kick handling, bug introduced in f1a21a006f2facd0ec2a71e99180b7b4df0907e3 Charly COSTE <changaco@changaco.net> parents: 255 diff changeset	625 leave_message = 'kicked by '+source_nickname
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	626 if len(event.arguments()) > 1:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	627 leave_message += ' with reason: '+event.arguments()[1]
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	628 else:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	629 leave_message += ' (no reason was given)'
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	630 log_message = '"'+kicked.nickname+'" has been '+leave_message
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	631
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	632 self.error(say_levels.warning, log_message)
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	633
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	634 if isinstance(kicked.irc_connection, irclib.ServerConnection):
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	635 # an IRC duplicate of an XMPP user has been kicked, auto-rejoin
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	636 kicked.irc_connection.join(bridge.irc_room)
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	637 elif isinstance(kicked.xmpp_c, xmpp.client.Client):
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	638 # an IRC user has been kicked, make its duplicate leave
261 26f7df23aee0 fixed another UnboundLocalError in IRC kick handling introduced in f1a21a006f2facd0ec2a71e99180b7b4df0907e3 Charly COSTE <changaco@changaco.net> parents: 258 diff changeset	639 kicked.leave(leave_message)
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	640 else:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	641 # an IRC user with no duplicate on XMPP has been kicked, say it on XMPP
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	642 bridge.say(say_levels.warning, log_message, on_irc=False)
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	643 return
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	644
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	645
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	646 # Part event
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	647 if event.eventtype() == 'part':
235 533a5db79389 minor fixes in bot.py Charly COSTE <changaco@changaco.net> parents: 232 diff changeset	648 if not from_:
238 a6c37733357a some more fixes for Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 236 diff changeset	649 self.error(say_levels.debug, 'a participant that wasn\'t here left:'+event_str)
235 533a5db79389 minor fixes in bot.py Charly COSTE <changaco@changaco.net> parents: 232 diff changeset	650 return
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	651 if len(event.arguments()) > 0:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	652 leave_message = event.arguments()[0]
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	653 else:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	654 leave_message = 'Left channel.'
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	655 bridge.remove_participant('irc', from_.nickname, leave_message)
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	656 return
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	657
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	658
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	659 # Chan message
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	660 if event.eventtype() in ['pubmsg', 'action']:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	661 message = event.arguments()[0]
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	662 if event.eventtype() == 'action':
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	663 action = True
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	664 else:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	665 action = False
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	666 if isinstance(from_, Participant):
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	667 from_.say_on_xmpp(message, action=action)
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	668 else:
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	669 bridge.say_on_behalf(source_nickname, message, 'xmpp', action=action)
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	670 return
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	671
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	672
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	673 # Mode event
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	674 if event.eventtype() == 'mode':
250 5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	675 if len(event.arguments()) == 1:
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	676 # chan mode
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	677 self.error(1, 'ignoring IRC mode "'+event.arguments()[0]+'" for chan "'+event.target()+'"', debug=True)
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	678 elif len(event.arguments()) == 2:
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	679 # participant mode
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	680 if event.arguments()[1] != self.nickname or not 'o' in event.arguments()[0]:
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	681 self.error(1, 'ignoring IRC mode "'+event.arguments()[0]+'" for "'+event.arguments()[1]+'" in chan "'+event.target()+'"', debug=True)
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	682 return
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	683 if re.search('\+[^\-]*o', event.arguments()[0]):
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	684 # bot is channel operator
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	685 bridge.irc_op = True
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	686 self.error(say_levels.notice, 'bot has IRC operator privileges in '+chan)
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	687 elif re.search('\-[^\+]*o', event.arguments()[0]):
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	688 # bot lost channel operator privileges
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	689 if bridge.irc_op:
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	690 self.error(say_levels.notice, 'bot lost IRC operator privileges in '+chan, send_to_admins=True)
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	691 bridge.irc_op = False
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	692 else:
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	693 # unknown mode
5d6ff929e6bc fixed IRC "mode" event handling Charly COSTE <changaco@changaco.net> parents: 246 diff changeset	694 self.error(say_levels.debug, 'unknown IRC "mode" event (has 3 arguments):'+event_str)
187 594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	695 return
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	696
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	697
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	698 # Namreply event
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	699 if event.eventtype() == 'namreply':
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	700 bridge = self.get_bridge(irc_room=event.arguments()[1].lower(), irc_server=connection.server)
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	701 for nickname in re.split('(?:^[&@\+%]?\|(?: [&@\+%]?)*)', event.arguments()[2].strip()):
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	702 if nickname == '' or nickname == self.nickname:
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	703 continue
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	704 bridge.add_participant('irc', nickname)
187 594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	705 return
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	706
594f570f4657 handle IRC mode event Charly COSTE <changaco@changaco.net> parents: 186 diff changeset	707
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	708 # Unhandled events
230 d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	709 self.error(1, 'event not handled', debug=True)
d5a126cf119c reorganized and fixed many things in Bot._irc_event_handler Charly COSTE <changaco@changaco.net> parents: 228 diff changeset	710 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	711
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	712
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	713 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	714 """[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	715 for admin in self.admins:
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	716 if importance != -1:
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	717 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	718 continue
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	719 message = self.format_message(importance, message)
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	720
86 bfa32b017fc9 First hack at an error notification system Charly COSTE <changaco@changaco.net> parents: 79 diff changeset	721 try:
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	722 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	723 except:
bfa32b017fc9 First hack at an error notification system Charly COSTE <changaco@changaco.net> parents: 79 diff changeset	724 pass
bfa32b017fc9 First hack at an error notification system Charly COSTE <changaco@changaco.net> parents: 79 diff changeset	725
bfa32b017fc9 First hack at an error notification system Charly COSTE <changaco@changaco.net> parents: 79 diff changeset	726
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	727 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	728 """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	729 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	730 self.bridges.append(b)
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	731 return b
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	732
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	733
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	734 def format_message(self, importance, message):
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	735 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	736 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	737 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	738
102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	739
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	740 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	741 """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	742
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	743 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	744
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	745 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	746 if len(bridges) == 0:
232 02c58515edde improved Bot._xmpp_message_handler Charly COSTE <changaco@changaco.net> parents: 230 diff changeset	747 raise KeyError, 'no bridge matching '+str(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	748 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	749 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	750 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	751
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	752
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	753 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	754 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	755 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	756 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	757 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	758 continue
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	759 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	760 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	761 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	762 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	763 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	764 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	765 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	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
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	768 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	769 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	770 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	771 c.used_by += 1
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	772 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	773 return c
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	774 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	775 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	776 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	777 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	778 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	779 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	780 c.nickname = nickname
90 965dd6f5fcc3 Tried to improve XMPP disconnections handling Charly COSTE <changaco@changaco.net> parents: 88 diff changeset	781 c.mucs = []
75 6034087b1d10 First hack at pings Charly COSTE <changaco@changaco.net> parents: 72 diff changeset	782 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	783 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	784 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	785 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	786 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	787 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	788 c.sendInitPresence()
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	789 if nickname == self.nickname:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	790 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	791 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	792 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	793
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	794
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	795 def reopen_xmpp_connection(self, c):
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	796 if not isinstance(c, xmpp.client.Client):
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	797 return
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	798 bot_connection = False
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	799 if c == self.xmpp_c:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	800 bot_connection = True
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	801 mucs = c.mucs
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	802 nickname = c.nickname
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	803 used_by = c.used_by
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	804 participants = []
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	805 for b in self.bridges:
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	806 for p in b.participants:
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	807 if p.xmpp_c == c:
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	808 participants.append(p)
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	809 p.xmpp_c = None
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	810 self.error(3, 'reopening XMPP connection for "'+nickname+'"', debug=True)
122 9e90e15913a7 bug fixes Charly COSTE <changaco@changaco.net> parents: 121 diff changeset	811 if self.xmpp_connections.has_key(nickname):
9e90e15913a7 bug fixes Charly COSTE <changaco@changaco.net> parents: 121 diff changeset	812 self.xmpp_connections.pop(nickname)
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	813 c.send(xmpp.protocol.Presence(typ='unavailable'))
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	814 del c
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	815 c = self.get_xmpp_connection(nickname)
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	816 c.used_by = used_by
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	817 if bot_connection:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	818 self.xmpp_c = c
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	819 for p in participants:
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	820 p.xmpp_c = c
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	821 c.mucs = mucs
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	822 for m in c.mucs:
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	823 m.rejoin()
122 9e90e15913a7 bug fixes Charly COSTE <changaco@changaco.net> parents: 121 diff changeset	824 return c
100 6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	825
6289ac5a2db7 Reconnect when a connection is closed Charly COSTE <changaco@changaco.net> parents: 99 diff changeset	826
155 63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	827 def close_xmpp_connection(self, nickname, force=False):
29 a694ffe6a973 Fixed nickname change. Charly COSTE <changaco@changaco.net> parents: 27 diff changeset	828 if not self.xmpp_connections.has_key(nickname):
a694ffe6a973 Fixed nickname change. Charly COSTE <changaco@changaco.net> parents: 27 diff changeset	829 return
37 7e500d4064fb Cosmetics. Charly COSTE <changaco@changaco.net> parents: 35 diff changeset	830 c = self.xmpp_connections[nickname]
42 b8c9ddf320f8 Thread safety for bot.close_xmpp_connection(). Charly COSTE <changaco@changaco.net> parents: 41 diff changeset	831 c.lock.acquire()
37 7e500d4064fb Cosmetics. Charly COSTE <changaco@changaco.net> parents: 35 diff changeset	832 c.used_by -= 1
155 63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	833 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	834 self.error(3, 'closing XMPP connection for "'+nickname+'"', debug=True)
37 7e500d4064fb Cosmetics. Charly COSTE <changaco@changaco.net> parents: 35 diff changeset	835 self.xmpp_connections.pop(nickname)
52 5aabf124c78d Fixed XMPP connection closing and the XMPP loop Charly COSTE <changaco@changaco.net> parents: 51 diff changeset	836 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	837 c.lock.release()
37 7e500d4064fb Cosmetics. Charly COSTE <changaco@changaco.net> parents: 35 diff changeset	838 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	839 else:
42 b8c9ddf320f8 Thread safety for bot.close_xmpp_connection(). Charly COSTE <changaco@changaco.net> parents: 41 diff changeset	840 c.lock.release()
180 102f895347ff added a required "importance" argument to Bot.error() Charly COSTE <changaco@changaco.net> parents: 179 diff changeset	841 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	842
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	843
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	844 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	845 self.bridges.remove(bridge)
193 c2a8586e64b5 handle IRC inviteonlychan event, improved error messages Charly COSTE <changaco@changaco.net> parents: 190 diff changeset	846 bridge.stop(message=message, log=log)
0 4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	847
4c842d23d4ce Initial commit, version 0.1 Charly COSTE <changaco@changaco.net> parents: diff changeset	848
124 99f3dee1fad7 code cleaning Charly COSTE <changaco@changaco.net> parents: 122 diff changeset	849 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	850 if isinstance(participant, Participant):
931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	851 bridge = participant.bridge
931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	852 if bot_admin != participant.bot_admin:
931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	853 bot_admin = participant.bot_admin
931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	854 else:
931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	855 bridge = None
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	856
134 931a5edc7971 moved commands to a separate file Charly COSTE <changaco@changaco.net> parents: 133 diff changeset	857 return commands.execute(self, message, bot_admin, bridge)
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	858
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	859
207 a97a7e930697 added optionnal "message" argument to Bot.restart() Charly COSTE <changaco@changaco.net> parents: 203 diff changeset	860 def restart(self, message='Restarting bot'):
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	861 # Stop the bridges
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	862 for b in self.bridges:
207 a97a7e930697 added optionnal "message" argument to Bot.restart() Charly COSTE <changaco@changaco.net> parents: 203 diff changeset	863 b.stop(message=message, log=False)
103 23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	864
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	865 # Reopen the bot's XMPP connection
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	866 self.reopen_xmpp_connection(self.xmpp_c)
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	867
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	868 # Restart the bridges
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	869 for b in self.bridges:
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	870 b.init2()
23416c27b592 New command system Charly COSTE <changaco@changaco.net> parents: 101 diff changeset	871
207 a97a7e930697 added optionnal "message" argument to Bot.restart() Charly COSTE <changaco@changaco.net> parents: 203 diff changeset	872 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	873
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	874
262 db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	875 def restart_bridges_delayed(self, bridges, delay, error_level, error_message, protocol='xmpp'):
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	876 bridges_restart_found = False
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	877 bridges_stop_found = False
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	878 bridges_stop = 'These bridges will be stopped:'
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	879 bridges_restart = 'These bridges will be restarted in '+str(delay)+' seconds:'
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	880 for b in bridges:
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	881 if protocol == 'xmpp':
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	882 leave_message = 'MUC connection failed ('+b.xmpp_room_jid+')'
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	883 else:
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	884 leave_message = 'IRC connection failed ('+b.irc_connection._server_str()+')'
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	885
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	886 if not b.reconnecting:
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	887 bridges_restart_found = True
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	888 bridges_restart += '\n'+str(b)
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	889 leave_message += ', restart in '+str(delay)+'s'
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	890 b.reconnecting = True
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	891 self.irc.execute_delayed(delay, b.init2)
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	892 else:
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	893 bridges_stop_found = True
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	894 bridges_stop += '\n'+str(b)
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	895
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	896 b.stop(message=leave_message, log=False)
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	897
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	898 if bridges_restart_found:
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	899 error_message += '\n'+bridges_restart
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	900 if bridges_stop_found:
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	901 error_message += '\n'+bridges_stop
121 765e460bc20a Restart all bridges connected to a MUC server when it goes down Charly COSTE <changaco@changaco.net> parents: 119 diff changeset	902
262 db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	903 if bridges_restart_found or bridges_stop_found:
db77ef37ff2c fixed Bot.restart_bridges_delayed: removed buggy and useless test and improved error messages Charly COSTE <changaco@changaco.net> parents: 261 diff changeset	904 self.error(error_level, error_message, 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	905
765e460bc20a Restart all bridges connected to a MUC server when it goes down Charly COSTE <changaco@changaco.net> parents: 119 diff changeset	906
129 b13ca9cefe1c tried to fix the halt command (added Bot.stop()) Charly COSTE <changaco@changaco.net> parents: 127 diff changeset	907 def stop(self, message='Stopping bot'):
193 c2a8586e64b5 handle IRC inviteonlychan event, improved error messages Charly COSTE <changaco@changaco.net> parents: 190 diff changeset	908 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	909 for bridge in self.bridges:
193 c2a8586e64b5 handle IRC inviteonlychan event, improved error messages Charly COSTE <changaco@changaco.net> parents: 190 diff changeset	910 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	911
b13ca9cefe1c tried to fix the halt command (added Bot.stop()) Charly COSTE <changaco@changaco.net> parents: 127 diff changeset	912
b13ca9cefe1c tried to fix the halt command (added Bot.stop()) Charly COSTE <changaco@changaco.net> parents: 127 diff changeset	913 def __del__(self):
155 63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	914 for bridge in self.bridges:
203 2a81c480439a renamed camelCased functions Charly COSTE <changaco@changaco.net> parents: 202 diff changeset	915 self.remove_bridge(bridge, message='Stopping bot', log=False)
155 63db565438bd fixed the halt command Charly COSTE <changaco@changaco.net> parents: 152 diff changeset	916 self.halt = True

Mercurial > xib

annotate bot.py @ 275:09a5bde70919 default tip master