From c0254f87d826d5d38fdf2c0d24089e96564533cf Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Sun, 24 Oct 2004 07:38:55 +0000 Subject: [PATCH] Made join/part network-specific. --- src/Admin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Admin.py b/src/Admin.py index b24700be2..d7edac14b 100755 --- a/src/Admin.py +++ b/src/Admin.py @@ -159,7 +159,7 @@ class Admin(privmsgs.CapabilityCheckingPrivmsg): if not irc.isChannel(channel): irc.errorInvalid('channel', channel) return - conf.supybot.channels().add(original) + conf.supybot.networks.get(irc.network).channels().add(original) maxchannels = irc.state.supported.get('maxchannels', sys.maxint) if len(irc.state.channels) + len(channels) > maxchannels: irc.error('I\'m already too close to maximum number of ' @@ -260,7 +260,8 @@ class Admin(privmsgs.CapabilityCheckingPrivmsg): return for chan in channels: try: - conf.supybot.channels.removeChannel(chan) + network = conf.supybot.networks.get(irc.network) + network.channels.removeChannel(chan) except KeyError: pass # It might be in the network thingy. try: