Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-01 23:24:10 +01:00
Code Issues Projects Releases Wiki Activity

That assert just plain wasn't working out. Also, changed how supybot.user works so it stays up-to-date with the current version of the bot.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-12-20 19:46:35 +00:00
parent 9d3cb7952d
commit 07435be632
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conf.py
View File

@ -114,11 +114,11 @@ def registerPlugin(name, currentValue=None, public=True):
return group return group
def get(group, channel=None): def get(group, channel=None):
if channel is None or not group.channelValue: if group.channelValue and \
return group() channel is not None and ircutils.isChannel(channel):
else:
assert ircutils.isChannel(channel)
return group.get(channel)() return group.get(channel)()
else:
return group()
### ###
# The user info registry. # The user info registry.
@ -190,9 +190,17 @@ registerGlobalValue(supybot, 'ident',
ValidNick('supybot', """Determines the bot's ident string, if the server ValidNick('supybot', """Determines the bot's ident string, if the server
doesn't provide one by default.""")) doesn't provide one by default."""))
class VersionIfEmpty(registry.String):
def __call__(self):
ret = registry.String.__call__(self)
if not ret:
ret = 'Supybot %s' % version
return ret
registerGlobalValue(supybot, 'user', registerGlobalValue(supybot, 'user',
registry.String('Supybot %s' % version, """Determines the user the bot VersionIfEmpty('', """Determines the user the bot sends to the server.
sends to the server.""")) A standard user using the current version of the bot will be generated if
this is left empty."""))
class Networks(registry.SpaceSeparatedSetOfStrings): class Networks(registry.SpaceSeparatedSetOfStrings):
List = ircutils.IrcSet List = ircutils.IrcSet
@ -769,10 +777,6 @@ registerGlobalValue(supybot.databases.users, 'allowUnregistration',
(Do also note that this does not prevent the owner of the bot from using (Do also note that this does not prevent the owner of the bot from using
the unregister command.) the unregister command.)
""")) """))
registerGlobalValue(supybot.databases.users, 'hash',
registry.Boolean(True, """Determines whether the passwords in the user
database will be hashed by default. This only affects new users; users
already registered will maintain their current hashedness."""))
registerGroup(supybot.databases, 'ignores') registerGroup(supybot.databases, 'ignores')
registerGlobalValue(supybot.databases.ignores, 'filename', registerGlobalValue(supybot.databases.ignores, 'filename',