Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-25 04:02:46 +01:00
Code Issues Projects Releases Wiki Activity

Finally removed supybot.channels.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-10-24 07:55:41 +00:00
parent cd2a06a259
commit 03b740ec9d
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Admin.py
View File

@ -134,7 +134,7 @@ class Admin(privmsgs.CapabilityCheckingPrivmsg):
ircdb.checkCapability(msg.prefix, 'admin'): ircdb.checkCapability(msg.prefix, 'admin'):
self.log.info('Invited to %s by %s.', channel, msg.prefix) self.log.info('Invited to %s by %s.', channel, msg.prefix)
irc.queueMsg(ircmsgs.join(channel)) irc.queueMsg(ircmsgs.join(channel))
conf.supybot.channels().add(channel) conf.supybot.networks.get(irc.network).channels().add(channel)
def join(self, irc, msg, args): def join(self, irc, msg, args):
"""<channel>[,<key>] [<channel>[,<key>] ...] """<channel>[,<key>] [<channel>[,<key>] ...]

4
src/Owner.py
View File

@ -342,9 +342,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
world.starting = False world.starting = False
def do376(self, irc, msg): def do376(self, irc, msg):
channels = ircutils.IrcSet(conf.supybot.channels()) channels = list(conf.supybot.networks.get(irc.network).channels())
channels |= conf.supybot.networks.get(irc.network).channels()
channels = list(channels)
if not channels: if not channels:
return return
utils.sortBy(lambda s: ',' not in s, channels) utils.sortBy(lambda s: ',' not in s, channels)

4
src/conf.py
View File

@ -267,10 +267,6 @@ for (name, s) in registry._cache.iteritems():
registerNetwork(name) registerNetwork(name)
registerGlobalValue(supybot, 'channels',
SpaceSeparatedSetOfChannels([], """Determines what channels the bot will
join when it connects to the server."""))
### ###
# Reply/error tweaking. # Reply/error tweaking.
### ###