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

Changed the variable names supybot.plugins.Herald.throttleTime (to throttle) and .throttleTimeAfterPart to .throttle.afterPart. Also changed the default of .throttle.afterPart, so people could test that it works more easily.

This commit is contained in:
Jeremy Fincher 2005-02-02 17:28:03 +00:00
parent 10e496eed0
commit d44a1ad737
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/Herald/config.py
View File

@ -44,9 +44,13 @@ conf.registerChannelValue(Herald, 'heralding',
registry.Boolean(True, """Determines whether messages will be sent to the
channel when a recognized user joins; basically enables or disables the
plugin."""))
conf.registerChannelValue(Herald, 'throttleTime',
conf.registerChannelValue(Herald, 'throttle',
registry.PositiveInteger(600, """Determines the minimum number of seconds
between heralds."""))
conf.registerChannelValue(Herald.throttle, 'afterPart',
registry.NonNegativeInteger(0, """Determines the minimum number of seconds
after parting that the bot will not herald the person when he or she
rejoins."""))
conf.registerChannelValue(Herald, 'default',
registry.String('', """Sets the default herald to use. If a user has a
personal herald specified, that will be used instead. If set to the empty
@ -57,9 +61,5 @@ conf.registerChannelValue(Herald.default, 'notice',
conf.registerChannelValue(Herald.default, 'public',
registry.Boolean(False, """Determines whether the default herald will be
sent publicly."""))
conf.registerChannelValue(Herald, 'throttleTimeAfterPart',
registry.PositiveInteger(60, """Determines the minimum number of seconds
after parting that the bot will not herald the person when he or she
rejoins."""))
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78

4
plugins/Herald/plugin.py
View File

@ -89,10 +89,10 @@ class Herald(callbacks.Privmsg):
irc.queueMsg(msgmaker(target, default))
return
now = time.time()
throttle = self.registryValue('throttleTime', channel)
throttle = self.registryValue('throttle', channel)
if now - self.lastHerald.get((channel, id), 0) > throttle:
if (channel, id) in self.lastParts:
i = self.registryValue('throttleTimeAfterPart', channel)
i = self.registryValue('throttle.afterPart', channel)
if now - self.lastParts[channel, id] < i:
return
self.lastHerald[channel, id] = now