xib: bot.py annotate

annotate bot.py @ 213:fbe40b397f67

created Bridge.say_on_behalf in order to avoid code repetition in participant.py Signed-off-by: Charly COSTE <changaco@changaco.net>

author	Charly COSTE <changaco@changaco.net>
date	Sat, 06 Mar 2010 19:05:07 +0100
parents	aa03c7ca53cb
children	d527d7b75f56

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

Mercurial > xib

annotate bot.py @ 213:fbe40b397f67