Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated to use only the registry.

This commit is contained in:
Jeremy Fincher 2004-07-27 05:19:14 +00:00
parent 4b40f18825
commit fe55f17cbf
2 changed files with 188 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
* Changed the Relay plugin to rely only on the registry, allowing
it to start and join all networks and channels with no user/owner
interaction at all. Also, removed the Relay.say and
Relay.reconnect commands, since both can be accomplished easily
using the Relay.command command in combination with
Owner.reconnect and Anonymous.say commands.
* Added supybot.reply.withNoticeWhenPrivate, to make the bot * Added supybot.reply.withNoticeWhenPrivate, to make the bot
reply with a notice when it privately messages a user -- this reply with a notice when it privately messages a user -- this
generally means that the user's client won't open a query window, generally means that the user's client won't open a query window,

289
plugins/Relay.py
View File

@ -68,6 +68,10 @@ def configure(advanced):
use the 'start' command followed by the 'connect' command. Use the 'help' use the 'start' command followed by the 'connect' command. Use the 'help'
command to see how these two commands should be used.""") command to see how these two commands should be used.""")
class Networks(registry.SpaceSeparatedListOf):
List = ircutils.IrcSet
Value = registry.String
conf.registerPlugin('Relay') conf.registerPlugin('Relay')
conf.registerChannelValue(conf.supybot.plugins.Relay, 'color', conf.registerChannelValue(conf.supybot.plugins.Relay, 'color',
registry.Boolean(False, """Determines whether the bot will color relayed registry.Boolean(False, """Determines whether the bot will color relayed
@ -78,19 +82,9 @@ conf.registerChannelValue(conf.supybot.plugins.Relay, 'topicSync',
conf.registerGlobalValue(conf.supybot.plugins.Relay, 'channels', conf.registerGlobalValue(conf.supybot.plugins.Relay, 'channels',
conf.SpaceSeparatedSetOfChannels([], """Determines which channels the bot conf.SpaceSeparatedSetOfChannels([], """Determines which channels the bot
will relay in.""")) will relay in."""))
conf.registerGlobalValue(conf.supybot.plugins.Relay, 'networks',
ircs = ircutils.IrcDict() Networks('', """Determines what networks the bot will join in order to relay
lastmsg = {} # Not IrcDict. Doesn't map strings. between."""))
ircstates = {} # Not IrcDict. Doesn't map strings.
abbreviations = {} # Not IrcDict. Doesn't map strings.
originalIrc = None
def reload(x=None):
global ircs, ircstates, lastmsg, abbreviations, originalIrc
if x is None:
return (ircs, ircstates, lastmsg, abbreviations, originalIrc)
else:
(ircs, ircstates, lastmsg, abbreviations, originalIrc) = x
class Relay(callbacks.Privmsg): class Relay(callbacks.Privmsg):
noIgnore = True noIgnore = True
@ -98,29 +92,37 @@ class Relay(callbacks.Privmsg):
def __init__(self): def __init__(self):
callbacks.Privmsg.__init__(self) callbacks.Privmsg.__init__(self)
self._whois = {} self._whois = {}
self.ircs = ircs self.ircs = []
self.started = False
self.relayedMsgs = {} self.relayedMsgs = {}
self.lastmsg = lastmsg self.lastmsg = {}
self.ircstates = ircstates self.ircstates = {}
self.abbreviations = abbreviations
def __call__(self, irc, msg): def __call__(self, irc, msg):
if self.started:
try: try:
irc = self._getRealIrc(irc) irc = self._getRealIrc(irc)
if irc not in self.ircs:
self._addIrc(irc)
self.ircstates[irc].addMsg(irc, self.lastmsg[irc]) self.ircstates[irc].addMsg(irc, self.lastmsg[irc])
finally: finally:
self.lastmsg[irc] = msg self.lastmsg[irc] = msg
callbacks.Privmsg.__call__(self, irc, msg) callbacks.Privmsg.__call__(self, irc, msg)
def do376(self, irc, msg): def do376(self, irc, msg):
if not self.ircs:
name = self._getIrcName(irc)
self.log.info('Registering initial Irc as %s.', name)
self._connect(name, irc, serverPort=None, makeNew=False)
L = [] L = []
for channel in self.registryValue('channels'): for channel in self.registryValue('channels'):
if channel not in irc.state.channels: if channel not in irc.state.channels:
L.append(channel) L.append(channel)
if L: if L:
irc.queueMsg(ircmsgs.joins(L)) irc.queueMsg(ircmsgs.joins(L))
for network in self.registryValue('networks'):
ircNames = map(self._getIrcName, self.ircs)
if network not in ircNames:
self.log.info('Starting relay connection to %s.', network)
self._connect(network, irc)
do377 = do422 = do376 do377 = do422 = do376
def _getRealIrc(self, irc): def _getRealIrc(self, irc):
@ -129,86 +131,83 @@ class Relay(callbacks.Privmsg):
else: else:
return irc.getRealIrc() return irc.getRealIrc()
def start(self, irc, msg, args): def _getIrc(self, name):
"""<network abbreviation for current server> for irc in self.ircs:
if self._getIrcName(irc) == name:
return irc
raise KeyError, name
This command is necessary to start the Relay plugin; the def _getIrcName(self, irc):
<network abbreviation> is the abbreviation that the network the # We should allow abbreviations at some point.
bot is currently connected to should be shown as to other networks. return irc.network
For instance, if the network abbreviation is 'oftc', then when
relaying messages from that network to other networks, the users
will show up as 'user@oftc'.
"""
global originalIrc
realIrc = self._getRealIrc(irc)
originalIrc = realIrc
abbreviation = privmsgs.getArgs(args)
self.ircs[abbreviation] = realIrc
self.abbreviations[realIrc] = abbreviation
self.ircstates[realIrc] = copy.copy(realIrc.state)
self.lastmsg[realIrc] = ircmsgs.ping('this is just a fake message')
self.started = True
irc.replySuccess()
start = privmsgs.checkCapability(start, 'owner')
def connect(self, irc, msg, args): def connect(self, irc, msg, args):
"""<network abbreviation> <host:port> (port defaults to 6667) """<network> [<host:port>] (port defaults to 6667)
Connects to another network at <host:port>. The network Connects to another network at <host:port>. The network name is used
abbreviation <network abbreviation> is used when relaying messages from when relaying messages from that network to other networks.
that network to other networks.
""" """
if not self.started:
irc.error('You must use the start command first.')
return
abbreviation, server = privmsgs.getArgs(args, required=2)
realIrc = self._getRealIrc(irc) realIrc = self._getRealIrc(irc)
(network, server) = privmsgs.getArgs(args, optional=1)
if not server:
server = None
else:
if ':' in server: if ':' in server:
(server, port) = server.split(':') (server, port) = server.split(':')
port = int(port) port = int(port)
else: else:
port = 6667 port = 6667
newIrc = irclib.Irc(irc.nick, callbacks=realIrc.callbacks) self._connect(network, realIrc, serverPort=(server, port))
newIrc.state.history = realIrc.state.history
driver = drivers.newDriver((server, port), newIrc)
newIrc.driver = driver
self.ircs[abbreviation] = newIrc
self.abbreviations[newIrc] = abbreviation
self.ircstates[newIrc] = irclib.IrcState()
self.lastmsg[newIrc] = ircmsgs.ping('this is just a fake message')
irc.replySuccess() irc.replySuccess()
connect = privmsgs.checkCapability(connect, 'owner') connect = privmsgs.checkCapability(connect, 'owner')
def reconnect(self, irc, msg, args): def _addIrc(self, irc):
"""<network> # Let's just be extra-special-careful here.
if irc not in self.ircs:
self.ircs.append(irc)
if irc not in self.ircstates:
self.ircstates[irc] = irclib.IrcState()
if irc not in self.lastmsg:
self.lastmsg[irc] = ircmsgs.ping('this is just a fake message')
Reconnects the bot to <network> when it has become disconnected. def _connect(self, network, realIrc, serverPort=None, makeNew=True):
"""
network = privmsgs.getArgs(args)
try: try:
toReconnect = self.ircs[network] group = conf.supybot.networks.get(network)
except KeyError: try:
irc.error('I\'m not connected to %s.' % network) (server, port) = group.server().split(':')
return serverPort = (server, int(port))
toReeconnect.driver.reconnect() except ValueError: # Unpack list of wrong size.
irc.replySuccess() serverPort = (group.server(), 6667)
reconnect = privmsgs.checkCapability(reconnect, 'owner') except registry.NonExistentRegistryEntry:
# XXX: This should be a real error.
if serverPort is None:
raise ValueError, '_connect requires a (server, port) if ' \
'the network is not registered.'
conf.registerNetwork(network, server=('%s:%s' % serverPort))
if makeNew:
self.log.info('Creating new Irc for relaying to %s.', network)
newIrc = irclib.Irc(network)
newIrc.state.history = realIrc.state.history
newIrc.callbacks = realIrc.callbacks
driver = drivers.newDriver(serverPort, newIrc)
else:
newIrc = realIrc
self._addIrc(newIrc)
networks = self.registryValue('networks')
networks.add(network)
# XXX: Should set the value here, but I'm lazy, this'll work for now.
def disconnect(self, irc, msg, args): def disconnect(self, irc, msg, args):
"""<network> """<network>
Disconnects and ceases to relay to and from the network represented by Disconnects and ceases to relay to and from the network represented by
the network abbreviation <network>. the network <network>.
""" """
if not self.started:
irc.error('You must use the start command first.')
return
network = privmsgs.getArgs(args) network = privmsgs.getArgs(args)
otherIrc = self.ircs[network] otherIrc = self._getIrc(network)
otherIrc.driver.die() otherIrc.driver.die()
world.ircs.remove(otherIrc) world.ircs.remove(otherIrc)
del self.ircs[network] self.ircs.remove(otherIrc) # Should we abstract this?
del self.abbreviations[otherIrc]
irc.replySuccess() irc.replySuccess()
disconnect = privmsgs.checkCapability(disconnect, 'owner') disconnect = privmsgs.checkCapability(disconnect, 'owner')
@ -221,15 +220,12 @@ class Relay(callbacks.Privmsg):
relay between those channels unless he's told to join both relay between those channels unless he's told to join both
channels. channels.
""" """
if not self.started:
irc.error('You must use the start command first.')
return
channel = privmsgs.getArgs(args) channel = privmsgs.getArgs(args)
if not ircutils.isChannel(channel): if not ircutils.isChannel(channel):
irc.error('%r is not a valid channel.' % channel) irc.error('%r is not a valid channel.' % channel)
return return
self.registryValue('channels').add(ircutils.toLower(channel)) self.registryValue('channels').add(channel)
for otherIrc in self.ircs.itervalues(): for otherIrc in self.ircs: # Should we abstract this?
if channel not in otherIrc.state.channels: if channel not in otherIrc.state.channels:
otherIrc.queueMsg(ircmsgs.join(channel)) otherIrc.queueMsg(ircmsgs.join(channel))
irc.replySuccess() irc.replySuccess()
@ -242,15 +238,12 @@ class Relay(callbacks.Privmsg):
will part from the channel on all networks in which it is on the will part from the channel on all networks in which it is on the
channel. channel.
""" """
if not self.started:
irc.error('You must use the start command first.')
return
channel = privmsgs.getArgs(args) channel = privmsgs.getArgs(args)
if not ircutils.isChannel(channel): if not ircutils.isChannel(channel):
irc.error('%r is not a valid channel.' % channel) irc.error('%r is not a valid channel.' % channel)
return return
self.registryValue('channels').remove(ircutils.toLower(channel)) self.registryValue('channels').remove(channel)
for otherIrc in self.ircs.itervalues(): for otherIrc in self.ircs:
if channel in otherIrc.state.channels: if channel in otherIrc.state.channels:
otherIrc.queueMsg(ircmsgs.part(channel)) otherIrc.queueMsg(ircmsgs.part(channel))
irc.replySuccess() irc.replySuccess()
@ -261,14 +254,11 @@ class Relay(callbacks.Privmsg):
Gives the bot <command> (with its associated <arg>s) on <network>. Gives the bot <command> (with its associated <arg>s) on <network>.
""" """
if not self.started:
irc.error('You must use the start command first.')
return
if len(args) < 2: if len(args) < 2:
raise callbacks.ArgumentError raise callbacks.ArgumentError
network = args.pop(0) network = args.pop(0)
try: try:
otherIrc = self.ircs[network] otherIrc = self._getIrc(network)
except KeyError: except KeyError:
irc.error('I\'m not currently on the network %r.' % network) irc.error('I\'m not currently on the network %r.' % network)
return return
@ -277,29 +267,6 @@ class Relay(callbacks.Privmsg):
self.Proxy(otherIrc, msg, args) self.Proxy(otherIrc, msg, args)
command = privmsgs.checkCapability(command, 'admin') command = privmsgs.checkCapability(command, 'admin')
def say(self, irc, msg, args):
"""<network> [<channel>] <text>
Says <text> on <channel> (using the current channel if unspecified)
on <network>.
"""
if not self.started:
irc.error('You must use the start command first.')
return
if not args:
raise callbacks.ArgumentError
network = args.pop(0)
channel = privmsgs.getChannel(msg, args)
text = privmsgs.getArgs(args)
if network not in self.ircs:
irc.error('I\'m not currently on %s.' % network)
return
if channel not in self.registryValue('channels'):
irc.error('I\'m not currently relaying to %s.' % channel)
return
self.ircs[network].queueMsg(ircmsgs.privmsg(channel, text))
say = privmsgs.checkCapability(say, 'admin')
def nicks(self, irc, msg, args): def nicks(self, irc, msg, args):
"""[<channel>] (only if not sent in the channel itself.) """[<channel>] (only if not sent in the channel itself.)
@ -307,25 +274,23 @@ class Relay(callbacks.Privmsg):
the channel itself. Returns the nicks of the people in the channel on the channel itself. Returns the nicks of the people in the channel on
the various networks the bot is connected to. the various networks the bot is connected to.
""" """
if not self.started:
irc.error('You must use the start command first.')
return
realIrc = self._getRealIrc(irc) realIrc = self._getRealIrc(irc)
channel = privmsgs.getChannel(msg, args) channel = privmsgs.getChannel(msg, args)
if channel not in self.registryValue('channels'): if channel not in self.registryValue('channels'):
irc.error('I\'m not relaying %s.' % channel) irc.error('I\'m not relaying in %s.' % channel)
return return
users = [] users = []
for (abbreviation, otherIrc) in self.ircs.iteritems(): for irc in self.ircs:
network = self._getIrcName(irc)
ops = [] ops = []
halfops = [] halfops = []
voices = [] voices = []
usersS = [] usersS = []
if abbreviation != self.abbreviations[realIrc]: if network != self._getIrcName(realIrc):
try: try:
Channel = otherIrc.state.channels[channel] Channel = otherIrc.state.channels[channel]
except KeyError: except KeyError:
s = 'Somehow I\'m not in %s on %s.'% (channel,abbreviation) s = 'Somehow I\'m not in %s on %s.'% (channel, network)
irc.error(s) irc.error(s)
return return
numUsers = 0 numUsers = 0
@ -349,7 +314,7 @@ class Relay(callbacks.Privmsg):
usersS = ', '.join(ifilter(None, imap(', '.join, usersS = ', '.join(ifilter(None, imap(', '.join,
(ops,halfops,voices,usersS)))) (ops,halfops,voices,usersS))))
users.append('%s (%s): %s' % users.append('%s (%s): %s' %
(ircutils.bold(abbreviation), numUsers, usersS)) (ircutils.bold(network), numUsers, usersS))
users.sort() users.sort()
irc.reply('; '.join(users)) irc.reply('; '.join(users))
@ -358,9 +323,6 @@ class Relay(callbacks.Privmsg):
Returns the WHOIS response <network> gives for <nick>. Returns the WHOIS response <network> gives for <nick>.
""" """
if not self.started:
irc.error('You must use the start command first.')
return
nickAtNetwork = privmsgs.getArgs(args) nickAtNetwork = privmsgs.getArgs(args)
realIrc = self._getRealIrc(irc) realIrc = self._getRealIrc(irc)
try: try:
@ -369,20 +331,21 @@ class Relay(callbacks.Privmsg):
irc.error('%s is not an IRC nick.' % nick) irc.error('%s is not an IRC nick.' % nick)
return return
nick = ircutils.toLower(nick) nick = ircutils.toLower(nick)
except ValueError: except ValueError: # If split doesn't work, we get an unpack error.
if len(self.abbreviations) == 2: if len(self.ircs) == 2:
# If there are only two networks being relayed, we can safely # If there are only two networks being relayed, we can safely
# pick the *other* one. # pick the *other* one.
nick = ircutils.toLower(nickAtNetwork) nick = ircutils.toLower(nickAtNetwork)
for (keyIrc, net) in self.abbreviations.iteritems(): for otherIrc in self.ircs:
if keyIrc != realIrc: if otherIrc != realIrc:
network = net network = self._getIrcName(otherIrc)
else: else:
raise callbacks.ArgumentError raise callbacks.ArgumentError
if network not in self.ircs: try:
otherIrc = self._getIrc(network)
except KeyError:
irc.error('I\'m not on that network.') irc.error('I\'m not on that network.')
return return
otherIrc = self.ircs[network]
otherIrc.queueMsg(ircmsgs.whois(nick, nick)) otherIrc.queueMsg(ircmsgs.whois(nick, nick))
self._whois[(otherIrc, nick)] = (irc, msg, {}) self._whois[(otherIrc, nick)] = (irc, msg, {})
@ -394,6 +357,7 @@ class Relay(callbacks.Privmsg):
else: else:
self._whois[(irc, nick)][-1][msg.command] = msg self._whois[(irc, nick)][-1][msg.command] = msg
# These are all sent by a WHOIS response.
do301 = do311 do301 = do311
do312 = do311 do312 = do311
do317 = do311 do317 = do311
@ -474,7 +438,7 @@ class Relay(callbacks.Privmsg):
return return
(replyIrc, replyMsg, d) = self._whois[(irc, loweredNick)] (replyIrc, replyMsg, d) = self._whois[(irc, loweredNick)]
del self._whois[(irc, loweredNick)] del self._whois[(irc, loweredNick)]
s = 'There is no %s on %s.' % (nick, self.abbreviations[irc]) s = 'There is no %s on %s.' % (nick, self._getIrcName(irc))
replyIrc.reply(s) replyIrc.reply(s)
do401 = do402 do401 = do402
@ -509,82 +473,76 @@ class Relay(callbacks.Privmsg):
def _sendToOthers(self, irc, msg): def _sendToOthers(self, irc, msg):
assert msg.command == 'PRIVMSG' or msg.command == 'TOPIC' assert msg.command == 'PRIVMSG' or msg.command == 'TOPIC'
for otherIrc in self.ircs.itervalues(): for otherIrc in self.ircs:
if otherIrc != irc: if otherIrc != irc:
if msg.args[0] in otherIrc.state.channels: if msg.args[0] in otherIrc.state.channels:
self._addRelayedMsg(msg) self._addRelayedMsg(msg)
otherIrc.queueMsg(msg) otherIrc.queueMsg(msg)
def doPrivmsg(self, irc, msg): def doPrivmsg(self, irc, msg):
if self.started and ircutils.isChannel(msg.args[0]): (channel, text) = msg.args
if ircutils.isChannel(channel):
irc = self._getRealIrc(irc) irc = self._getRealIrc(irc)
channel = msg.args[0]
if channel not in self.registryValue('channels'): if channel not in self.registryValue('channels'):
return return
if ircutils.isCtcp(msg) and \ if ircutils.isCtcp(msg) and \
not 'AWAY' in msg.args[1] and \ 'AWAY' not in text and 'ACTION' not in text:
not 'ACTION' in msg.args[1]:
return return
abbreviation = self.abbreviations[irc] network = self._getIrcName(irc)
s = self._formatPrivmsg(msg.nick, abbreviation, msg) s = self._formatPrivmsg(msg.nick, network, msg)
m = ircmsgs.privmsg(channel, s) m = ircmsgs.privmsg(channel, s)
self._sendToOthers(irc, m) self._sendToOthers(irc, m)
def doJoin(self, irc, msg): def doJoin(self, irc, msg):
if self.started:
irc = self._getRealIrc(irc) irc = self._getRealIrc(irc)
channel = msg.args[0] channel = msg.args[0]
if channel not in self.registryValue('channels'): if channel not in self.registryValue('channels'):
return return
abbreviation = self.abbreviations[irc] network = self._getIrcName(irc)
s = '%s (%s) has joined on %s' % (msg.nick,msg.prefix,abbreviation) s = '%s (%s) has joined on %s' % (msg.nick, msg.prefix, network)
m = ircmsgs.privmsg(channel, s) m = ircmsgs.privmsg(channel, s)
self._sendToOthers(irc, m) self._sendToOthers(irc, m)
def doPart(self, irc, msg): def doPart(self, irc, msg):
if self.started:
irc = self._getRealIrc(irc) irc = self._getRealIrc(irc)
channel = msg.args[0] channel = msg.args[0]
if channel not in self.registryValue('channels'): if channel not in self.registryValue('channels'):
return return
abbreviation = self.abbreviations[irc] network = self._getIrcName(irc)
s = '%s (%s) has left on %s' % (msg.nick, msg.prefix, abbreviation) s = '%s (%s) has left on %s' % (msg.nick, msg.prefix, network)
m = ircmsgs.privmsg(channel, s) m = ircmsgs.privmsg(channel, s)
self._sendToOthers(irc, m) self._sendToOthers(irc, m)
def doMode(self, irc, msg): def doMode(self, irc, msg):
if self.started:
irc = self._getRealIrc(irc) irc = self._getRealIrc(irc)
channel = msg.args[0] channel = msg.args[0]
if channel not in self.registryValue('channels'): if channel not in self.registryValue('channels'):
return return
abbreviation = self.abbreviations[irc] network = self._getIrcName(irc)
s = 'mode change by %s on %s: %s' % \ s = 'mode change by %s on %s: %s' % \
(msg.nick, abbreviation, ' '.join(msg.args[1:])) (msg.nick, network, ' '.join(msg.args[1:]))
m = ircmsgs.privmsg(channel, s) m = ircmsgs.privmsg(channel, s)
self._sendToOthers(irc, m) self._sendToOthers(irc, m)
def doKick(self, irc, msg): def doKick(self, irc, msg):
if self.started:
irc = self._getRealIrc(irc) irc = self._getRealIrc(irc)
channel = msg.args[0] channel = msg.args[0]
if channel not in self.registryValue('channels'): if channel not in self.registryValue('channels'):
return return
abbrev = self.abbreviations[irc] network = self._getIrcName(irc)
if len(msg.args) == 3: if len(msg.args) == 3:
s = '%s was kicked by %s on %s (%s)' % \ s = '%s was kicked by %s on %s (%s)' % \
(msg.args[1], msg.nick, abbrev, msg.args[2]) (msg.args[1], msg.nick, network, msg.args[2])
else: else:
s = '%s was kicked by %s on %s' % \ s = '%s was kicked by %s on %s' % \
(msg.args[1], msg.nick, abbrev) (msg.args[1], msg.nick, network)
m = ircmsgs.privmsg(channel, s) m = ircmsgs.privmsg(channel, s)
self._sendToOthers(irc, m) self._sendToOthers(irc, m)
def doNick(self, irc, msg): def doNick(self, irc, msg):
if self.started:
irc = self._getRealIrc(irc) irc = self._getRealIrc(irc)
newNick = msg.args[0] newNick = msg.args[0]
network = self.abbreviations[irc] network = self._getIrcName(irc)
s = 'nick change by %s to %s on %s' % (msg.nick, newNick, network) s = 'nick change by %s to %s on %s' % (msg.nick, newNick, network)
for channel in self.registryValue('channels'): for channel in self.registryValue('channels'):
if newNick in irc.state.channels[channel].users: if newNick in irc.state.channels[channel].users:
@ -592,14 +550,13 @@ class Relay(callbacks.Privmsg):
self._sendToOthers(irc, m) self._sendToOthers(irc, m)
def doTopic(self, irc, msg): def doTopic(self, irc, msg):
if self.started:
irc = self._getRealIrc(irc) irc = self._getRealIrc(irc)
if msg.nick == irc.nick: if msg.nick == irc.nick:
return return
(channel, newTopic) = msg.args (channel, newTopic) = msg.args
if channel not in self.registryValue('channels'): if channel not in self.registryValue('channels'):
return return
network = self.abbreviations[irc] network = self._getIrcName(irc)
if self.registryValue('topicSync', channel): if self.registryValue('topicSync', channel):
m = ircmsgs.topic(channel, newTopic) m = ircmsgs.topic(channel, newTopic)
else: else:
@ -608,9 +565,8 @@ class Relay(callbacks.Privmsg):
self._sendToOthers(irc, m) self._sendToOthers(irc, m)
def doQuit(self, irc, msg): def doQuit(self, irc, msg):
if self.started:
irc = self._getRealIrc(irc) irc = self._getRealIrc(irc)
network = self.abbreviations[irc] network = self._getIrcName(irc)
if msg.args: if msg.args:
s = '%s has quit %s (%s)' % (msg.nick, network, msg.args[0]) s = '%s has quit %s (%s)' % (msg.nick, network, msg.args[0])
else: else:
@ -628,37 +584,22 @@ class Relay(callbacks.Privmsg):
return True return True
else: else:
return False return False
## abbreviations = self.abbreviations.values()
## rPrivmsg = re.compile(r'<[^@]+@(?:%s)>' % '|'.join(abbreviations))
## rAction = re.compile(r'\* [^/]+@(?:%s) ' % '|'.join(abbreviations))
## text = ircutils.stripColor(msg.args[1])
## return (rPrivmsg.match(text) or \
## rAction.match(text) or \
## 'has left on ' in text or \
## 'has joined on ' in text or \
## 'has quit ' in text or \
## 'was kicked by' in text or \
## text.startswith('mode change') or \
## text.startswith('nick change') or \
## text.startswith('topic change'))
def outFilter(self, irc, msg): def outFilter(self, irc, msg):
if not self.started:
return msg
irc = self._getRealIrc(irc) irc = self._getRealIrc(irc)
if msg.command == 'PRIVMSG': if msg.command == 'PRIVMSG':
if not self._isRelayedPrivmsg(msg): if not self._isRelayedPrivmsg(msg):
channel = msg.args[0] channel = msg.args[0]
if channel in self.registryValue('channels'): if channel in self.registryValue('channels'):
abbreviation = self.abbreviations[irc] network = self._getIrcName(irc)
s = self._formatPrivmsg(irc.nick, abbreviation, msg) s = self._formatPrivmsg(irc.nick, network, msg)
relayMsg = ircmsgs.privmsg(channel, s) relayMsg = ircmsgs.privmsg(channel, s)
self._sendToOthers(irc, relayMsg) self._sendToOthers(irc, relayMsg)
elif msg.command == 'TOPIC' and len(msg.args) > 1 and \ elif msg.command == 'TOPIC' and len(msg.args) > 1 and \
self.registryValue('topicSync', msg.args[0]): self.registryValue('topicSync', msg.args[0]):
(channel, topic) = msg.args (channel, topic) = msg.args
if channel in self.registryValue('channels'): if channel in self.registryValue('channels'):
for otherIrc in self.ircs.itervalues(): for otherIrc in self.ircs:
if otherIrc != irc: if otherIrc != irc:
try: try:
if otherIrc.state.getTopic(channel) != topic: if otherIrc.state.getTopic(channel) != topic: