reviewAfterTime is now stored in seconds, but when setting the value the unit
is days. This saves the user for calculating how many seconds a day is, while allowing me to set times of some seconds for automatic testing.
This commit is contained in:
parent
e60e72a620
commit
3dd2f09769
|
@ -23,6 +23,20 @@ class SpaceSeparatedListOfTypes(registry.SpaceSeparatedListOf):
|
||||||
Value = ValidTypes
|
Value = ValidTypes
|
||||||
|
|
||||||
|
|
||||||
|
# This registry translates days to seconds
|
||||||
|
# storing seconds instead of days is more convenient for testing
|
||||||
|
class DaysToSeconds(registry.Integer):
|
||||||
|
"""Value must be an integer and not higher than 100"""
|
||||||
|
def set(self, s):
|
||||||
|
try:
|
||||||
|
n = int(s)
|
||||||
|
if n > 100:
|
||||||
|
raise ValueError
|
||||||
|
self.setValue(n*84600)
|
||||||
|
except ValueError:
|
||||||
|
self.error()
|
||||||
|
|
||||||
|
|
||||||
def configure(advanced):
|
def configure(advanced):
|
||||||
conf.registerPlugin('Bantracker', True)
|
conf.registerPlugin('Bantracker', True)
|
||||||
|
|
||||||
|
@ -57,4 +71,6 @@ conf.registerChannelValue(Bantracker.commentRequest.forward, 'channels',
|
||||||
conf.registerGlobalValue(Bantracker, 'reviewTime',
|
conf.registerGlobalValue(Bantracker, 'reviewTime',
|
||||||
registry.Integer(0, "", ))
|
registry.Integer(0, "", ))
|
||||||
conf.registerGlobalValue(Bantracker, 'reviewAfterTime',
|
conf.registerGlobalValue(Bantracker, 'reviewAfterTime',
|
||||||
registry.Integer(2, "", ))
|
DaysToSeconds(7*84600,
|
||||||
|
"Days after which the bot will request for review a ban. NOTE: the number of days is"
|
||||||
|
" stored in seconds, but when configuring it the time unit is in days."))
|
||||||
|
|
|
@ -383,10 +383,13 @@ class Bantracker(callbacks.Plugin):
|
||||||
|
|
||||||
def reviewBans(self):
|
def reviewBans(self):
|
||||||
try:
|
try:
|
||||||
|
reviewAfterTime = self.registryValue('reviewAfterTime')
|
||||||
|
if not reviewAfterTime:
|
||||||
|
# time is zero, do nothing
|
||||||
|
return
|
||||||
self.log.debug('Checking for bans that need review ...')
|
self.log.debug('Checking for bans that need review ...')
|
||||||
now = time.mktime(time.gmtime())
|
now = time.mktime(time.gmtime())
|
||||||
lastreview = self.registryValue('reviewTime')
|
lastreview = self.registryValue('reviewTime')
|
||||||
reviewAfterTime = self.registryValue('reviewAfterTime') * 60 # time in mins
|
|
||||||
if not lastreview:
|
if not lastreview:
|
||||||
# initialize last time reviewed timestamp
|
# initialize last time reviewed timestamp
|
||||||
lastreview = now - reviewAfterTime
|
lastreview = now - reviewAfterTime
|
||||||
|
|
Loading…
Reference in New Issue