Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-24 11:42:52 +01:00
Code Issues Projects Releases Wiki Activity

Try to make network stuff case-insensitive.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-08-28 20:13:33 +00:00
parent 570b3024c2
commit 1c737a4c8f
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/Owner.py
View File

@ -220,6 +220,13 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
continue continue
registerDefaultPlugin(name, s) registerDefaultPlugin(name, s)
def _getIrc(self, network):
network = network.lower()
for irc in world.ircs:
if irc.network.lower() == network:
return irc
return None
def outFilter(self, irc, msg): def outFilter(self, irc, msg):
if msg.command == 'PRIVMSG' and not world.testing: if msg.command == 'PRIVMSG' and not world.testing:
if ircutils.strEqual(msg.args[0], irc.nick): if ircutils.strEqual(msg.args[0], irc.nick):
@ -652,13 +659,24 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
irc.error('There was no plugin %s.' % name) irc.error('There was no plugin %s.' % name)
def reconnect(self, irc, msg, args): def reconnect(self, irc, msg, args):
"""takes no arguments """[<network>]
Disconnects and then reconnects to the current network. Disconnects and then reconnects to <network>. If no network is given,
disconnects and then reconnects to the network the command was given
on.
""" """
network = privmsgs.getArgs(args, required=0, optional=1)
if network:
badIrc = self._getIrc(network)
if badIrc is None:
irc.error('I\'m not currently connected on %s.' % network)
return
else:
badIrc = irc
try: try:
irc.driver.reconnect() badIrc.driver.reconnect()
irc.replySuccess() if badIrc != irc:
irc.replySuccess()
except AttributeError: # There's a cleaner way to do this, but I'm lazy. except AttributeError: # There's a cleaner way to do this, but I'm lazy.
irc.error('I couldn\'t reconnect. You should restart me instead.') irc.error('I couldn\'t reconnect. You should restart me instead.')
@ -786,10 +804,10 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
defaults to 6667, the default port for IRC. defaults to 6667, the default port for IRC.
""" """
(network, server) = privmsgs.getArgs(args, optional=1) (network, server) = privmsgs.getArgs(args, optional=1)
for otherIrc in world.ircs: otherIrc = self._getIrc(network)
if otherIrc.network == network: if otherIrc is not None:
irc.error('I\'m already connected to %s.' % network) irc.error('I\'m already connected to %s.' % network)
return return
if server: if server:
if ':' in server: if ':' in server:
(server, port) = server.split(':') (server, port) = server.split(':')
@ -806,7 +824,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
return return
newIrc = self._connect(network, serverPort=serverPort) newIrc = self._connect(network, serverPort=serverPort)
conf.supybot.networks().add(network) conf.supybot.networks().add(network)
assert newIrc.callbacks == irc.callbacks, 'callbacks list is different' assert newIrc.callbacks is irc.callbacks, 'callbacks list is different'
irc.replySuccess() irc.replySuccess()
def disconnect(self, irc, msg, args): def disconnect(self, irc, msg, args):
@ -819,23 +837,19 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
(network, quitMsg) = privmsgs.getArgs(args, optional=1) (network, quitMsg) = privmsgs.getArgs(args, optional=1)
if not quitMsg: if not quitMsg:
quitMsg = msg.nick quitMsg = msg.nick
for otherIrc in world.ircs: otherIrc = self._getIrc(network)
if otherIrc.network == network: if otherIrc is not None:
# Here, rather than lower, in case we're being told to # replySuccess here, rather than lower, in case we're being
# disconnect from the network we received the command on. # told to disconnect from the network we received the command on.
irc.replySuccess() irc.replySuccess()
otherIrc.queueMsg(ircmsgs.quit(quitMsg)) otherIrc.queueMsg(ircmsgs.quit(quitMsg))
otherIrc.die() otherIrc.die()
break
else: else:
irc.error('I\'m not connected to %s.' % network, Raise=True) irc.error('I\'m not connected to %s.' % network, Raise=True)
conf.supybot.networks().remove(network) conf.supybot.networks().discard(network)
Class = Owner Class = Owner
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: