changed a little removal period

This commit is contained in:
Nicolas Coevoet 2014-01-24 00:50:28 +01:00
parent f6ed0ca44c
commit ccc16a8252

View File

@ -716,7 +716,7 @@ class Ircd (object):
newEnd = begin_at newEnd = begin_at
reason = 'never expires' reason = 'never expires'
elif seconds == 0: elif seconds == 0:
newEnd = current-1 # force expires for next tickle newEnd = current # force expires for next tickle
reason = 'expires at [%s], for %s in total' % (floatToGMT(newEnd),utils.timeElapsed(newEnd-begin_at)) reason = 'expires at [%s], for %s in total' % (floatToGMT(newEnd),utils.timeElapsed(newEnd-begin_at))
else: else:
newEnd = current+seconds newEnd = current+seconds
@ -731,7 +731,7 @@ class Ircd (object):
i.expire = None i.expire = None
else: else:
i.expire = newEnd i.expire = newEnd
if scheduleFunction: if scheduleFunction and newEnd != current:
scheduleFunction(irc,newEnd) scheduleFunction(irc,newEnd)
if logFunction: if logFunction:
logFunction(irc,channel,'[%s] [#%s +%s %s] edited by %s: %s' % (channel,uid,kind,mask,prefix.split('!')[0],reason)) logFunction(irc,channel,'[%s] [#%s +%s %s] edited by %s: %s' % (channel,uid,kind,mask,prefix.split('!')[0],reason))