From 5ffcf6511a70bdab15b84217d9aa31fb2dae7f3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Mon, 25 Jun 2012 19:30:11 -0300
Subject: [PATCH 01/40] some refactoing.  * added Ban.type property  *
 PersistentCache renamed to ReviewStore and made it work more like
 defaultdict.

---
 Bantracker/plugin.py | 77 +++++++++++++++++++++++++-------------------
 Bantracker/test.py   |  2 +-
 2 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index c5644fd..052197c 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -130,6 +130,7 @@ class MsgQueue(object):
 
 queue = MsgQueue()
 
+
 class Ban(object):
     """Hold my bans"""
     def __init__(self, args=None, **kwargs):
@@ -171,17 +172,31 @@ class Ban(object):
     def time(self):
         return datetime.datetime.fromtimestamp(self.when)
 
-def guessBanType(mask):
-    if mask[0] == '%':
-        return 'quiet'
-    elif ircutils.isUserHostmask(mask) or mask.endswith('(realname)'):
-        return 'ban'
-    return 'removal'
+    @property
+    def type(self):
+        mask = self.mask
+        if mask[0] == '%':
+            return 'quiet'
+        elif ircutils.isUserHostmask(mask) or mask.endswith('(realname)'):
+            if not ('*' in mask or '?' in mask or '$' in mask):
+                # XXX hack over hack, we are supposing these are marks as normal
+                # bans aren't usually set to exact match, while marks are.
+                return 'mark'
+            return 'ban'
+        return 'removal'
 
-class PersistentCache(dict):
+
+class ReviewStore(dict):
     def __init__(self, filename):
         self.filename = conf.supybot.directories.data.dirize(filename)
-        self.time = 0
+        self.lastReview = 0
+
+    def __getitem__(self, k):
+        try:
+            return dict.__getitem__(self, k)
+        except KeyError:
+            self[k] = L = []
+            return L
 
     def open(self):
         import csv
@@ -189,7 +204,7 @@ class PersistentCache(dict):
             reader = csv.reader(open(self.filename, 'rb'))
         except IOError:
             return
-        self.time = int(reader.next()[1])
+        self.lastReview = int(reader.next()[1])
         for row in reader:
             host, value = self.deserialize(*row)
             try:
@@ -205,7 +220,7 @@ class PersistentCache(dict):
             writer = csv.writer(open(self.filename, 'wb'))
         except IOError:
             return
-        writer.writerow(('time', str(int(self.time))))
+        writer.writerow(('time', str(int(self.lastReview))))
         for host, values in self.iteritems():
             for v in values:
                 writer.writerow(self.serialize(host, v))
@@ -254,7 +269,7 @@ class Bantracker(callbacks.Plugin):
             self.db = None
         self.get_bans(irc)
         self.get_nicks(irc)
-        self.pendingReviews = PersistentCache('bt.reviews.db')
+        self.pendingReviews = ReviewStore('bt.reviews.db')
         self.pendingReviews.open()
         self._banreviewfix()
         # add scheduled event for check bans that need review, check every hour
@@ -464,7 +479,7 @@ class Bantracker(callbacks.Plugin):
             return
         # check the type of the action taken
         mask = ban.mask
-        type = guessBanType(mask)
+        type = ban.type
         if type == 'quiet':
             mask = mask[1:]
         # check if type is enabled
@@ -479,11 +494,12 @@ class Bantracker(callbacks.Plugin):
         if nickMatch(nick, self.registryValue('request.ignore', channel)):
             return
         if nickMatch(nick, self.registryValue('request.forward', channel)):
+            # somebody else should comment this (like with bans set by bots)
             s = "Please somebody comment on the %s of %s in %s done by %s, use:"\
                 " %scomment %s <comment>" %(type, mask, channel, nick, prefix, ban.id)
             self._sendForward(irc, s, 'request', channel)
         else:
-            # send to op
+            # send to operator
             s = "Please comment on the %s of %s in %s, use: %scomment %s <comment>" \
                     %(type, mask, channel, prefix, ban.id)
             irc.reply(s, to=nick, private=True)
@@ -494,11 +510,11 @@ class Bantracker(callbacks.Plugin):
             # time is zero, do nothing
             return
         now = time.mktime(time.gmtime())
-        lastreview = self.pendingReviews.time
-        self.pendingReviews.time = now # update last time reviewed
-        if not lastreview:
+        lastReview = self.pendingReviews.lastReview
+        self.pendingReviews.lastReview = now # update last time reviewed
+        if not lastReview:
             # initialize last time reviewed timestamp
-            lastreview = now - reviewTime
+            lastReview = now - reviewTime
 
         for channel, bans in self.bans.iteritems():
             if not self.registryValue('enabled', channel) \
@@ -510,15 +526,14 @@ class Bantracker(callbacks.Plugin):
                 # the less I touch it the better.
                 if ban.mask.endswith('$#ubuntu-read-topic'):
                     continue
-                type = guessBanType(ban.mask)
-                if type == 'removal':
-                    # skip kicks
-                    continue
-                if not ('*' in ban.mask or '?' in ban.mask or '$' in ban.mask):
-                    # XXX hack over hack, we are supposing these are marks.
+
+                type = ban.type
+                if type in ('removal', 'mark'):
+                    # skip kicks and marks
                     continue
+
                 banAge = now - ban.when
-                reviewWindow = lastreview - ban.when
+                reviewWindow = lastReview - ban.when
                 #self.log.debug('review ban: %s ban %s by %s (%s/%s/%s %s)', channel, ban.mask,
                 #        ban.who, reviewWindow, reviewTime, banAge, reviewTime - reviewWindow)
                 if reviewWindow <= reviewTime < banAge:
@@ -563,11 +578,8 @@ class Bantracker(callbacks.Plugin):
                                    self.registryValue('bansite'),
                                    ban.id)
                         msg = ircmsgs.privmsg(nick, s)
-                        if host in self.pendingReviews \
-                            and (nick, msg) not in self.pendingReviews[host]:
+                        if (nick, msg) not in self.pendingReviews[host]:
                             self.pendingReviews[host].append((nick, msg))
-                        else:
-                            self.pendingReviews[host] = [(nick, msg)]
                 elif banAge < reviewTime:
                     # since we made sure bans are sorted by time, the bans left are more recent
                     break
@@ -596,10 +608,7 @@ class Bantracker(callbacks.Plugin):
         self.pendingReviews.clear()
 
         for host, nick, msg in nodups:
-            if host in self.pendingReviews:
-                self.pendingReviews[host].append((nick, msg))
-            else:
-                self.pendingReviews[host] = [(nick, msg)]
+            self.pendingReviews[host].append((nick, msg))
 
     def _sendReviews(self, irc, msg):
         host = ircutils.hostFromHostmask(msg.prefix)
@@ -1225,9 +1234,9 @@ class Bantracker(callbacks.Plugin):
                 nick, host = key.split('@', 1)
             else:
                 nick, host = key, None
-            try:
+            if host in self.pendingReviews:
                 reviews = self.pendingReviews[host]
-            except KeyError:
+            else:
                 irc.reply('No reviews for %s, use --verbose for check the correct nick@host key.' % key)
                 return
 
diff --git a/Bantracker/test.py b/Bantracker/test.py
index c93999a..e9c56c9 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -286,7 +286,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
         # check not pending anymore
         self.assertFalse(cb.pendingReviews)
 
-    def testPersistentCache(self):
+    def testReviewStore(self):
         """Save pending reviews and when bans were last checked. This is needed for plugin
         reloads"""
         msg1 = ircmsgs.privmsg('nick', 'Hello World')

From a08559a7589faf5eaecfe2b99f5d29f5d24665c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Mon, 25 Jun 2012 19:35:42 -0300
Subject: [PATCH 02/40] Fix spurious testcase fail,  sometimes seconds didn't
 match.

---
 Bantracker/plugin.py | 13 ++++++++++---
 Bantracker/test.py   | 13 +++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 052197c..3b80b08 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -70,6 +70,11 @@ tz = 'UTC'
 def now():
     return cPickle.dumps(datetime.datetime.now(pytz.timezone(tz)))
 
+def nowSeconds():
+    # apparently time.time() isn't the same thing.
+    # return time.time()
+    return int(time.mktime(time.gmtime()))
+
 def fromTime(x):
     return cPickle.dumps(datetime.datetime(*time.gmtime(x)[:6], **{'tzinfo': pytz.timezone("UTC")}))
 
@@ -509,7 +514,8 @@ class Bantracker(callbacks.Plugin):
         if not reviewTime:
             # time is zero, do nothing
             return
-        now = time.mktime(time.gmtime())
+
+        now = nowSeconds()
         lastReview = self.pendingReviews.lastReview
         self.pendingReviews.lastReview = now # update last time reviewed
         if not lastReview:
@@ -534,8 +540,9 @@ class Bantracker(callbacks.Plugin):
 
                 banAge = now - ban.when
                 reviewWindow = lastReview - ban.when
-                #self.log.debug('review ban: %s ban %s by %s (%s/%s/%s %s)', channel, ban.mask,
-                #        ban.who, reviewWindow, reviewTime, banAge, reviewTime - reviewWindow)
+                #self.log.debug('review ban: %s ban %s by %s (%s/%s/%s %s)', 
+                #        channel, ban.mask, ban.who, reviewWindow, reviewTime,
+                #        banAge, reviewTime - reviewWindow)
                 if reviewWindow <= reviewTime < banAge:
                     # ban is old enough, and inside the "review window"
                     try:
diff --git a/Bantracker/test.py b/Bantracker/test.py
index e9c56c9..399afcc 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -20,6 +20,7 @@ import supybot.conf as conf
 import supybot.ircmsgs as ircmsgs
 import supybot.world as world
 
+import re
 import time
 
 
@@ -241,12 +242,12 @@ class BantrackerTestCase(ChannelPluginTestCase):
         cb.reviewBans(self.irc)
         # since it's a forward, it was sent already
         self.assertFalse(cb.pendingReviews)
-        self.assertEqual(str(self.irc.takeMsg()).strip(),
-                "NOTICE #channel :Review: ban 'asd!*@*' set by bot on %s in #test, link: "\
-                "%s/bans.cgi?log=1" %(cb.bans['#test'][0].ascwhen, pluginConf.bansite()))
-        self.assertEqual(str(self.irc.takeMsg()).strip(),
-                "NOTICE #channel :Review: quiet 'asd!*@*' set by bot on %s in #test, link: "\
-                "%s/bans.cgi?log=2" %(cb.bans['#test'][0].ascwhen, pluginConf.bansite()))
+        self.assertTrue(re.search(
+                r"^NOTICE #channel :Review: ban 'asd!\*@\*' set by bot on .* in #test,"\
+                r" link: .*/bans\.cgi\?log=1$", str(self.irc.takeMsg()).strip()))
+        self.assertTrue(re.search(
+                r"^NOTICE #channel :Review: quiet 'asd!\*@\*' set by bot on .* in #test,"\
+                r" link: .*/bans\.cgi\?log=2$", str(self.irc.takeMsg()).strip()))
 
     def testReviewIgnore(self):
         pluginConf.review.setValue(True)

From 57c349aace784a87212640f5f1d0b3309f9cac85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Mon, 25 Jun 2012 19:40:09 -0300
Subject: [PATCH 03/40] Start hack for the ban autoremoval feature: *
 BanRemoval class that keeps data about bans that expires. * BanStore class
 for store BanRemoval objects * testBanAutoRemove testcase

right now it doesn't do much.
---
 Bantracker/plugin.py | 87 +++++++++++++++++++++++++++++++++++++++-----
 Bantracker/test.py   | 11 ++++++
 2 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 3b80b08..a1d1f6c 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -245,6 +245,60 @@ class ReviewStore(dict):
         return (host, nick, command, channel, text)
 
 
+class BanRemoval(object):
+    """This object saves information about a ban that should be removed when expires"""
+    def __init__(self, ban, expires):
+        """
+        ban: ban object
+        expires: time in seconds for it to expire
+        """
+        assert isinstance(ban, Ban), "ban is not a Ban object"
+        assert isinstance(expires, int), "expire time isn't an integer"
+        self.ban = ban
+        self.expires = expires
+
+    def expired(self):
+        """Check if the ban did expire."""
+        if nowSeconds() > (self.ban.when + self.expires):
+            return True
+        return False
+
+
+class BanStore(object):
+    def __init__(self, filename):
+        # this should be stored into a file
+        self.shelf = []
+
+    def __iter__(self):
+        return iter(self.shelf)
+
+    def __len__(self):
+        return len(self.shelf)
+
+    def add(self, obj):
+        self.shelf.append(obj)
+
+    def sort(self):
+        """Sort bans by expire date"""
+        def key(x):
+            return x.ban.when + x.expires
+
+        self.shelf.sort(key=key, reverse=True)
+
+    def popExpired(self):
+        """Pops a list of expired bans"""
+        def enumerateReversed(L):
+            """enumerate in reverse order"""
+            for i in reversed(xrange(len(L))):
+                yield i, L[i]
+
+        L = []
+        for i, ban in enumerateReversed(self.shelf):
+            if ban.expired():
+                L.append(ban)
+                del self.shelf[i]
+        return L
+
 
 class Bantracker(callbacks.Plugin):
     """Plugin to manage bans.
@@ -274,16 +328,21 @@ class Bantracker(callbacks.Plugin):
             self.db = None
         self.get_bans(irc)
         self.get_nicks(irc)
+
+        # init review stuff
         self.pendingReviews = ReviewStore('bt.reviews.db')
         self.pendingReviews.open()
         self._banreviewfix()
-        # add scheduled event for check bans that need review, check every hour
-        try:
-            schedule.removeEvent(self.name())
-        except:
-            pass
-        schedule.addPeriodicEvent(lambda : self.reviewBans(irc), 60*60,
-                name=self.name())
+
+        # init autoremove stuff
+        self.managedBans = BanStore('FIXME')
+
+        # add our scheduled events for check bans for reviews or removal
+        schedule.addPeriodicEvent(lambda: self.reviewBans(irc), 60*60,
+                                  name=self.name() + '_review')
+        schedule.addPeriodicEvent(lambda: self.autoRemoveBans(irc), 60,
+                                  name=self.name() + '_autoremove')
+
 
     def get_nicks(self, irc):
         self.hosts.clear()
@@ -410,7 +469,8 @@ class Bantracker(callbacks.Plugin):
         except:
             pass
         queue.clear()
-        schedule.removeEvent(self.name())
+        schedule.removeEvent(self.name() + '_review')
+        schedule.removeEvent(self.name() + '_autoremove')
         self.pendingReviews.close()
 
     def reset(self):
@@ -638,6 +698,10 @@ class Bantracker(callbacks.Plugin):
             if not L:
                 del self.pendingReviews[None]
 
+    def autoRemoveBans(self, irc=None):
+        for ban in self.managedBans.popExpired():
+            self.log.info('Ban %s expired' % ban.ban.mask)
+
     def doLog(self, irc, channel, s):
         if not self.registryValue('enabled', channel):
             return
@@ -788,7 +852,12 @@ class Bantracker(callbacks.Plugin):
 
                 if param[0] in ('+b', '+q'):
                     comment = self.getHostFromBan(irc, msg, mask)
-                    self.doKickban(irc, channel, msg.prefix, mask + realname, extra_comment=comment)
+                    ban = self.doKickban(irc, channel, msg.prefix, mask + realname, 
+                                         extra_comment=comment)
+                    if True:
+                        # FIXME ban autoremove should be set with a command, but I'm 
+                        # lazy.
+                        self.managedBans.add(BanRemoval(ban, 1))
                 elif param[0] in ('-b', '-q'):
                     self.doUnban(irc,channel, msg.nick, mask + realname)
 
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 399afcc..8fb7040 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -347,5 +347,16 @@ class BantrackerTestCase(ChannelPluginTestCase):
         fetch = self.query("SELECT id,channel,mask,operator FROM bans")
         self.assertEqual((1, '#test', 'troll', 'op'), fetch[0])
 
+    def testBanAutoRemove(self):
+        cb = self.getCallback()
+        self.feedBan('asd!*@*')
+        self.assertTrue(cb.managedBans) # ban in list
+        cb.autoRemoveBans()
+        self.assertTrue(cb.managedBans) # ban in list
+        time.sleep(2)
+        cb.autoRemoveBans()
+        self.assertFalse(cb.managedBans) # ban removed
+
+
 
 

From 912cc8490c5ecc12aec02f1a4e92acdf4bac7588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Wed, 27 Jun 2012 01:14:51 -0300
Subject: [PATCH 04/40] send -b/-q messages when ban/quiet expires

---
 Bantracker/plugin.py | 13 +++++++++++--
 Bantracker/test.py   |  7 +++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index a1d1f6c..3810ccc 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -142,10 +142,12 @@ class Ban(object):
         self.id = None
         if args:
             # in most ircd: args = (nick, channel, mask, who, when)
+            self.channel = args[1]
             self.mask = args[2]
             self.who = args[3]
             self.when = float(args[4])
         else:
+            self.channel = kwargs['channel']
             self.mask = kwargs['mask']
             self.who = kwargs['who']
             self.when = float(kwargs['when'])
@@ -699,8 +701,15 @@ class Bantracker(callbacks.Plugin):
                 del self.pendingReviews[None]
 
     def autoRemoveBans(self, irc=None):
+        modedict = { 'quiet': '-q', 'ban': '-b' }
         for ban in self.managedBans.popExpired():
-            self.log.info('Ban %s expired' % ban.ban.mask)
+            channel, mask, type = ban.ban.channel, ban.ban.mask, ban.ban.type
+            self.log.info("%s '%s' in %s expired", type,
+                                                   mask,
+                                                   channel)
+            # send unban msg
+            unban = ircmsgs.mode(channel, (modedict[type], mask))
+            irc.queueMsg(unban)
 
     def doLog(self, irc, channel, s):
         if not self.registryValue('enabled', channel):
@@ -735,7 +744,7 @@ class Bantracker(callbacks.Plugin):
             self.db_run("INSERT INTO comments (ban_id, who, comment, time) values(%s,%s,%s,%s)", (id, nick, kickmsg, n))
         if extra_comment:
             self.db_run("INSERT INTO comments (ban_id, who, comment, time) values(%s,%s,%s,%s)", (id, nick, extra_comment, n))
-        ban = Ban(mask=target, who=operator, when=time.mktime(time.gmtime()), id=id)
+        ban = Ban(mask=target, who=operator, when=time.mktime(time.gmtime()), id=id, channel=channel)
         if add_to_cache:
             if channel not in self.bans:
                 self.bans[channel] = []
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 8fb7040..58a7a83 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -351,11 +351,14 @@ class BantrackerTestCase(ChannelPluginTestCase):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
         self.assertTrue(cb.managedBans) # ban in list
-        cb.autoRemoveBans()
+        cb.autoRemoveBans(self.irc)
         self.assertTrue(cb.managedBans) # ban in list
+        print 'waiting 2 secs ...'
         time.sleep(2)
-        cb.autoRemoveBans()
+        cb.autoRemoveBans(self.irc)
         self.assertFalse(cb.managedBans) # ban removed
+        msg = self.irc.takeMsg() # unban msg
+        self.assertEqual(str(msg).strip(), "MODE #test -b :asd!*@*")
 
 
 

From 3e584e68807f3affeda8d396c729d4be47e563a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Wed, 4 Jul 2012 00:22:53 -0300
Subject: [PATCH 05/40] add 'banremove' command for set expire time of bans.

---
 Bantracker/plugin.py | 26 +++++++++++++++++++++++++-
 Bantracker/test.py   | 15 +++++++++++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 3810ccc..62aeb5b 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -863,7 +863,7 @@ class Bantracker(callbacks.Plugin):
                     comment = self.getHostFromBan(irc, msg, mask)
                     ban = self.doKickban(irc, channel, msg.prefix, mask + realname, 
                                          extra_comment=comment)
-                    if True:
+                    if False:
                         # FIXME ban autoremove should be set with a command, but I'm 
                         # lazy.
                         self.managedBans.add(BanRemoval(ban, 1))
@@ -1284,6 +1284,30 @@ class Bantracker(callbacks.Plugin):
                 irc.error("No comments recorded for ban %i" % id)
     comment = wrap(comment, ['id', optional('text')])
 
+    def banremove(self, irc, msg, args, id, timespec):
+        """<id> <time>
+
+        Sets expiration time.
+        """
+        L = self.db_run("SELECT mask, channel FROM bans WHERE id = %s", id, 
+                        expect_result=True)
+        if not L:
+            irc.reply("I don't know any ban with that id.")
+            return
+
+        mask, channel = L[0]
+        for ban in self.bans[channel]:
+            if mask == ban.mask:
+                break
+        else:
+            # no active ban it seems
+            irc.reply("Ban '%s' isn't active in %s." % (mask, channel))
+            return
+
+        self.managedBans.add(BanRemoval(ban, timespec))
+        irc.replySuccess()
+    banremove = wrap(banremove, ['id', 'int'])
+
     def banlink(self, irc, msg, args, id, highlight):
         """<id> [<highlight>]
 
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 58a7a83..cba5835 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -347,11 +347,12 @@ class BantrackerTestCase(ChannelPluginTestCase):
         fetch = self.query("SELECT id,channel,mask,operator FROM bans")
         self.assertEqual((1, '#test', 'troll', 'op'), fetch[0])
 
-    def testBanAutoRemove(self):
+    def testBanremove(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
-        self.assertTrue(cb.managedBans) # ban in list
         cb.autoRemoveBans(self.irc)
+        self.assertFalse(cb.managedBans)
+        self.assertNotError('banremove 1 1')
         self.assertTrue(cb.managedBans) # ban in list
         print 'waiting 2 secs ...'
         time.sleep(2)
@@ -360,6 +361,16 @@ class BantrackerTestCase(ChannelPluginTestCase):
         msg = self.irc.takeMsg() # unban msg
         self.assertEqual(str(msg).strip(), "MODE #test -b :asd!*@*")
 
+    def testBanremoveBadId(self):
+        self.assertResponse('banremove 1 0', "I don't know any ban with that id.")
+
+    def testBanremoveInactiveBan(self):
+        self.feedBan('asd!*@*')
+        self.irc.feedMsg(ircmsgs.unban(self.channel, 'asd!*@*', 
+                                       'op!user@host.net'))
+        self.assertResponse('banremove 1 0', 
+                            "Ban 'asd!*@*' isn't active in #test.")
+
 
 
 

From a3266bc1de71899c5ff9d902b42d2e87438ecb3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Wed, 4 Jul 2012 19:23:37 -0300
Subject: [PATCH 06/40] @banremoval command now accepts time in different
 units, such as "2 weeks", "1 month", "24h" and so on. The units are: minutes,
 hours, days, weeks, months and years. One letter shortcuts allowed.

---
 Bantracker/plugin.py | 103 ++++++++++++++++++++++++++++++++++++++-----
 Bantracker/test.py   |  20 ++++++++-
 2 files changed, 109 insertions(+), 14 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 62aeb5b..1c09bab 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -78,6 +78,65 @@ def nowSeconds():
 def fromTime(x):
     return cPickle.dumps(datetime.datetime(*time.gmtime(x)[:6], **{'tzinfo': pytz.timezone("UTC")}))
 
+
+timeUnits = {
+        'm': 60,     'minutes': 60,     'minute': 60, 'min': 60,
+        'h': 3600,     'hours': 3600,     'hour': 3600,
+        'd': 86400,     'days': 86400,     'day': 86400,
+        'w': 604800,   'weeks': 604800,   'week': 604800,
+        'M': 2592000, 'months': 2592000, 'month': 2592000,
+        'y': 31536000, 'years': 31536000, 'year': 31536000,
+        }
+
+def readTimeDelta(s):
+    """convert a string like "2 days" or "1h2d3w" into seconds"""
+    # split number and words
+    L = []
+    digit = buffer = None
+    for c in s:
+        if c.isdigit():
+            if buffer is None:
+                digit, buffer = True, ''
+            elif digit is False:
+                digit = True
+                # add unit to list
+                buffer = buffer.strip()
+                if buffer:
+                    L.append(buffer)
+                    buffer = ''
+            buffer += c
+        else:
+            if digit is None:
+                # need a number first
+                continue
+            if digit is True:
+                digit = False
+                # add number to list
+                L.append(int(buffer))
+                buffer = ''
+            buffer += c
+    # check last
+    if buffer.isdigit():
+        L.append(int(buffer))
+    else:
+        buffer = buffer.strip()
+        if buffer:
+            L.append(buffer)
+
+    # sum
+    seconds = 0
+    number = None
+    for item in L:
+        if isinstance(item, int):
+            number = item
+        else:
+            mult = timeUnits[item]
+            seconds += number * mult
+            number = None
+    if number:
+        seconds += number
+    return seconds
+
 def capab(user, capability):
     capability = capability.lower()
     capabilities = list(user.capabilities)
@@ -1289,24 +1348,44 @@ class Bantracker(callbacks.Plugin):
 
         Sets expiration time.
         """
-        L = self.db_run("SELECT mask, channel FROM bans WHERE id = %s", id, 
-                        expect_result=True)
-        if not L:
-            irc.reply("I don't know any ban with that id.")
+        try:
+            seconds = readTimeDelta(timespec)
+        except KeyError:
+            irc.error("bad time format.")
             return
 
-        mask, channel = L[0]
-        for ban in self.bans[channel]:
-            if mask == ban.mask:
+        # lets check if is already managed first
+        for idx, remove in enumerate(self.managedBans):
+            if id == remove.ban.id:
+                ban = remove.ban
+                del self.managedBans.shelf[idx]
                 break
         else:
-            # no active ban it seems
-            irc.reply("Ban '%s' isn't active in %s." % (mask, channel))
-            return
+            L = self.db_run("SELECT mask, channel, removal FROM bans WHERE id = %s",
+                            id, expect_result=True)
+            if not L:
+                irc.reply("I don't know any ban with that id.")
+                return
 
-        self.managedBans.add(BanRemoval(ban, timespec))
+            mask, channel, removal = L[0]
+            self.log.debug('asd %s', removal)
+            if removal:
+                irc.reply("Ban '%s' was already removed in %s." % (mask, channel))
+                return
+
+            for ban in self.bans[channel]:
+                if mask == ban.mask:
+                    if ban.id is None:
+                        ban.id = id
+                    break
+            else:
+                # ban not in sync it seems, shouldn't happen normally.
+                irc.reply("Ban '%s' isn't active in %s." % (mask, channel))
+                return
+
+        self.managedBans.add(BanRemoval(ban, seconds))
         irc.replySuccess()
-    banremove = wrap(banremove, ['id', 'int'])
+    banremove = wrap(banremove, ['id', 'text'])
 
     def banlink(self, irc, msg, args, id, highlight):
         """<id> [<highlight>]
diff --git a/Bantracker/test.py b/Bantracker/test.py
index cba5835..e4c414f 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -369,8 +369,24 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.irc.feedMsg(ircmsgs.unban(self.channel, 'asd!*@*', 
                                        'op!user@host.net'))
         self.assertResponse('banremove 1 0', 
-                            "Ban 'asd!*@*' isn't active in #test.")
-
+                            "Ban 'asd!*@*' was already removed in #test.")
+
+    def testBanremoveTimeFormat(self):
+        cb = self.getCallback()
+        self.feedBan('asd!*@*')
+        self.assertNotError('banremove 1 10m')
+        self.assertEqual(cb.managedBans.shelf[0].expires, 600)
+        self.assertNotError('banremove 1 2 weeks')
+        self.assertEqual(cb.managedBans.shelf[0].expires, 1209600)
+        self.assertNotError('banremove 1 1m 2 days')
+        self.assertEqual(cb.managedBans.shelf[0].expires, 172860)
+        self.assertNotError('banremove 1 24h 1day')
+        self.assertEqual(cb.managedBans.shelf[0].expires, 172800)
+        self.assertNotError('banremove 1 1m1h1d1w1M1y')
+        self.assertEqual(cb.managedBans.shelf[0].expires, 34822860)
+
+    def testBanremoveTimeFormatBad(self):
+        self.assertError('banremove 1 10 apples')
 
 
 

From 30c78107afeb17d20ac510463f8634fae7265d7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Wed, 4 Jul 2012 19:36:19 -0300
Subject: [PATCH 07/40] added FuzzyDict class, gives a more flexible matching
 of the time units.

---
 Bantracker/plugin.py | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 1c09bab..f82f2cb 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -79,14 +79,27 @@ def fromTime(x):
     return cPickle.dumps(datetime.datetime(*time.gmtime(x)[:6], **{'tzinfo': pytz.timezone("UTC")}))
 
 
-timeUnits = {
-        'm': 60,     'minutes': 60,     'minute': 60, 'min': 60,
-        'h': 3600,     'hours': 3600,     'hour': 3600,
-        'd': 86400,     'days': 86400,     'day': 86400,
-        'w': 604800,   'weeks': 604800,   'week': 604800,
-        'M': 2592000, 'months': 2592000, 'month': 2592000,
-        'y': 31536000, 'years': 31536000, 'year': 31536000,
-        }
+class FuzzyDict(dict):
+    def __getitem__(self, k):
+        try:
+            return dict.__getitem__(self, k)
+        except KeyError:
+            # ok, lets find the closest match
+            n = len(k)
+            keys = [ s for s in self if s[:n] == k ]
+            if len(keys) != 1:
+                # ambiguous
+                raise
+            return dict.__getitem__(self, keys[0])
+
+timeUnits = FuzzyDict({
+        'minutes': 60,      'm': 60,
+        'hours'  : 3600,    'M': 2592000,
+        'days'   : 86400,
+        'weeks'  : 604800,
+        'months' : 2592000,
+        'years'  : 31536000,
+        })
 
 def readTimeDelta(s):
     """convert a string like "2 days" or "1h2d3w" into seconds"""

From 011a0859a0c403a4ac3be721cca23759b5216d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Wed, 4 Jul 2012 19:49:38 -0300
Subject: [PATCH 08/40] refactored readTimeDelta function.

---
 Bantracker/plugin.py | 55 ++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index f82f2cb..e1fa3aa 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -104,50 +104,41 @@ timeUnits = FuzzyDict({
 def readTimeDelta(s):
     """convert a string like "2 days" or "1h2d3w" into seconds"""
     # split number and words
-    L = []
-    digit = buffer = None
+    digit = string = number = None
+    seconds = 0
     for c in s:
         if c.isdigit():
-            if buffer is None:
-                digit, buffer = True, ''
+            if string is None:
+                # start
+                digit, string = True, ''
             elif digit is False:
                 digit = True
-                # add unit to list
-                buffer = buffer.strip()
-                if buffer:
-                    L.append(buffer)
-                    buffer = ''
-            buffer += c
+                # completed an unit, add to seconds
+                string = string.strip()
+                if string:
+                    mult = timeUnits[string]
+                    seconds += number * mult
+                    string = ''
+            string += c
         else:
             if digit is None:
                 # need a number first
                 continue
             if digit is True:
                 digit = False
-                # add number to list
-                L.append(int(buffer))
-                buffer = ''
-            buffer += c
-    # check last
-    if buffer.isdigit():
-        L.append(int(buffer))
-    else:
-        buffer = buffer.strip()
-        if buffer:
-            L.append(buffer)
+                # completed a number
+                number, string = int(string), ''
+            string += c
 
-    # sum
-    seconds = 0
-    number = None
-    for item in L:
-        if isinstance(item, int):
-            number = item
-        else:
-            mult = timeUnits[item]
+    # check last string
+    if string.isdigit():
+        seconds += int(string)
+    else:
+        string = string.strip()
+        if string:
+            mult = timeUnits[string]
             seconds += number * mult
-            number = None
-    if number:
-        seconds += number
+
     return seconds
 
 def capab(user, capability):

From 929ead66111dcb045be791b70ecbccb7d2ad5a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Wed, 4 Jul 2012 19:52:20 -0300
Subject: [PATCH 09/40] add an extra test.

---
 Bantracker/test.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Bantracker/test.py b/Bantracker/test.py
index e4c414f..a8596b7 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -384,6 +384,8 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.assertEqual(cb.managedBans.shelf[0].expires, 172800)
         self.assertNotError('banremove 1 1m1h1d1w1M1y')
         self.assertEqual(cb.managedBans.shelf[0].expires, 34822860)
+        self.assertNotError('banremove 1 999')
+        self.assertEqual(cb.managedBans.shelf[0].expires, 999)
 
     def testBanremoveTimeFormatBad(self):
         self.assertError('banremove 1 10 apples')

From 1e92a7002a9de10224495384f7ce022984749001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Wed, 4 Jul 2012 21:21:46 -0300
Subject: [PATCH 10/40] debug line I forgot to delete.

---
 Bantracker/plugin.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index e1fa3aa..52edca4 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -1372,7 +1372,6 @@ class Bantracker(callbacks.Plugin):
                 return
 
             mask, channel, removal = L[0]
-            self.log.debug('asd %s', removal)
             if removal:
                 irc.reply("Ban '%s' was already removed in %s." % (mask, channel))
                 return

From 87f61b1654c85c7525eab53c081fdea55f3ce1f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Wed, 4 Jul 2012 21:35:07 -0300
Subject: [PATCH 11/40] send notifications when ban are about to expire
 (notification channel hardcoded to #test)

---
 Bantracker/plugin.py | 35 +++++++++++++++++++++++++++--------
 Bantracker/test.py   | 12 ++++++++++++
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 52edca4..b158a03 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -321,10 +321,11 @@ class BanRemoval(object):
         assert isinstance(expires, int), "expire time isn't an integer"
         self.ban = ban
         self.expires = expires
+        self.notified = False
 
-    def expired(self):
+    def expired(self, offset=0):
         """Check if the ban did expire."""
-        if nowSeconds() > (self.ban.when + self.expires):
+        if (nowSeconds() + offset) > (self.ban.when + self.expires):
             return True
         return False
 
@@ -350,7 +351,7 @@ class BanStore(object):
 
         self.shelf.sort(key=key, reverse=True)
 
-    def popExpired(self):
+    def popExpired(self, time=0):
         """Pops a list of expired bans"""
         def enumerateReversed(L):
             """enumerate in reverse order"""
@@ -359,11 +360,18 @@ class BanStore(object):
 
         L = []
         for i, ban in enumerateReversed(self.shelf):
-            if ban.expired():
+            if ban.expired(offset=time):
                 L.append(ban)
                 del self.shelf[i]
         return L
 
+    def getExpired(self, time=0):
+        def generator():
+            for ban in self.shelf:
+                if ban.expired(offset=time):
+                    yield ban
+        return generator()
+
 
 class Bantracker(callbacks.Plugin):
     """Plugin to manage bans.
@@ -763,17 +771,28 @@ class Bantracker(callbacks.Plugin):
             if not L:
                 del self.pendingReviews[None]
 
-    def autoRemoveBans(self, irc=None):
+    def autoRemoveBans(self, irc):
         modedict = { 'quiet': '-q', 'ban': '-b' }
         for ban in self.managedBans.popExpired():
             channel, mask, type = ban.ban.channel, ban.ban.mask, ban.ban.type
-            self.log.info("%s '%s' in %s expired", type,
-                                                   mask,
-                                                   channel)
+            self.log.info("%s [%s] %s in %s expired", type,
+                                                       ban.ban.id,
+                                                       mask,
+                                                       channel)
             # send unban msg
             unban = ircmsgs.mode(channel, (modedict[type], mask))
             irc.queueMsg(unban)
 
+        # notify about bans soon to expire
+        for ban in self.managedBans.getExpired(600):
+            if ban.notified:
+                continue
+            id, channel, mask, type = ban.ban.id, ban.ban.channel, ban.ban.mask, ban.ban.type
+            notice = ircmsgs.notice('#test', "%s [%s] %s in %s will expire in a few minutes." \
+                                    % (type, id, mask, channel))
+            irc.queueMsg(notice)
+            ban.notified = True
+
     def doLog(self, irc, channel, s):
         if not self.registryValue('enabled', channel):
             return
diff --git a/Bantracker/test.py b/Bantracker/test.py
index a8596b7..7631f82 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -390,5 +390,17 @@ class BantrackerTestCase(ChannelPluginTestCase):
     def testBanremoveTimeFormatBad(self):
         self.assertError('banremove 1 10 apples')
 
+    def testBanremoveNotice(self):
+        cb = self.getCallback()
+        self.feedBan('asd!*@*')
+        self.assertNotError('banremove 1 300')
+        cb.autoRemoveBans(self.irc)
+        msg = self.irc.takeMsg()
+        self.assertEqual(str(msg).strip(),
+            "NOTICE #test :ban [1] asd!*@* in #test will expire in a few minutes.")
+        # don't send the notice again.
+        cb.autoRemoveBans(self.irc)
+        self.assertFalse(self.irc.takeMsg())
+
 
 

From e3f6aacdf5063235c979f660c64872eb3e6afada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Wed, 4 Jul 2012 22:12:55 -0300
Subject: [PATCH 12/40] added configuration options: *
 supybot.plugins.Bantracker.autoremove *
 supybot.plugins.Bantracker.autoremove.notify *
 supybot.plugins.Bantracker.autoremove.notify.channels

---
 Bantracker/config.py | 11 +++++++++++
 Bantracker/plugin.py | 26 +++++++++++++++++++-------
 Bantracker/test.py   | 18 +++++++++++-------
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/Bantracker/config.py b/Bantracker/config.py
index 78d907a..700f27c 100644
--- a/Bantracker/config.py
+++ b/Bantracker/config.py
@@ -225,4 +225,15 @@ conf.registerChannelValue(Bantracker.review.forward, 'channels',
         registry.SpaceSeparatedListOfStrings([],
             "List of channels/nicks to forward the request if the op is in the forward list."))
 
+conf.registerChannelValue(Bantracker, 'autoremove',
+        registry.Boolean(True,
+            """Enable/disable autoremoval of bans."""))
+conf.registerChannelValue(Bantracker.autoremove, 'notify',
+        registry.Boolean(True,
+            """Enable/disable notifications of removal of bans."""))
+conf.registerChannelValue(Bantracker.autoremove.notify, 'channels',
+        registry.SpaceSeparatedListOfStrings([],
+            """List of channels/nicks to notify about automatic removal of bans."""))
+
+
 
diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index b158a03..34fd292 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -775,10 +775,13 @@ class Bantracker(callbacks.Plugin):
         modedict = { 'quiet': '-q', 'ban': '-b' }
         for ban in self.managedBans.popExpired():
             channel, mask, type = ban.ban.channel, ban.ban.mask, ban.ban.type
+            if not self.registryValue('autoremove', channel):
+                continue
+
             self.log.info("%s [%s] %s in %s expired", type,
-                                                       ban.ban.id,
-                                                       mask,
-                                                       channel)
+                                                      ban.ban.id,
+                                                      mask,
+                                                      channel)
             # send unban msg
             unban = ircmsgs.mode(channel, (modedict[type], mask))
             irc.queueMsg(unban)
@@ -787,10 +790,19 @@ class Bantracker(callbacks.Plugin):
         for ban in self.managedBans.getExpired(600):
             if ban.notified:
                 continue
-            id, channel, mask, type = ban.ban.id, ban.ban.channel, ban.ban.mask, ban.ban.type
-            notice = ircmsgs.notice('#test', "%s [%s] %s in %s will expire in a few minutes." \
-                                    % (type, id, mask, channel))
-            irc.queueMsg(notice)
+
+            channel = ban.ban.channel
+            if not self.registryValue('autoremove', channel) \
+                    or not self.registryValue('autoremove.notify', channel):
+                continue
+
+            for c in self.registryValue('autoremove.notify.channels', channel):
+                notice = ircmsgs.notice(c, "%s [%s] %s in %s will expire in a few minutes." \
+                                                                            % (ban.ban.type,
+                                                                               ban.ban.id,
+                                                                               ban.ban.mask,
+                                                                               channel))
+                irc.queueMsg(notice)
             ban.notified = True
 
     def doLog(self, irc, channel, s):
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 7631f82..0afd3c8 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -394,13 +394,17 @@ class BantrackerTestCase(ChannelPluginTestCase):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
         self.assertNotError('banremove 1 300')
-        cb.autoRemoveBans(self.irc)
-        msg = self.irc.takeMsg()
-        self.assertEqual(str(msg).strip(),
-            "NOTICE #test :ban [1] asd!*@* in #test will expire in a few minutes.")
-        # don't send the notice again.
-        cb.autoRemoveBans(self.irc)
-        self.assertFalse(self.irc.takeMsg())
+        pluginConf.autoremove.notify.channels().append('#test')
+        try:
+            cb.autoRemoveBans(self.irc)
+            msg = self.irc.takeMsg()
+            self.assertEqual(str(msg).strip(),
+                "NOTICE #test :ban [1] asd!*@* in #test will expire in a few minutes.")
+            # don't send the notice again.
+            cb.autoRemoveBans(self.irc)
+            self.assertFalse(self.irc.takeMsg())
+        finally:
+            del pluginConf.autoremove.notify.channels()[:]
 
 
 

From e3dd878cf31bedb0ac7859df00ab97f6fefb1202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Thu, 5 Jul 2012 02:31:53 -0300
Subject: [PATCH 13/40] save ban autoremoval information in a csv files, so it
 isn't lost during plugin reloads.

---
 Bantracker/plugin.py | 58 +++++++++++++++++++++++++++++++++++++++++---
 Bantracker/test.py   | 23 ++++++++++++++++++
 2 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 34fd292..c080a02 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -58,6 +58,7 @@ import sqlite
 import pytz
 import cPickle
 import datetime
+import csv
 import time
 import random
 import hashlib
@@ -255,6 +256,23 @@ class Ban(object):
             return 'ban'
         return 'removal'
 
+    def serialize(self):
+        id = self.id
+        if id is None:
+            id = ''
+        return (id, self.channel, self.mask, self.who, self.when)
+
+    def deserialize(self, L):
+        id = L[0]
+        if id == '':
+            id = None
+        else:
+            id = int(id)
+        self.id = id
+        self.channel, self.mask, self.who = L[1:4]
+        self.when = float(L[4])
+        self.ascwhen = time.asctime(time.gmtime(self.when))
+
 
 class ReviewStore(dict):
     def __init__(self, filename):
@@ -317,8 +335,6 @@ class BanRemoval(object):
         ban: ban object
         expires: time in seconds for it to expire
         """
-        assert isinstance(ban, Ban), "ban is not a Ban object"
-        assert isinstance(expires, int), "expire time isn't an integer"
         self.ban = ban
         self.expires = expires
         self.notified = False
@@ -329,10 +345,22 @@ class BanRemoval(object):
             return True
         return False
 
+    def serialize(self):
+        notified = self.notified and 1 or 0
+        L = [ self.expires, notified ]
+        L.extend(self.ban.serialize())
+        return tuple(L)
+
+    def deserialize(self, L):
+        self.expires = int(L[0])
+        self.notified = bool(int(L[1]))
+        self.ban = Ban(args=(None, None, None, None, 0))
+        self.ban.deserialize(L[2:])
+
 
 class BanStore(object):
     def __init__(self, filename):
-        # this should be stored into a file
+        self.filename = conf.supybot.directories.data.dirize(filename)
         self.shelf = []
 
     def __iter__(self):
@@ -341,6 +369,26 @@ class BanStore(object):
     def __len__(self):
         return len(self.shelf)
 
+    def open(self):
+        try:
+            reader = csv.reader(open(self.filename, 'rb'))
+        except IOError:
+            return
+
+        for row in reader:
+            ban = BanRemoval(None, None)
+            ban.deserialize(row)
+            self.add(ban)
+
+    def close(self):
+        try:
+            writer = csv.writer(open(self.filename, 'wb'))
+        except IOError:
+            return
+
+        for ban in self:
+            writer.writerow(ban.serialize())
+
     def add(self, obj):
         self.shelf.append(obj)
 
@@ -408,7 +456,8 @@ class Bantracker(callbacks.Plugin):
         self._banreviewfix()
 
         # init autoremove stuff
-        self.managedBans = BanStore('FIXME')
+        self.managedBans = BanStore('bt.autoremove.db')
+        self.managedBans.open()
 
         # add our scheduled events for check bans for reviews or removal
         schedule.addPeriodicEvent(lambda: self.reviewBans(irc), 60*60,
@@ -545,6 +594,7 @@ class Bantracker(callbacks.Plugin):
         schedule.removeEvent(self.name() + '_review')
         schedule.removeEvent(self.name() + '_autoremove')
         self.pendingReviews.close()
+        self.managedBans.close()
 
     def reset(self):
         global queue
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 0afd3c8..d854410 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -406,5 +406,28 @@ class BantrackerTestCase(ChannelPluginTestCase):
         finally:
             del pluginConf.autoremove.notify.channels()[:]
 
+    def testAutoremoveStore(self):
+        self.feedBan('asd!*@*')
+        self.feedBan('qwe!*@*')
+        self.feedBan('zxc!*@*', mode='q')
+        self.assertNotError('banremove 1 10m')
+        self.assertNotError('banremove 2 1d')
+        self.assertNotError('banremove 3 1w')
+        cb = self.getCallback()
+        cb.managedBans.shelf[1].notified = True
+        cb.managedBans.close()
+        cb.managedBans.shelf = []
+        cb.managedBans.open()
+        L = cb.managedBans.shelf
+        for i, n in enumerate((600, 86400, 604800)):
+            self.assertEqual(L[i].expires, n)
+        for i, n in enumerate((False, True, False)):
+            self.assertEqual(L[i].notified, n)
+        for i, n in enumerate((1, 2, 3)):
+            self.assertEqual(L[i].ban.id, n)
+        for i, n in enumerate(('asd!*@*', 'qwe!*@*', '%zxc!*@*')):
+            self.assertEqual(L[i].ban.mask, n)
+        self.assertEqual(L[0].ban.channel, '#test')
+
 
 

From 4d5ea855449ba408f08a976e67744438f029eb52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Thu, 5 Jul 2012 19:08:44 -0300
Subject: [PATCH 14/40] fix autoremoving quiets

---
 Bantracker/plugin.py |  2 ++
 Bantracker/test.py   | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index c080a02..b555a29 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -833,6 +833,8 @@ class Bantracker(callbacks.Plugin):
                                                       mask,
                                                       channel)
             # send unban msg
+            if type == 'quiet':
+                mask = mask[1:]
             unban = ircmsgs.mode(channel, (modedict[type], mask))
             irc.queueMsg(unban)
 
diff --git a/Bantracker/test.py b/Bantracker/test.py
index d854410..94cb60f 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -361,6 +361,16 @@ class BantrackerTestCase(ChannelPluginTestCase):
         msg = self.irc.takeMsg() # unban msg
         self.assertEqual(str(msg).strip(), "MODE #test -b :asd!*@*")
 
+    def testBanremoveQuiet(self):
+        cb = self.getCallback()
+        self.feedBan('asd!*@*', mode='q')
+        self.assertNotError('banremove 1 0')
+        print 'waiting 1 sec ...'
+        time.sleep(1)
+        cb.autoRemoveBans(self.irc)
+        msg = self.irc.takeMsg() # unban msg
+        self.assertEqual(str(msg).strip(), "MODE #test -q :asd!*@*")
+
     def testBanremoveBadId(self):
         self.assertResponse('banremove 1 0', "I don't know any ban with that id.")
 

From 800a228d9276adfd6be2f9d683bc5554f0ea19aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Thu, 5 Jul 2012 19:12:38 -0300
Subject: [PATCH 15/40] banremove should only work with bans or quiets.

---
 Bantracker/plugin.py | 6 ++++++
 Bantracker/test.py   | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index b555a29..dcf5e0b 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -1469,8 +1469,14 @@ class Bantracker(callbacks.Plugin):
                 irc.reply("Ban '%s' isn't active in %s." % (mask, channel))
                 return
 
+        if ban.type not in ('ban', 'quiet'):
+            irc.reply("Id %s is a %s, only bans or quiets can be autoremoved." \
+                      % (id, ban.type))
+            return
+
         self.managedBans.add(BanRemoval(ban, seconds))
         irc.replySuccess()
+
     banremove = wrap(banremove, ['id', 'text'])
 
     def banlink(self, irc, msg, args, id, highlight):
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 94cb60f..4e5f37a 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -371,6 +371,11 @@ class BantrackerTestCase(ChannelPluginTestCase):
         msg = self.irc.takeMsg() # unban msg
         self.assertEqual(str(msg).strip(), "MODE #test -q :asd!*@*")
 
+    def testBanremoveBadType(self):
+        self.feedBan('nick', mode='k')
+        self.assertResponse('banremove 1 0',
+            "Id 1 is a removal, only bans or quiets can be autoremoved.")
+
     def testBanremoveBadId(self):
         self.assertResponse('banremove 1 0', "I don't know any ban with that id.")
 

From b8225fd5073b0ec3367c378ead07a9d6d03c7c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Thu, 5 Jul 2012 19:24:49 -0300
Subject: [PATCH 16/40] fix previous commit, Ban objects are never going to be
 of other type than ban and quiet.

---
 Bantracker/plugin.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index dcf5e0b..a3dd479 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -245,16 +245,7 @@ class Ban(object):
 
     @property
     def type(self):
-        mask = self.mask
-        if mask[0] == '%':
-            return 'quiet'
-        elif ircutils.isUserHostmask(mask) or mask.endswith('(realname)'):
-            if not ('*' in mask or '?' in mask or '$' in mask):
-                # XXX hack over hack, we are supposing these are marks as normal
-                # bans aren't usually set to exact match, while marks are.
-                return 'mark'
-            return 'ban'
-        return 'removal'
+        return guessBanType(self.mask)
 
     def serialize(self):
         id = self.id
@@ -274,6 +265,18 @@ class Ban(object):
         self.ascwhen = time.asctime(time.gmtime(self.when))
 
 
+def guessBanType(mask):
+    if mask[0] == '%':
+        return 'quiet'
+    elif ircutils.isUserHostmask(mask) or mask.endswith('(realname)'):
+        if not ('*' in mask or '?' in mask or '$' in mask):
+            # XXX hack over hack, we are supposing these are marks as normal
+            # bans aren't usually set to exact match, while marks are.
+            return 'mark'
+        return 'ban'
+    return 'removal'
+
+
 class ReviewStore(dict):
     def __init__(self, filename):
         self.filename = conf.supybot.directories.data.dirize(filename)
@@ -1455,6 +1458,11 @@ class Bantracker(callbacks.Plugin):
                 return
 
             mask, channel, removal = L[0]
+            type = guessBanType(mask)
+            if type not in ('ban', 'quiet'):
+                irc.reply("Id %s is a %s, only bans or quiets can be autoremoved." % (id, type))
+                return
+
             if removal:
                 irc.reply("Ban '%s' was already removed in %s." % (mask, channel))
                 return
@@ -1469,10 +1477,6 @@ class Bantracker(callbacks.Plugin):
                 irc.reply("Ban '%s' isn't active in %s." % (mask, channel))
                 return
 
-        if ban.type not in ('ban', 'quiet'):
-            irc.reply("Id %s is a %s, only bans or quiets can be autoremoved." \
-                      % (id, ban.type))
-            return
 
         self.managedBans.add(BanRemoval(ban, seconds))
         irc.replySuccess()

From c90821186e8027eb1d924ce42c3567613151fef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Thu, 5 Jul 2012 19:36:13 -0300
Subject: [PATCH 17/40] fix extbans

---
 Bantracker/plugin.py | 4 +++-
 Bantracker/test.py   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index a3dd479..5c4832c 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -268,7 +268,9 @@ class Ban(object):
 def guessBanType(mask):
     if mask[0] == '%':
         return 'quiet'
-    elif ircutils.isUserHostmask(mask) or mask.endswith('(realname)'):
+    elif ircutils.isUserHostmask(mask) \
+            or mask[0] == '$' \
+            or mask.endswith('(realname)'):
         if not ('*' in mask or '?' in mask or '$' in mask):
             # XXX hack over hack, we are supposing these are marks as normal
             # bans aren't usually set to exact match, while marks are.
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 4e5f37a..2c43290 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -375,6 +375,8 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.feedBan('nick', mode='k')
         self.assertResponse('banremove 1 0',
             "Id 1 is a removal, only bans or quiets can be autoremoved.")
+        self.feedBan('$a:nick')
+        self.assertResponse('banremove 2 0', 'The operation succeeded.')
 
     def testBanremoveBadId(self):
         self.assertResponse('banremove 1 0', "I don't know any ban with that id.")

From bf93f4250385586383fecde9a403d38318cca5b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Thu, 5 Jul 2012 20:40:57 -0300
Subject: [PATCH 18/40] add some colors in the notification message.

---
 Bantracker/plugin.py | 19 ++++++++++++-------
 Bantracker/test.py   |  3 ++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 5c4832c..8974aca 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -833,13 +833,13 @@ class Bantracker(callbacks.Plugin):
             if not self.registryValue('autoremove', channel):
                 continue
 
+            if type == 'quiet':
+                mask = mask[1:]
             self.log.info("%s [%s] %s in %s expired", type,
                                                       ban.ban.id,
                                                       mask,
                                                       channel)
             # send unban msg
-            if type == 'quiet':
-                mask = mask[1:]
             unban = ircmsgs.mode(channel, (modedict[type], mask))
             irc.queueMsg(unban)
 
@@ -853,12 +853,17 @@ class Bantracker(callbacks.Plugin):
                     or not self.registryValue('autoremove.notify', channel):
                 continue
 
+            type, mask = ban.ban.type, ban.ban.mask
+            if type == 'quiet':
+                mask = mask[1:]
             for c in self.registryValue('autoremove.notify.channels', channel):
-                notice = ircmsgs.notice(c, "%s [%s] %s in %s will expire in a few minutes." \
-                                                                            % (ban.ban.type,
-                                                                               ban.ban.id,
-                                                                               ban.ban.mask,
-                                                                               channel))
+                notice = ircmsgs.notice(c, "%s %s%s%s %s in %s will expire in a few minutes." \
+                        % (type,
+                           ircutils.mircColor('[', 'light green'),
+                           ircutils.bold(ban.ban.id),
+                           ircutils.mircColor(']', 'light green'),
+                           ircutils.mircColor(mask, 'teal'),
+                           ircutils.mircColor(channel, 'teal')))
                 irc.queueMsg(notice)
             ban.notified = True
 
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 2c43290..0382642 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -416,7 +416,8 @@ class BantrackerTestCase(ChannelPluginTestCase):
             cb.autoRemoveBans(self.irc)
             msg = self.irc.takeMsg()
             self.assertEqual(str(msg).strip(),
-                "NOTICE #test :ban [1] asd!*@* in #test will expire in a few minutes.")
+                "NOTICE #test :ban \x0309[\x03\x021\x02\x0309]\x03 \x0310asd!*@*\x03"\
+                " in \x0310#test\x03 will expire in a few minutes.")
             # don't send the notice again.
             cb.autoRemoveBans(self.irc)
             self.assertFalse(self.irc.takeMsg())

From c283e6b924950837b288498285c2a8599440f885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Fri, 13 Jul 2012 13:45:37 -0300
Subject: [PATCH 19/40] add a simple @baninfo command for check when a ban
 expires.

---
 Bantracker/plugin.py | 35 +++++++++++++++++++++++++++++++++++
 Bantracker/test.py   |  6 ++++++
 2 files changed, 41 insertions(+)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 8974aca..cf3ef11 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -1490,6 +1490,41 @@ class Bantracker(callbacks.Plugin):
 
     banremove = wrap(banremove, ['id', 'text'])
 
+    def baninfo(self, irc, msg, args, id):
+        """<id>
+
+        Show ban information.
+        """
+        L = self.db_run("SELECT mask, channel, removal FROM bans WHERE id = %s",
+                        id, expect_result=True)
+        if not L:
+            irc.reply("I don't know any ban with that id.")
+            return
+
+        mask, channel, removal = L[0]
+        type = guessBanType(mask)
+        if type == 'quiet':
+            mask = mask[1:]
+        for br in self.managedBans:
+            if br.ban.id == id:
+                break
+        else:
+            br = None
+
+        if br:
+            irc.reply("[%s] %s - %s - %s - expires in %s" \
+                      % (id, type, mask, channel,
+                         (br.ban.when + br.expires) - nowSeconds()))
+        else:
+            if type in ('quiet', 'ban'):
+                irc.reply("[%s] %s - %s - %s - never expires" \
+                          % (id, type, mask, channel))
+            else:
+                irc.reply("[%s] %s - %s - %s" % (id, type, mask, channel))
+
+
+    baninfo = wrap(baninfo, ['id'])
+
     def banlink(self, irc, msg, args, id, highlight):
         """<id> [<highlight>]
 
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 0382642..73fee7f 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -447,5 +447,11 @@ class BantrackerTestCase(ChannelPluginTestCase):
             self.assertEqual(L[i].ban.mask, n)
         self.assertEqual(L[0].ban.channel, '#test')
 
+    def testBaninfo(self):
+        cb = self.getCallback()
+        self.feedBan('asd!*@*')
+        self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - never expires')
+        self.assertNotError('banremove 1 10')
+        self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - expires in 10.0')
 
 

From 401e5ae5d4c392fadb14b13221fb46ad0fe63fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Sun, 15 Jul 2012 21:06:23 -0300
Subject: [PATCH 20/40] fix @baninfo, inform if the ban is inactive

---
 Bantracker/plugin.py | 26 ++++++++++++++++----------
 Bantracker/test.py   |  3 +++
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index cf3ef11..b451c1d 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -362,6 +362,10 @@ class BanRemoval(object):
         self.ban = Ban(args=(None, None, None, None, 0))
         self.ban.deserialize(L[2:])
 
+def enumerateReversed(L):
+    """enumerate in reverse order"""
+    for i in reversed(xrange(len(L))):
+        yield i, L[i]
 
 class BanStore(object):
     def __init__(self, filename):
@@ -406,11 +410,6 @@ class BanStore(object):
 
     def popExpired(self, time=0):
         """Pops a list of expired bans"""
-        def enumerateReversed(L):
-            """enumerate in reverse order"""
-            for i in reversed(xrange(len(L))):
-                yield i, L[i]
-
         L = []
         for i, ban in enumerateReversed(self.shelf):
             if ban.expired(offset=time):
@@ -915,11 +914,13 @@ class Bantracker(callbacks.Plugin):
             self.db_run("UPDATE bans SET removal=%s , removal_op=%s WHERE id=%s", (now(), nick, int(data[0][0])))
         if not channel in self.bans:
             self.bans[channel] = []
-        for ban in self.bans[channel]:
+        for idx, ban in enumerateReversed(self.bans[channel]):
             if ban.mask == mask:
-                idx = self.bans[channel].index(ban)
                 del self.bans[channel][idx]
                 # we don't break here because bans might be duplicated.
+        for idx, br in enumerateReversed(self.managedBans.shelf):
+            if (channel == br.ban.channel) and (mask == br.ban.mask):
+                del self.managedBans.shelf[idx]
 
     def doPrivmsg(self, irc, msg):
         (recipients, text) = msg.args
@@ -1515,12 +1516,17 @@ class Bantracker(callbacks.Plugin):
             irc.reply("[%s] %s - %s - %s - expires in %s" \
                       % (id, type, mask, channel,
                          (br.ban.when + br.expires) - nowSeconds()))
-        else:
-            if type in ('quiet', 'ban'):
+            return
+
+        if type in ('quiet', 'ban'):
+            if not removal:
                 irc.reply("[%s] %s - %s - %s - never expires" \
                           % (id, type, mask, channel))
             else:
-                irc.reply("[%s] %s - %s - %s" % (id, type, mask, channel))
+                irc.reply("[%s] %s - %s - %s - not active" \
+                          % (id, type, mask, channel))
+        else:
+            irc.reply("[%s] %s - %s - %s" % (id, type, mask, channel))
 
 
     baninfo = wrap(baninfo, ['id'])
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 73fee7f..69193e4 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -453,5 +453,8 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - never expires')
         self.assertNotError('banremove 1 10')
         self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - expires in 10.0')
+        self.irc.feedMsg(ircmsgs.unban(self.channel, 'asd!*@*', 
+                                       'op!user@host.net'))
+        self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - not active')
 
 

From 6640435520f3d8b149101a2d06b5717d2d5344e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Sun, 15 Jul 2012 21:15:06 -0300
Subject: [PATCH 21/40] make @baninfo display time in human readable format,
 instead of number of seconds.

---
 Bantracker/plugin.py | 67 ++++++++++++++++++++++++++++++++++++--------
 Bantracker/test.py   |  4 ++-
 2 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index b451c1d..9b8de36 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -53,6 +53,7 @@ import supybot.ircmsgs as ircmsgs
 import supybot.conf as conf
 import supybot.ircdb as ircdb
 import supybot.schedule as schedule
+import supybot.utils as utils
 from fnmatch import fnmatch
 import sqlite
 import pytz
@@ -142,6 +143,47 @@ def readTimeDelta(s):
 
     return seconds
 
+# utils.gen.timeElapsed is too noisy, what do I care of the seconds and minutes
+# if the period is like a month long, or the zero values?
+def timeElapsed(elapsed, short=False, resolution=2):
+    """Given <elapsed> seconds, returns a string with an English description of
+    the amount of time passed.
+    """
+
+    ret = []
+    before = False
+    def Format(s, i):
+        if i:
+            if short:
+                ret.append('%s%s' % (i, s[0]))
+            else:
+                ret.append(utils.str.format('%n', (i, s)))
+    elapsed = int(elapsed)
+
+    # Handle negative times
+    if elapsed < 0:
+        before = True
+        elapsed = -elapsed
+
+    for s, i in (('year', 31536000), ('month', 2592000), ('week', 604800),
+                 ('day', 86400), ('hour', 3600), ('minute', 60)):
+        count, elapsed = elapsed // i, elapsed % i
+        Format(s, count)
+        if len(ret) == resolution:
+            break
+    #Format('second', elapsed) # seconds are pointless for now
+    if not ret:
+        raise ValueError, 'Time difference not great enough to be noted.'
+    result = ''
+    #ret = ret[:resolution]
+    if short:
+        result = ' '.join(ret)
+    else:
+        result = utils.str.format('%L', ret)
+    if before:
+        result += ' ago'
+    return result
+
 def capab(user, capability):
     capability = capability.lower()
     capabilities = list(user.capabilities)
@@ -1512,19 +1554,22 @@ class Bantracker(callbacks.Plugin):
         else:
             br = None
 
+        expires = None
         if br:
-            irc.reply("[%s] %s - %s - %s - expires in %s" \
-                      % (id, type, mask, channel,
-                         (br.ban.when + br.expires) - nowSeconds()))
-            return
+            expires = (br.ban.when + br.expires) - nowSeconds()
+            try:
+                expires = "expires in %s" % timeElapsed(expires)
+            except ValueError:
+                expires = "expires soon"
+        else:
+            if type in ('quiet', 'ban'):
+                if not removal:
+                    expires = "never expires"
+                else:
+                    expires = "not active"
 
-        if type in ('quiet', 'ban'):
-            if not removal:
-                irc.reply("[%s] %s - %s - %s - never expires" \
-                          % (id, type, mask, channel))
-            else:
-                irc.reply("[%s] %s - %s - %s - not active" \
-                          % (id, type, mask, channel))
+        if expires:
+            irc.reply("[%s] %s - %s - %s - %s" % (id, type, mask, channel, expires))
         else:
             irc.reply("[%s] %s - %s - %s" % (id, type, mask, channel))
 
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 69193e4..bbbeb11 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -452,7 +452,9 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.feedBan('asd!*@*')
         self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - never expires')
         self.assertNotError('banremove 1 10')
-        self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - expires in 10.0')
+        self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - expires soon')
+        self.assertNotError('banremove 1 34502')
+        self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - expires in 9 hours and 35 minutes')
         self.irc.feedMsg(ircmsgs.unban(self.channel, 'asd!*@*', 
                                        'op!user@host.net'))
         self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - not active')

From 909d56d704b1868c83811b6cdabf02e631dd5921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Sun, 15 Jul 2012 22:28:38 -0300
Subject: [PATCH 22/40] merge multiple mode messages into one (4 modes max)

---
 Bantracker/plugin.py | 14 +++++++++++---
 Bantracker/test.py   | 23 +++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 9b8de36..fb4bd1b 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -55,6 +55,7 @@ import supybot.ircdb as ircdb
 import supybot.schedule as schedule
 import supybot.utils as utils
 from fnmatch import fnmatch
+from collections import defaultdict
 import sqlite
 import pytz
 import cPickle
@@ -869,6 +870,7 @@ class Bantracker(callbacks.Plugin):
 
     def autoRemoveBans(self, irc):
         modedict = { 'quiet': '-q', 'ban': '-b' }
+        unbandict = defaultdict(list)
         for ban in self.managedBans.popExpired():
             channel, mask, type = ban.ban.channel, ban.ban.mask, ban.ban.type
             if not self.registryValue('autoremove', channel):
@@ -880,9 +882,15 @@ class Bantracker(callbacks.Plugin):
                                                       ban.ban.id,
                                                       mask,
                                                       channel)
-            # send unban msg
-            unban = ircmsgs.mode(channel, (modedict[type], mask))
-            irc.queueMsg(unban)
+            unbandict[channel].append((modedict[type], mask))
+        # send unban messages, with 4 modes max each.
+        maxModes = 4
+        for channel, modes in unbandict.iteritems():
+            for i in range(len(modes) / maxModes + 1):
+                L = modes[i * maxModes : (i + 1) * maxModes]
+                if L:
+                    msg = ircmsgs.mode(channel, ircutils.joinModes(L))
+                    irc.queueMsg(msg)
 
         # notify about bans soon to expire
         for ban in self.managedBans.getExpired(600):
diff --git a/Bantracker/test.py b/Bantracker/test.py
index bbbeb11..4dcf164 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -361,6 +361,29 @@ class BantrackerTestCase(ChannelPluginTestCase):
         msg = self.irc.takeMsg() # unban msg
         self.assertEqual(str(msg).strip(), "MODE #test -b :asd!*@*")
 
+    def testBanremoveMergeModes(self):
+        cb = self.getCallback()
+        self.feedBan('asd!*@*')
+        self.feedBan('qwe!*@*')
+        self.feedBan('zxc!*@*')
+        self.feedBan('asd!*@*', mode='q')
+        self.feedBan('qwe!*@*', mode='q')
+        self.feedBan('zxc!*@*', mode='q')
+        self.assertNotError('banremove 1 0')
+        self.assertNotError('banremove 2 0')
+        self.assertNotError('banremove 3 0')
+        self.assertNotError('banremove 4 0')
+        self.assertNotError('banremove 5 0')
+        self.assertNotError('banremove 6 0')
+        print 'waiting 1 secs ...'
+        time.sleep(1)
+        cb.autoRemoveBans(self.irc)
+        msg = self.irc.takeMsg() # unban msg
+        self.assertEqual(str(msg).strip(),
+                         "MODE #test -qqqb zxc!*@* qwe!*@* asd!*@* :zxc!*@*")
+        msg = self.irc.takeMsg()
+        self.assertEqual(str(msg).strip(), "MODE #test -bb qwe!*@* :asd!*@*")
+
     def testBanremoveQuiet(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*', mode='q')

From 3c7eff0f70962475b0c8f6060fd9b97f13ba0954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Wed, 18 Jul 2012 21:34:49 -0300
Subject: [PATCH 23/40] allow setting multiple bans with one command.

---
 Bantracker/plugin.py | 77 +++++++++++++++++++++++++-------------------
 Bantracker/test.py   | 21 ++++++------
 2 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index fb4bd1b..fc77432 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -1491,8 +1491,8 @@ class Bantracker(callbacks.Plugin):
                 irc.error("No comments recorded for ban %i" % id)
     comment = wrap(comment, ['id', optional('text')])
 
-    def banremove(self, irc, msg, args, id, timespec):
-        """<id> <time>
+    def banremove(self, irc, msg, args, ids, timespec):
+        """<id>[,<id> ...] <time>
 
         Sets expiration time.
         """
@@ -1502,44 +1502,53 @@ class Bantracker(callbacks.Plugin):
             irc.error("bad time format.")
             return
 
-        # lets check if is already managed first
-        for idx, remove in enumerate(self.managedBans):
-            if id == remove.ban.id:
-                ban = remove.ban
-                del self.managedBans.shelf[idx]
-                break
-        else:
-            L = self.db_run("SELECT mask, channel, removal FROM bans WHERE id = %s",
-                            id, expect_result=True)
-            if not L:
-                irc.reply("I don't know any ban with that id.")
-                return
+        ids = [ int(i) for i in ids.split(',') if i.isdigit() and int(i) > 0 ]
 
-            mask, channel, removal = L[0]
-            type = guessBanType(mask)
-            if type not in ('ban', 'quiet'):
-                irc.reply("Id %s is a %s, only bans or quiets can be autoremoved." % (id, type))
-                return
-
-            if removal:
-                irc.reply("Ban '%s' was already removed in %s." % (mask, channel))
-                return
-
-            for ban in self.bans[channel]:
-                if mask == ban.mask:
-                    if ban.id is None:
-                        ban.id = id
+        for id in ids:
+            # lets check if is already managed first
+            for idx, remove in enumerate(self.managedBans):
+                if id == remove.ban.id:
+                    ban = remove.ban
+                    del self.managedBans.shelf[idx]
                     break
             else:
-                # ban not in sync it seems, shouldn't happen normally.
-                irc.reply("Ban '%s' isn't active in %s." % (mask, channel))
-                return
+                L = self.db_run("SELECT mask, channel, removal FROM bans WHERE id = %s",
+                                id, expect_result=True)
+                if not L:
+                    irc.reply("I don't know any ban with id %s." % id)
+                    continue
 
+                mask, channel, removal = L[0]
+                type = guessBanType(mask)
+                if type not in ('ban', 'quiet'):
+                    irc.reply("Id %s is a %s, only bans or quiets can be autoremoved." % (id, type))
+                    continue
 
-        self.managedBans.add(BanRemoval(ban, seconds))
-        irc.replySuccess()
+                if removal:
+                    irc.reply("Ban %s (%s) was already removed in %s." % (id, mask, channel))
+                    continue
 
-    banremove = wrap(banremove, ['id', 'text'])
+                for ban in self.bans[channel]:
+                    if mask == ban.mask:
+                        if ban.id is None:
+                            ban.id = id
+                        break
+                else:
+                    # ban not in sync it seems, shouldn't happen normally.
+                    irc.reply("Ban %s (%s) isn't active in %s." % (id, mask, channel))
+                    continue
+
+            self.managedBans.add(BanRemoval(ban, seconds))
+
+        # check bans set
+        done = []
+        for br in self.managedBans:
+            if br.ban.id in ids:
+                done.append(str(br.ban.id))
+        if done:
+            irc.reply("Ban set for auto removal: %s" % ', '.join(done))
+
+    banremove = wrap(banremove, ['something', 'text'])
 
     def baninfo(self, irc, msg, args, id):
         """<id>
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 4dcf164..fc65142 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -369,12 +369,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.feedBan('asd!*@*', mode='q')
         self.feedBan('qwe!*@*', mode='q')
         self.feedBan('zxc!*@*', mode='q')
-        self.assertNotError('banremove 1 0')
-        self.assertNotError('banremove 2 0')
-        self.assertNotError('banremove 3 0')
-        self.assertNotError('banremove 4 0')
-        self.assertNotError('banremove 5 0')
-        self.assertNotError('banremove 6 0')
+        self.assertNotError('banremove 1,2,3,4,5,6 0')
         print 'waiting 1 secs ...'
         time.sleep(1)
         cb.autoRemoveBans(self.irc)
@@ -384,6 +379,14 @@ class BantrackerTestCase(ChannelPluginTestCase):
         msg = self.irc.takeMsg()
         self.assertEqual(str(msg).strip(), "MODE #test -bb qwe!*@* :asd!*@*")
 
+    def testBanremoveMultiSet(self):
+        self.feedBan('asd!*@*')
+        self.assertResponse('banremove 1,2 10',
+            "I don't know any ban with id 2.")
+        msg = self.irc.takeMsg()
+        self.assertEqual(msg.args[1], "test: Ban set for auto removal: 1")
+
+
     def testBanremoveQuiet(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*', mode='q')
@@ -399,17 +402,17 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.assertResponse('banremove 1 0',
             "Id 1 is a removal, only bans or quiets can be autoremoved.")
         self.feedBan('$a:nick')
-        self.assertResponse('banremove 2 0', 'The operation succeeded.')
+        self.assertResponse('banremove 2 0', 'Ban set for auto removal: 2')
 
     def testBanremoveBadId(self):
-        self.assertResponse('banremove 1 0', "I don't know any ban with that id.")
+        self.assertResponse('banremove 1 0', "I don't know any ban with id 1.")
 
     def testBanremoveInactiveBan(self):
         self.feedBan('asd!*@*')
         self.irc.feedMsg(ircmsgs.unban(self.channel, 'asd!*@*', 
                                        'op!user@host.net'))
         self.assertResponse('banremove 1 0', 
-                            "Ban 'asd!*@*' was already removed in #test.")
+                            "Ban 1 (asd!*@*) was already removed in #test.")
 
     def testBanremoveTimeFormat(self):
         cb = self.getCallback()

From 2f1a087faf185bb15d57805d7af921b733b34f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Fri, 27 Jul 2012 00:50:25 -0300
Subject: [PATCH 24/40] set ban duration with @comment command, also allow
 multiple ban ids example:  @comment 1,2 this is a comment, 1 week

---
 Bantracker/plugin.py | 172 +++++++++++++++++++++++++++----------------
 Bantracker/test.py   |  32 +++++++-
 2 files changed, 138 insertions(+), 66 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index fc77432..87479a8 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -119,8 +119,11 @@ def readTimeDelta(s):
                 # completed an unit, add to seconds
                 string = string.strip()
                 if string:
-                    mult = timeUnits[string]
-                    seconds += number * mult
+                    try:
+                        unit = timeUnits[string]
+                    except KeyError:
+                        raise ValueError(string)
+                    seconds += number * unit
                     string = ''
             string += c
         else:
@@ -139,8 +142,11 @@ def readTimeDelta(s):
     else:
         string = string.strip()
         if string:
-            mult = timeUnits[string]
-            seconds += number * mult
+            try:
+                unit = timeUnits[string]
+            except KeyError:
+                raise ValueError(string)
+            seconds += number * unit
 
     return seconds
 
@@ -1466,12 +1472,54 @@ class Bantracker(callbacks.Plugin):
 
     updatebt = wrap(updatebt, [optional('anything', default=None)])
 
-    def comment(self, irc, msg, args, id, kickmsg):
-        """<id> [<comment>]
+    def _getBan(self, id):
+        """gets mask, channel and removal date of ban"""
+        L = self.db_run("SELECT mask, channel, removal FROM bans WHERE id = %s",
+                        id, expect_result=True)
+        if not L:
+            raise ValueError
+        return L[0]
+
+    def _setBanDuration(self, id, duration):
+        # check if ban has already a duration time
+        for idx, br in enumerate(self.managedBans):
+            if id == br.ban.id:
+                ban = br.ban
+                del self.managedBans.shelf[idx]
+                break
+        else:
+            # ban obj ins't in self.managedBans
+            try:
+                mask, channel, removal = self._getBan(id)
+            except ValueError:
+                raise Exception("unknow id")
+
+            type = guessBanType(mask)
+            if type not in ('ban', 'quiet'):
+                raise Exception("not a ban or quiet")
+
+            if removal:
+                raise Exception("ban was removed")
+
+            for ban in self.bans[channel]:
+                if mask == ban.mask:
+                    if ban.id is None:
+                        ban.id = id
+                    break
+            else:
+                # ban not in sync it seems, shouldn't happen normally.
+                raise Exception("bans not in sync")
+
+        # add ban duration
+        self.managedBans.add(BanRemoval(ban, duration))
+
+    def comment(self, irc, msg, args, ids, kickmsg):
+        """<id>[,<id> ...] [<comment>][, <duration>]
 
         Reads or adds the <comment> for the ban with <id>,
         use @bansearch to find the id of a ban
         """
+
         def addComment(id, nick, msg):
             n = now()
             self.db_run("INSERT INTO comments (ban_id, who, comment, time) values(%s,%s,%s,%s)", (id, nick, msg, n))
@@ -1479,74 +1527,74 @@ class Bantracker(callbacks.Plugin):
             return self.db_run("SELECT who, comment, time FROM comments WHERE ban_id=%i", (id,), True)
 
         nick = msg.nick
-        if kickmsg:
-            addComment(id, nick, kickmsg)
-            irc.replySuccess()
-        else:
-            data = readComment(id)
-            if data:
-                for c in data:
-                    irc.reply("%s %s: %s" % (cPickle.loads(c[2]).astimezone(pytz.timezone('UTC')).strftime("%b %d %Y %H:%M:%S"), c[0], c[1].strip()) )
+        duration, banset = None, []
+        if kickmsg and ',' in kickmsg:
+            s = kickmsg[kickmsg.rfind(','):]
+            try:
+                duration = readTimeDelta(s)
+            except ValueError:
+                pass
+
+        for id in [ int(i) for i in ids.split(',') if i.isdigit() and int(i) > 0 ]:
+            try:
+                mask, channel, removal = self._getBan(id)
+            except ValueError:
+                irc.reply("I don't know any ban with id %s." % id)
+                continue
+
+            if kickmsg:
+                addComment(id, nick, kickmsg)
+                if duration is not None:
+                    # set duration time
+                    type = guessBanType(mask)
+                    if type not in ('ban', 'quiet'):
+                        continue
+
+                    try:
+                        self._setBanDuration(id, duration)
+                        banset.append(str(id))
+                    except Exception as exc:
+                        irc.reply("Failed to set duration time on ban %s (%s)" % (id, exc))
             else:
-                irc.error("No comments recorded for ban %i" % id)
-    comment = wrap(comment, ['id', optional('text')])
+                data = readComment(id)
+                if data:
+                    for c in data:
+                        date = cPickle.loads(c[2]).astimezone(pytz.timezone('UTC')).strftime("%b %d %Y %H:%M")
+                        irc.reply("%s %s: %s" % (date, c[0], c[1].strip()))
+                else:
+                    irc.reply("No comments recorded for ban %s" % id)
+
+        # success reply. If duration time used, say which ones.
+        if kickmsg:
+            if duration is not None:
+                if banset:
+                    irc.reply("Ban set for auto removal: %s" % ', '.join(banset))
+            else:
+                irc.replySuccess()
+
+    comment = wrap(comment, ['something', optional('text')])
 
     def banremove(self, irc, msg, args, ids, timespec):
-        """<id>[,<id> ...] <time>
+        """<id>[,<id> ...] <duration>
 
         Sets expiration time.
         """
         try:
             seconds = readTimeDelta(timespec)
-        except KeyError:
+        except ValueError:
             irc.error("bad time format.")
             return
 
-        ids = [ int(i) for i in ids.split(',') if i.isdigit() and int(i) > 0 ]
+        banset = []
+        for id in [ int(i) for i in ids.split(',') if i.isdigit() and int(i) > 0 ]:
+            try:
+                self._setBanDuration(id, seconds)
+                banset.append(str(id))
+            except Exception as exc:
+                irc.reply("Failed to set duration time on ban %s (%s)" % (id, exc))
 
-        for id in ids:
-            # lets check if is already managed first
-            for idx, remove in enumerate(self.managedBans):
-                if id == remove.ban.id:
-                    ban = remove.ban
-                    del self.managedBans.shelf[idx]
-                    break
-            else:
-                L = self.db_run("SELECT mask, channel, removal FROM bans WHERE id = %s",
-                                id, expect_result=True)
-                if not L:
-                    irc.reply("I don't know any ban with id %s." % id)
-                    continue
-
-                mask, channel, removal = L[0]
-                type = guessBanType(mask)
-                if type not in ('ban', 'quiet'):
-                    irc.reply("Id %s is a %s, only bans or quiets can be autoremoved." % (id, type))
-                    continue
-
-                if removal:
-                    irc.reply("Ban %s (%s) was already removed in %s." % (id, mask, channel))
-                    continue
-
-                for ban in self.bans[channel]:
-                    if mask == ban.mask:
-                        if ban.id is None:
-                            ban.id = id
-                        break
-                else:
-                    # ban not in sync it seems, shouldn't happen normally.
-                    irc.reply("Ban %s (%s) isn't active in %s." % (id, mask, channel))
-                    continue
-
-            self.managedBans.add(BanRemoval(ban, seconds))
-
-        # check bans set
-        done = []
-        for br in self.managedBans:
-            if br.ban.id in ids:
-                done.append(str(br.ban.id))
-        if done:
-            irc.reply("Ban set for auto removal: %s" % ', '.join(done))
+        if banset:
+            irc.reply("Ban set for auto removal: %s" % ', '.join(banset))
 
     banremove = wrap(banremove, ['something', 'text'])
 
diff --git a/Bantracker/test.py b/Bantracker/test.py
index fc65142..5739b33 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -125,6 +125,30 @@ class BantrackerTestCase(ChannelPluginTestCase):
         return ban
 
     def testComment(self):
+        self.assertResponse('comment 1', "I don't know any ban with id 1.")
+        self.feedBan('asd!*@*')
+        self.assertResponse('comment 1', 'No comments recorded for ban 1')
+        self.assertResponse('comment 1 this is a test', 'The operation succeeded.')
+        self.assertRegexp('comment 1', 'test: this is a test$')
+
+    def testMultiComment(self):
+        self.feedBan('asd!*@*')
+        self.feedBan('qwe!*@*')
+        self.assertResponse('comment 1,2,3 this is a test',
+                            "I don't know any ban with id 3.")
+        msg = self.irc.takeMsg()
+        self.assertEqual(msg.args[1], "test: The operation succeeded.")
+        self.assertRegexp('comment 1,2', 'test: this is a test$')
+        msg = self.irc.takeMsg()
+        self.assertTrue(msg.args[1].endswith("test: this is a test"))
+
+    def testCommentDuration(self):
+        self.feedBan('asd!*@*')
+        self.assertResponse('comment 1 this is a test, 1 week 10', 'Ban set for auto removal: 1')
+        self.assertRegexp('comment 1', 'test: this is a test, 1 week 10$')
+        self.assertRegexp('baninfo 1', 'expires in 1 week$')
+
+    def testCommentRequest(self):
         pluginConf.request.setValue(True)
         # test bans
         self.feedBan('asd!*@*')
@@ -382,7 +406,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
     def testBanremoveMultiSet(self):
         self.feedBan('asd!*@*')
         self.assertResponse('banremove 1,2 10',
-            "I don't know any ban with id 2.")
+                            "Failed to set duration time on ban 2 (unknow id)")
         msg = self.irc.takeMsg()
         self.assertEqual(msg.args[1], "test: Ban set for auto removal: 1")
 
@@ -400,19 +424,19 @@ class BantrackerTestCase(ChannelPluginTestCase):
     def testBanremoveBadType(self):
         self.feedBan('nick', mode='k')
         self.assertResponse('banremove 1 0',
-            "Id 1 is a removal, only bans or quiets can be autoremoved.")
+            "Failed to set duration time on ban 1 (not a ban or quiet)")
         self.feedBan('$a:nick')
         self.assertResponse('banremove 2 0', 'Ban set for auto removal: 2')
 
     def testBanremoveBadId(self):
-        self.assertResponse('banremove 1 0', "I don't know any ban with id 1.")
+        self.assertResponse('banremove 1 0', "Failed to set duration time on ban 1 (unknow id)")
 
     def testBanremoveInactiveBan(self):
         self.feedBan('asd!*@*')
         self.irc.feedMsg(ircmsgs.unban(self.channel, 'asd!*@*', 
                                        'op!user@host.net'))
         self.assertResponse('banremove 1 0', 
-                            "Ban 1 (asd!*@*) was already removed in #test.")
+                            "Failed to set duration time on ban 1 (ban was removed)")
 
     def testBanremoveTimeFormat(self):
         cb = self.getCallback()

From e979e864db746d0e94bd410a42946278cc6bcedd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Fri, 27 Jul 2012 13:45:37 -0300
Subject: [PATCH 25/40] use a interval of 10 min between ban removal checks
 instead of one minute. This way bans with close expire dates are more likely
 to be removed with a single MODE command.

---
 Bantracker/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 87479a8..aaff341 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -515,7 +515,7 @@ class Bantracker(callbacks.Plugin):
         # add our scheduled events for check bans for reviews or removal
         schedule.addPeriodicEvent(lambda: self.reviewBans(irc), 60*60,
                                   name=self.name() + '_review')
-        schedule.addPeriodicEvent(lambda: self.autoRemoveBans(irc), 60,
+        schedule.addPeriodicEvent(lambda: self.autoRemoveBans(irc), 600,
                                   name=self.name() + '_autoremove')
 
 

From 44cd80515d8e7ba15d11467f239c23f6a052e3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Fri, 27 Jul 2012 16:03:15 -0300
Subject: [PATCH 26/40] list the ids of bans set to expire if no id is given to
 @baninfo

---
 Bantracker/plugin.py | 14 +++++++++++---
 Bantracker/test.py   |  9 +++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index aaff341..d05088e 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -1599,10 +1599,18 @@ class Bantracker(callbacks.Plugin):
     banremove = wrap(banremove, ['something', 'text'])
 
     def baninfo(self, irc, msg, args, id):
-        """<id>
+        """[<id>]
 
-        Show ban information.
+        Show ban information. If <id> is not given shows the ids of bans set to
+        expire.
         """
+
+        if id is None:
+            count = len(self.managedBans)
+            L = [ str(item.ban.id) for item in self.managedBans ]
+            irc.reply("%s bans set to expire: %s" % (count, ', '.join(L)))
+            return
+
         L = self.db_run("SELECT mask, channel, removal FROM bans WHERE id = %s",
                         id, expect_result=True)
         if not L:
@@ -1639,7 +1647,7 @@ class Bantracker(callbacks.Plugin):
             irc.reply("[%s] %s - %s - %s" % (id, type, mask, channel))
 
 
-    baninfo = wrap(baninfo, ['id'])
+    baninfo = wrap(baninfo, [optional('id')])
 
     def banlink(self, irc, msg, args, id, highlight):
         """<id> [<highlight>]
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 5739b33..772d319 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -509,4 +509,13 @@ class BantrackerTestCase(ChannelPluginTestCase):
                                        'op!user@host.net'))
         self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - not active')
 
+    def testBaninfoGeneral(self):
+        cb = self.getCallback()
+        self.feedBan('asd!*@*')
+        self.feedBan('qwe!*@*')
+        self.assertNotError('banremove 1 1d')
+        self.assertResponse('baninfo', "1 bans set to expire: 1")
+        self.assertNotError('banremove 2 1d')
+        self.assertResponse('baninfo', "2 bans set to expire: 1, 2")
+
 

From 2e3506c9bd11a283a7095662bb15d80994112ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Fri, 27 Jul 2012 16:09:05 -0300
Subject: [PATCH 27/40] rename the command 'banremove' to 'duration'

---
 Bantracker/plugin.py |  4 +--
 Bantracker/test.py   | 66 ++++++++++++++++++++++----------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index d05088e..1a1364f 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -1574,7 +1574,7 @@ class Bantracker(callbacks.Plugin):
 
     comment = wrap(comment, ['something', optional('text')])
 
-    def banremove(self, irc, msg, args, ids, timespec):
+    def duration(self, irc, msg, args, ids, timespec):
         """<id>[,<id> ...] <duration>
 
         Sets expiration time.
@@ -1596,7 +1596,7 @@ class Bantracker(callbacks.Plugin):
         if banset:
             irc.reply("Ban set for auto removal: %s" % ', '.join(banset))
 
-    banremove = wrap(banremove, ['something', 'text'])
+    duration = wrap(duration, ['something', 'text'])
 
     def baninfo(self, irc, msg, args, id):
         """[<id>]
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 772d319..d60e55d 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -371,12 +371,12 @@ class BantrackerTestCase(ChannelPluginTestCase):
         fetch = self.query("SELECT id,channel,mask,operator FROM bans")
         self.assertEqual((1, '#test', 'troll', 'op'), fetch[0])
 
-    def testBanremove(self):
+    def testDuration(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
         cb.autoRemoveBans(self.irc)
         self.assertFalse(cb.managedBans)
-        self.assertNotError('banremove 1 1')
+        self.assertNotError('duration 1 1')
         self.assertTrue(cb.managedBans) # ban in list
         print 'waiting 2 secs ...'
         time.sleep(2)
@@ -385,7 +385,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
         msg = self.irc.takeMsg() # unban msg
         self.assertEqual(str(msg).strip(), "MODE #test -b :asd!*@*")
 
-    def testBanremoveMergeModes(self):
+    def testDurationMergeModes(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
         self.feedBan('qwe!*@*')
@@ -393,7 +393,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.feedBan('asd!*@*', mode='q')
         self.feedBan('qwe!*@*', mode='q')
         self.feedBan('zxc!*@*', mode='q')
-        self.assertNotError('banremove 1,2,3,4,5,6 0')
+        self.assertNotError('duration 1,2,3,4,5,6 0')
         print 'waiting 1 secs ...'
         time.sleep(1)
         cb.autoRemoveBans(self.irc)
@@ -403,64 +403,64 @@ class BantrackerTestCase(ChannelPluginTestCase):
         msg = self.irc.takeMsg()
         self.assertEqual(str(msg).strip(), "MODE #test -bb qwe!*@* :asd!*@*")
 
-    def testBanremoveMultiSet(self):
+    def testDurationMultiSet(self):
         self.feedBan('asd!*@*')
-        self.assertResponse('banremove 1,2 10',
+        self.assertResponse('duration 1,2 10',
                             "Failed to set duration time on ban 2 (unknow id)")
         msg = self.irc.takeMsg()
         self.assertEqual(msg.args[1], "test: Ban set for auto removal: 1")
 
 
-    def testBanremoveQuiet(self):
+    def testDurationQuiet(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*', mode='q')
-        self.assertNotError('banremove 1 0')
+        self.assertNotError('duration 1 0')
         print 'waiting 1 sec ...'
         time.sleep(1)
         cb.autoRemoveBans(self.irc)
         msg = self.irc.takeMsg() # unban msg
         self.assertEqual(str(msg).strip(), "MODE #test -q :asd!*@*")
 
-    def testBanremoveBadType(self):
+    def testDurationBadType(self):
         self.feedBan('nick', mode='k')
-        self.assertResponse('banremove 1 0',
+        self.assertResponse('duration 1 0',
             "Failed to set duration time on ban 1 (not a ban or quiet)")
         self.feedBan('$a:nick')
-        self.assertResponse('banremove 2 0', 'Ban set for auto removal: 2')
+        self.assertResponse('duration 2 0', 'Ban set for auto removal: 2')
 
-    def testBanremoveBadId(self):
-        self.assertResponse('banremove 1 0', "Failed to set duration time on ban 1 (unknow id)")
+    def testDurationBadId(self):
+        self.assertResponse('duration 1 0', "Failed to set duration time on ban 1 (unknow id)")
 
-    def testBanremoveInactiveBan(self):
+    def testDurationInactiveBan(self):
         self.feedBan('asd!*@*')
         self.irc.feedMsg(ircmsgs.unban(self.channel, 'asd!*@*', 
                                        'op!user@host.net'))
-        self.assertResponse('banremove 1 0', 
+        self.assertResponse('duration 1 0', 
                             "Failed to set duration time on ban 1 (ban was removed)")
 
-    def testBanremoveTimeFormat(self):
+    def testDurationTimeFormat(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
-        self.assertNotError('banremove 1 10m')
+        self.assertNotError('duration 1 10m')
         self.assertEqual(cb.managedBans.shelf[0].expires, 600)
-        self.assertNotError('banremove 1 2 weeks')
+        self.assertNotError('duration 1 2 weeks')
         self.assertEqual(cb.managedBans.shelf[0].expires, 1209600)
-        self.assertNotError('banremove 1 1m 2 days')
+        self.assertNotError('duration 1 1m 2 days')
         self.assertEqual(cb.managedBans.shelf[0].expires, 172860)
-        self.assertNotError('banremove 1 24h 1day')
+        self.assertNotError('duration 1 24h 1day')
         self.assertEqual(cb.managedBans.shelf[0].expires, 172800)
-        self.assertNotError('banremove 1 1m1h1d1w1M1y')
+        self.assertNotError('duration 1 1m1h1d1w1M1y')
         self.assertEqual(cb.managedBans.shelf[0].expires, 34822860)
-        self.assertNotError('banremove 1 999')
+        self.assertNotError('duration 1 999')
         self.assertEqual(cb.managedBans.shelf[0].expires, 999)
 
-    def testBanremoveTimeFormatBad(self):
-        self.assertError('banremove 1 10 apples')
+    def testDurationTimeFormatBad(self):
+        self.assertError('duration 1 10 apples')
 
-    def testBanremoveNotice(self):
+    def testDurationNotice(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
-        self.assertNotError('banremove 1 300')
+        self.assertNotError('duration 1 300')
         pluginConf.autoremove.notify.channels().append('#test')
         try:
             cb.autoRemoveBans(self.irc)
@@ -478,9 +478,9 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.feedBan('asd!*@*')
         self.feedBan('qwe!*@*')
         self.feedBan('zxc!*@*', mode='q')
-        self.assertNotError('banremove 1 10m')
-        self.assertNotError('banremove 2 1d')
-        self.assertNotError('banremove 3 1w')
+        self.assertNotError('duration 1 10m')
+        self.assertNotError('duration 2 1d')
+        self.assertNotError('duration 3 1w')
         cb = self.getCallback()
         cb.managedBans.shelf[1].notified = True
         cb.managedBans.close()
@@ -501,9 +501,9 @@ class BantrackerTestCase(ChannelPluginTestCase):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
         self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - never expires')
-        self.assertNotError('banremove 1 10')
+        self.assertNotError('duration 1 10')
         self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - expires soon')
-        self.assertNotError('banremove 1 34502')
+        self.assertNotError('duration 1 34502')
         self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - expires in 9 hours and 35 minutes')
         self.irc.feedMsg(ircmsgs.unban(self.channel, 'asd!*@*', 
                                        'op!user@host.net'))
@@ -513,9 +513,9 @@ class BantrackerTestCase(ChannelPluginTestCase):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
         self.feedBan('qwe!*@*')
-        self.assertNotError('banremove 1 1d')
+        self.assertNotError('duration 1 1d')
         self.assertResponse('baninfo', "1 bans set to expire: 1")
-        self.assertNotError('banremove 2 1d')
+        self.assertNotError('duration 2 1d')
         self.assertResponse('baninfo', "2 bans set to expire: 1, 2")
 
 

From 02e5f2aa10da62ad00a099685295e8eead3e30d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Fri, 27 Jul 2012 19:21:21 -0300
Subject: [PATCH 28/40] Remove @baninfo. Ban information is fetched with
 @duration now.

---
 Bantracker/plugin.py | 128 ++++++++++++++++++++++---------------------
 Bantracker/test.py   |  14 ++---
 2 files changed, 73 insertions(+), 69 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 1a1364f..c93efd1 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -191,6 +191,14 @@ def timeElapsed(elapsed, short=False, resolution=2):
         result += ' ago'
     return result
 
+def splitID(s):
+    """get a list of integers from a comma separated list of numbers"""
+    for id in s.split(','):
+        if id.isdigit():
+            id = int(id)
+            if id > 0:
+                yield id
+
 def capab(user, capability):
     capability = capability.lower()
     capabilities = list(user.capabilities)
@@ -1535,7 +1543,7 @@ class Bantracker(callbacks.Plugin):
             except ValueError:
                 pass
 
-        for id in [ int(i) for i in ids.split(',') if i.isdigit() and int(i) > 0 ]:
+        for id in splitID(ids):
             try:
                 mask, channel, removal = self._getBan(id)
             except ValueError:
@@ -1574,80 +1582,76 @@ class Bantracker(callbacks.Plugin):
 
     comment = wrap(comment, ['something', optional('text')])
 
-    def duration(self, irc, msg, args, ids, timespec):
-        """<id>[,<id> ...] <duration>
+    def duration(self, irc, msg, args, ids, duration):
+        """[<id>[,<id> ...]] [<duration>]
 
-        Sets expiration time.
+        Sets the duration of a ban. If <duration> isn't given show when a ban expires.
+        If no <id> is given shows the ids of bans set to expire.
         """
-        try:
-            seconds = readTimeDelta(timespec)
-        except ValueError:
-            irc.error("bad time format.")
-            return
-
-        banset = []
-        for id in [ int(i) for i in ids.split(',') if i.isdigit() and int(i) > 0 ]:
-            try:
-                self._setBanDuration(id, seconds)
-                banset.append(str(id))
-            except Exception as exc:
-                irc.reply("Failed to set duration time on ban %s (%s)" % (id, exc))
-
-        if banset:
-            irc.reply("Ban set for auto removal: %s" % ', '.join(banset))
-
-    duration = wrap(duration, ['something', 'text'])
-
-    def baninfo(self, irc, msg, args, id):
-        """[<id>]
-
-        Show ban information. If <id> is not given shows the ids of bans set to
-        expire.
-        """
-
-        if id is None:
+        if ids is None:
             count = len(self.managedBans)
             L = [ str(item.ban.id) for item in self.managedBans ]
             irc.reply("%s bans set to expire: %s" % (count, ', '.join(L)))
             return
 
-        L = self.db_run("SELECT mask, channel, removal FROM bans WHERE id = %s",
-                        id, expect_result=True)
-        if not L:
-            irc.reply("I don't know any ban with that id.")
-            return
-
-        mask, channel, removal = L[0]
-        type = guessBanType(mask)
-        if type == 'quiet':
-            mask = mask[1:]
-        for br in self.managedBans:
-            if br.ban.id == id:
-                break
-        else:
-            br = None
-
-        expires = None
-        if br:
-            expires = (br.ban.when + br.expires) - nowSeconds()
+        if duration is not None:
             try:
-                expires = "expires in %s" % timeElapsed(expires)
+                duration = readTimeDelta(duration)
             except ValueError:
-                expires = "expires soon"
-        else:
-            if type in ('quiet', 'ban'):
-                if not removal:
-                    expires = "never expires"
+                irc.error("bad time format.")
+                return
+
+        banset = []
+        for id in splitID(ids):
+            if duration is not None:
+                # set ban duration
+                try:
+                    self._setBanDuration(id, duration)
+                    banset.append(str(id))
+                except Exception as exc:
+                    irc.reply("Failed to set duration time on ban %s (%s)" \
+                              % (id, exc))
+            else:
+                # get ban information
+                try:
+                    mask, channel, removal = self._getBan(id)
+                except ValueError:
+                    irc.reply("I don't know any ban with id %s." % id)
+                    continue
+
+                type = guessBanType(mask)
+                if type == 'quiet':
+                    mask = mask[1:]
+                for br in self.managedBans:
+                    if br.ban.id == id:
+                        break
                 else:
-                    expires = "not active"
+                    br = None
 
-        if expires:
-            irc.reply("[%s] %s - %s - %s - %s" % (id, type, mask, channel, expires))
-        else:
-            irc.reply("[%s] %s - %s - %s" % (id, type, mask, channel))
+                expires = None
+                if br:
+                    expires = (br.ban.when + br.expires) - nowSeconds()
+                    try:
+                        expires = "expires in %s" % timeElapsed(expires)
+                    except ValueError:
+                        expires = "expires soon"
+                else:
+                    if type in ('quiet', 'ban'):
+                        if not removal:
+                            expires = "never expires"
+                        else:
+                            expires = "not active"
 
+                if expires:
+                    irc.reply("[%s] %s - %s - %s - %s" % (id, type, mask, channel, expires))
+                else:
+                    irc.reply("[%s] %s - %s - %s" % (id, type, mask, channel))
 
-    baninfo = wrap(baninfo, [optional('id')])
+        # reply with the bans ids that were correctly set.
+        if banset:
+            irc.reply("Ban set for auto removal: %s" % ', '.join(banset))
+
+    duration = wrap(duration, [optional('something'), optional('text')])
 
     def banlink(self, irc, msg, args, id, highlight):
         """<id> [<highlight>]
diff --git a/Bantracker/test.py b/Bantracker/test.py
index d60e55d..16c3aba 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -146,7 +146,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.feedBan('asd!*@*')
         self.assertResponse('comment 1 this is a test, 1 week 10', 'Ban set for auto removal: 1')
         self.assertRegexp('comment 1', 'test: this is a test, 1 week 10$')
-        self.assertRegexp('baninfo 1', 'expires in 1 week$')
+        self.assertRegexp('duration 1', 'expires in 1 week$')
 
     def testCommentRequest(self):
         pluginConf.request.setValue(True)
@@ -500,22 +500,22 @@ class BantrackerTestCase(ChannelPluginTestCase):
     def testBaninfo(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
-        self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - never expires')
+        self.assertResponse('duration 1', '[1] ban - asd!*@* - #test - never expires')
         self.assertNotError('duration 1 10')
-        self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - expires soon')
+        self.assertResponse('duration 1', '[1] ban - asd!*@* - #test - expires soon')
         self.assertNotError('duration 1 34502')
-        self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - expires in 9 hours and 35 minutes')
+        self.assertResponse('duration 1', '[1] ban - asd!*@* - #test - expires in 9 hours and 35 minutes')
         self.irc.feedMsg(ircmsgs.unban(self.channel, 'asd!*@*', 
                                        'op!user@host.net'))
-        self.assertResponse('baninfo 1', '[1] ban - asd!*@* - #test - not active')
+        self.assertResponse('duration 1', '[1] ban - asd!*@* - #test - not active')
 
     def testBaninfoGeneral(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
         self.feedBan('qwe!*@*')
         self.assertNotError('duration 1 1d')
-        self.assertResponse('baninfo', "1 bans set to expire: 1")
+        self.assertResponse('duration', "1 bans set to expire: 1")
         self.assertNotError('duration 2 1d')
-        self.assertResponse('baninfo', "2 bans set to expire: 1, 2")
+        self.assertResponse('duration', "2 bans set to expire: 1, 2")
 
 

From dfd9bdf6331c03f459489b27d4b304b7f57873c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Fri, 27 Jul 2012 21:08:25 -0300
Subject: [PATCH 29/40] fix bug when using @comment with a comma but bad
 duration syntax.

---
 Bantracker/plugin.py | 6 ++++++
 Bantracker/test.py   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index c93efd1..39922e5 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -107,6 +107,9 @@ timeUnits = FuzzyDict({
 def readTimeDelta(s):
     """convert a string like "2 days" or "1h2d3w" into seconds"""
     # split number and words
+    if not s:
+        raise ValueError(s)
+
     digit = string = number = None
     seconds = 0
     for c in s:
@@ -137,6 +140,9 @@ def readTimeDelta(s):
             string += c
 
     # check last string
+    if string is None:
+        raise ValueError(s)
+
     if string.isdigit():
         seconds += int(string)
     else:
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 16c3aba..01206d9 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -130,6 +130,8 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.assertResponse('comment 1', 'No comments recorded for ban 1')
         self.assertResponse('comment 1 this is a test', 'The operation succeeded.')
         self.assertRegexp('comment 1', 'test: this is a test$')
+        self.assertResponse('comment 1 this is a test, another test',
+                            'The operation succeeded.')
 
     def testMultiComment(self):
         self.feedBan('asd!*@*')

From 846667faf2d9d9f45ee777eb4e58e92c9e728aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Fri, 27 Jul 2012 21:44:29 -0300
Subject: [PATCH 30/40] refactoring replies a bit.

---
 Bantracker/plugin.py | 10 +++++-----
 Bantracker/test.py   | 34 ++++++++++++++++++++++------------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 39922e5..f2d4408 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -1537,6 +1537,7 @@ class Bantracker(callbacks.Plugin):
         def addComment(id, nick, msg):
             n = now()
             self.db_run("INSERT INTO comments (ban_id, who, comment, time) values(%s,%s,%s,%s)", (id, nick, msg, n))
+
         def readComment(id):
             return self.db_run("SELECT who, comment, time FROM comments WHERE ban_id=%i", (id,), True)
 
@@ -1580,9 +1581,8 @@ class Bantracker(callbacks.Plugin):
 
         # success reply. If duration time used, say which ones.
         if kickmsg:
-            if duration is not None:
-                if banset:
-                    irc.reply("Ban set for auto removal: %s" % ', '.join(banset))
+            if banset:
+                irc.replySuccess("%s set to expire." % ', '.join(banset))
             else:
                 irc.replySuccess()
 
@@ -1615,7 +1615,7 @@ class Bantracker(callbacks.Plugin):
                     self._setBanDuration(id, duration)
                     banset.append(str(id))
                 except Exception as exc:
-                    irc.reply("Failed to set duration time on ban %s (%s)" \
+                    irc.reply("Failed to set duration time on %s (%s)" \
                               % (id, exc))
             else:
                 # get ban information
@@ -1655,7 +1655,7 @@ class Bantracker(callbacks.Plugin):
 
         # reply with the bans ids that were correctly set.
         if banset:
-            irc.reply("Ban set for auto removal: %s" % ', '.join(banset))
+            irc.reply("%s set to expire." % ', '.join(banset))
 
     duration = wrap(duration, [optional('something'), optional('text')])
 
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 01206d9..1f63982 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -128,10 +128,14 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.assertResponse('comment 1', "I don't know any ban with id 1.")
         self.feedBan('asd!*@*')
         self.assertResponse('comment 1', 'No comments recorded for ban 1')
-        self.assertResponse('comment 1 this is a test', 'The operation succeeded.')
+        self.assertResponse('comment 1 this is a test',
+                            'The operation succeeded.')
         self.assertRegexp('comment 1', 'test: this is a test$')
         self.assertResponse('comment 1 this is a test, another test',
                             'The operation succeeded.')
+        self.feedBan('nick', mode='k')
+        self.assertResponse('comment 2 this is a kick, 2week',
+                            'The operation succeeded.')
 
     def testMultiComment(self):
         self.feedBan('asd!*@*')
@@ -146,7 +150,8 @@ class BantrackerTestCase(ChannelPluginTestCase):
 
     def testCommentDuration(self):
         self.feedBan('asd!*@*')
-        self.assertResponse('comment 1 this is a test, 1 week 10', 'Ban set for auto removal: 1')
+        self.assertResponse('comment 1 this is a test, 1 week 10',
+                            'The operation succeeded.  1 set to expire.')
         self.assertRegexp('comment 1', 'test: this is a test, 1 week 10$')
         self.assertRegexp('duration 1', 'expires in 1 week$')
 
@@ -408,9 +413,9 @@ class BantrackerTestCase(ChannelPluginTestCase):
     def testDurationMultiSet(self):
         self.feedBan('asd!*@*')
         self.assertResponse('duration 1,2 10',
-                            "Failed to set duration time on ban 2 (unknow id)")
+                "Failed to set duration time on 2 (unknow id)")
         msg = self.irc.takeMsg()
-        self.assertEqual(msg.args[1], "test: Ban set for auto removal: 1")
+        self.assertEqual(msg.args[1], "test: 1 set to expire.")
 
 
     def testDurationQuiet(self):
@@ -426,19 +431,20 @@ class BantrackerTestCase(ChannelPluginTestCase):
     def testDurationBadType(self):
         self.feedBan('nick', mode='k')
         self.assertResponse('duration 1 0',
-            "Failed to set duration time on ban 1 (not a ban or quiet)")
+                "Failed to set duration time on 1 (not a ban or quiet)")
         self.feedBan('$a:nick')
-        self.assertResponse('duration 2 0', 'Ban set for auto removal: 2')
+        self.assertResponse('duration 2 0', '2 set to expire.')
 
     def testDurationBadId(self):
-        self.assertResponse('duration 1 0', "Failed to set duration time on ban 1 (unknow id)")
+        self.assertResponse('duration 1 0', 
+                "Failed to set duration time on 1 (unknow id)")
 
     def testDurationInactiveBan(self):
         self.feedBan('asd!*@*')
         self.irc.feedMsg(ircmsgs.unban(self.channel, 'asd!*@*', 
                                        'op!user@host.net'))
         self.assertResponse('duration 1 0', 
-                            "Failed to set duration time on ban 1 (ban was removed)")
+                "Failed to set duration time on 1 (ban was removed)")
 
     def testDurationTimeFormat(self):
         cb = self.getCallback()
@@ -502,14 +508,18 @@ class BantrackerTestCase(ChannelPluginTestCase):
     def testBaninfo(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
-        self.assertResponse('duration 1', '[1] ban - asd!*@* - #test - never expires')
+        self.assertResponse('duration 1', 
+                "[1] ban - asd!*@* - #test - never expires")
         self.assertNotError('duration 1 10')
-        self.assertResponse('duration 1', '[1] ban - asd!*@* - #test - expires soon')
+        self.assertResponse('duration 1', 
+                "[1] ban - asd!*@* - #test - expires soon")
         self.assertNotError('duration 1 34502')
-        self.assertResponse('duration 1', '[1] ban - asd!*@* - #test - expires in 9 hours and 35 minutes')
+        self.assertResponse('duration 1', 
+                "[1] ban - asd!*@* - #test - expires in 9 hours and 35 minutes")
         self.irc.feedMsg(ircmsgs.unban(self.channel, 'asd!*@*', 
                                        'op!user@host.net'))
-        self.assertResponse('duration 1', '[1] ban - asd!*@* - #test - not active')
+        self.assertResponse('duration 1', 
+                "[1] ban - asd!*@* - #test - not active")
 
     def testBaninfoGeneral(self):
         cb = self.getCallback()

From d241665208c22c6329f0829c0ac7c351614b0187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Fri, 27 Jul 2012 23:12:35 -0300
Subject: [PATCH 31/40] don't ignore extra words prefixed to the duration in
 @comment or @duration

---
 Bantracker/plugin.py | 7 +++++--
 Bantracker/test.py   | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index f2d4408..94ab270 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -113,6 +113,9 @@ def readTimeDelta(s):
     digit = string = number = None
     seconds = 0
     for c in s:
+        if c == ' ':
+            continue
+
         if c.isdigit():
             if string is None:
                 # start
@@ -132,7 +135,7 @@ def readTimeDelta(s):
         else:
             if digit is None:
                 # need a number first
-                continue
+                raise ValueError(s)
             if digit is True:
                 digit = False
                 # completed a number
@@ -1544,7 +1547,7 @@ class Bantracker(callbacks.Plugin):
         nick = msg.nick
         duration, banset = None, []
         if kickmsg and ',' in kickmsg:
-            s = kickmsg[kickmsg.rfind(','):]
+            s = kickmsg[kickmsg.rfind(',') + 1:]
             try:
                 duration = readTimeDelta(s)
             except ValueError:
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 1f63982..a2dfaa4 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -136,6 +136,8 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.feedBan('nick', mode='k')
         self.assertResponse('comment 2 this is a kick, 2week',
                             'The operation succeeded.')
+        self.assertResponse('comment 1 not a valid, duration 2',
+                            'The operation succeeded.')
 
     def testMultiComment(self):
         self.feedBan('asd!*@*')

From 82057380991851cd55a19be025c807abc2a1d69f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Sun, 29 Jul 2012 23:36:18 -0300
Subject: [PATCH 32/40] refactor bot replies.

---
 Bantracker/plugin.py | 46 ++++++++++++++++++++++++++------------------
 Bantracker/test.py   | 32 ++++++++++++++++--------------
 2 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 94ab270..ccaf1cc 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -1533,8 +1533,8 @@ class Bantracker(callbacks.Plugin):
     def comment(self, irc, msg, args, ids, kickmsg):
         """<id>[,<id> ...] [<comment>][, <duration>]
 
-        Reads or adds the <comment> for the ban with <id>,
-        use @bansearch to find the id of a ban
+        Reads or adds the <comment> for the ban with <id>, use @bansearch to
+        find the id of a ban. Using <duration> will set the duration of the ban.
         """
 
         def addComment(id, nick, msg):
@@ -1555,7 +1555,7 @@ class Bantracker(callbacks.Plugin):
 
         for id in splitID(ids):
             try:
-                mask, channel, removal = self._getBan(id)
+                self._getBan(id)
             except ValueError:
                 irc.reply("I don't know any ban with id %s." % id)
                 continue
@@ -1564,15 +1564,11 @@ class Bantracker(callbacks.Plugin):
                 addComment(id, nick, kickmsg)
                 if duration is not None:
                     # set duration time
-                    type = guessBanType(mask)
-                    if type not in ('ban', 'quiet'):
-                        continue
-
                     try:
                         self._setBanDuration(id, duration)
                         banset.append(str(id))
                     except Exception as exc:
-                        irc.reply("Failed to set duration time on ban %s (%s)" % (id, exc))
+                        irc.reply("Failed to set duration time on %s (%s)" % (id, exc))
             else:
                 data = readComment(id)
                 if data:
@@ -1582,25 +1578,30 @@ class Bantracker(callbacks.Plugin):
                 else:
                     irc.reply("No comments recorded for ban %s" % id)
 
-        # success reply. If duration time used, say which ones.
+        # success reply. If duration time used, say which ones were set.
         if kickmsg:
             if banset:
-                irc.replySuccess("%s set to expire." % ', '.join(banset))
+                try:
+                    time = 'after ' + timeElapsed(duration)
+                except ValueError:
+                    time = 'soon'
+                irc.reply("Comment added. %s will be removed %s." \
+                          % (utils.str.format('%L', banset), time))
             else:
-                irc.replySuccess()
+                # only a comment
+                irc.reply("Comment added.")
 
     comment = wrap(comment, ['something', optional('text')])
 
     def duration(self, irc, msg, args, ids, duration):
         """[<id>[,<id> ...]] [<duration>]
 
-        Sets the duration of a ban. If <duration> isn't given show when a ban expires.
-        If no <id> is given shows the ids of bans set to expire.
+        Sets the duration of a ban. If <duration> isn't given show when a ban expires. f no <id> is given shows the ids of bans set to expire.
         """
         if ids is None:
             count = len(self.managedBans)
             L = [ str(item.ban.id) for item in self.managedBans ]
-            irc.reply("%s bans set to expire: %s" % (count, ', '.join(L)))
+            irc.reply("%s bans set to expire: %s" % (count, utils.str.format('%L', L)))
             return
 
         if duration is not None:
@@ -1640,10 +1641,13 @@ class Bantracker(callbacks.Plugin):
                 expires = None
                 if br:
                     expires = (br.ban.when + br.expires) - nowSeconds()
-                    try:
-                        expires = "expires in %s" % timeElapsed(expires)
-                    except ValueError:
-                        expires = "expires soon"
+                    if expires > 0:
+                        try:
+                            expires = "expires in %s" % timeElapsed(expires)
+                        except ValueError:
+                            expires = "expires soon"
+                    else:
+                        expires = "expired and will be removed soon"
                 else:
                     if type in ('quiet', 'ban'):
                         if not removal:
@@ -1658,7 +1662,11 @@ class Bantracker(callbacks.Plugin):
 
         # reply with the bans ids that were correctly set.
         if banset:
-            irc.reply("%s set to expire." % ', '.join(banset))
+            try:
+                time = 'after ' + timeElapsed(duration)
+            except ValueError:
+                time = 'soon'
+            irc.reply("%s will be removed %s." % (utils.str.format('%L', banset), time))
 
     duration = wrap(duration, [optional('something'), optional('text')])
 
diff --git a/Bantracker/test.py b/Bantracker/test.py
index a2dfaa4..f0bd5c4 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -129,31 +129,34 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.feedBan('asd!*@*')
         self.assertResponse('comment 1', 'No comments recorded for ban 1')
         self.assertResponse('comment 1 this is a test',
-                            'The operation succeeded.')
+                            'Comment added.')
         self.assertRegexp('comment 1', 'test: this is a test$')
         self.assertResponse('comment 1 this is a test, another test',
-                            'The operation succeeded.')
+                            'Comment added.')
         self.feedBan('nick', mode='k')
         self.assertResponse('comment 2 this is a kick, 2week',
-                            'The operation succeeded.')
+                            "Failed to set duration time on 2 (not a ban or quiet)")
+        msg = self.irc.takeMsg()
+        self.assertEqual(msg.args[1], 'test: Comment added.')
         self.assertResponse('comment 1 not a valid, duration 2',
-                            'The operation succeeded.')
+                            'Comment added.')
 
     def testMultiComment(self):
         self.feedBan('asd!*@*')
         self.feedBan('qwe!*@*')
-        self.assertResponse('comment 1,2,3 this is a test',
+        self.assertResponse('comment 1,2,3 this is a test, 2 days',
                             "I don't know any ban with id 3.")
         msg = self.irc.takeMsg()
-        self.assertEqual(msg.args[1], "test: The operation succeeded.")
-        self.assertRegexp('comment 1,2', 'test: this is a test$')
+        self.assertEqual(msg.args[1], 
+                "test: Comment added. 1 and 2 will be removed after 2 days.")
+        self.assertRegexp('comment 1,2', 'test: this is a test, 2 days$')
         msg = self.irc.takeMsg()
-        self.assertTrue(msg.args[1].endswith("test: this is a test"))
+        self.assertTrue(msg.args[1].endswith("test: this is a test, 2 days"))
 
     def testCommentDuration(self):
         self.feedBan('asd!*@*')
         self.assertResponse('comment 1 this is a test, 1 week 10',
-                            'The operation succeeded.  1 set to expire.')
+                            'Comment added. 1 will be removed after 1 week.')
         self.assertRegexp('comment 1', 'test: this is a test, 1 week 10$')
         self.assertRegexp('duration 1', 'expires in 1 week$')
 
@@ -385,7 +388,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.feedBan('asd!*@*')
         cb.autoRemoveBans(self.irc)
         self.assertFalse(cb.managedBans)
-        self.assertNotError('duration 1 1')
+        self.assertResponse('duration 1 1', "1 will be removed soon.")
         self.assertTrue(cb.managedBans) # ban in list
         print 'waiting 2 secs ...'
         time.sleep(2)
@@ -414,10 +417,11 @@ class BantrackerTestCase(ChannelPluginTestCase):
 
     def testDurationMultiSet(self):
         self.feedBan('asd!*@*')
-        self.assertResponse('duration 1,2 10',
+        self.assertResponse('duration 1,2 10d',
                 "Failed to set duration time on 2 (unknow id)")
         msg = self.irc.takeMsg()
-        self.assertEqual(msg.args[1], "test: 1 set to expire.")
+        self.assertEqual(msg.args[1],
+                "test: 1 will be removed after 1 week and 3 days.")
 
 
     def testDurationQuiet(self):
@@ -435,7 +439,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.assertResponse('duration 1 0',
                 "Failed to set duration time on 1 (not a ban or quiet)")
         self.feedBan('$a:nick')
-        self.assertResponse('duration 2 0', '2 set to expire.')
+        self.assertResponse('duration 2 0', '2 will be removed soon.')
 
     def testDurationBadId(self):
         self.assertResponse('duration 1 0', 
@@ -530,6 +534,6 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.assertNotError('duration 1 1d')
         self.assertResponse('duration', "1 bans set to expire: 1")
         self.assertNotError('duration 2 1d')
-        self.assertResponse('duration', "2 bans set to expire: 1, 2")
+        self.assertResponse('duration', "2 bans set to expire: 1 and 2")
 
 

From 0e9261998747cc6be9d9fc7165521f2b2ec180a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Sun, 29 Jul 2012 23:53:17 -0300
Subject: [PATCH 33/40] fix plural form in @duration

---
 Bantracker/plugin.py | 2 +-
 Bantracker/test.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index ccaf1cc..313c8e7 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -1601,7 +1601,7 @@ class Bantracker(callbacks.Plugin):
         if ids is None:
             count = len(self.managedBans)
             L = [ str(item.ban.id) for item in self.managedBans ]
-            irc.reply("%s bans set to expire: %s" % (count, utils.str.format('%L', L)))
+            irc.reply(utils.str.format("%n set to expire: %L", (count, 'ban'), L))
             return
 
         if duration is not None:
diff --git a/Bantracker/test.py b/Bantracker/test.py
index f0bd5c4..615b409 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -532,7 +532,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.feedBan('asd!*@*')
         self.feedBan('qwe!*@*')
         self.assertNotError('duration 1 1d')
-        self.assertResponse('duration', "1 bans set to expire: 1")
+        self.assertResponse('duration', "1 ban set to expire: 1")
         self.assertNotError('duration 2 1d')
         self.assertResponse('duration', "2 bans set to expire: 1 and 2")
 

From 5df52f12f82c1102dd15d39ac947f87f4962bd0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Fri, 3 Aug 2012 11:46:17 -0300
Subject: [PATCH 34/40] when using zero or a negative <duration>, don't
 autoremove ban.

---
 Bantracker/plugin.py | 35 ++++++++++++++++++++++++++---------
 Bantracker/test.py   | 40 ++++++++++++++++++++++++++++++----------
 2 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 313c8e7..6d579b9 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -54,6 +54,7 @@ import supybot.conf as conf
 import supybot.ircdb as ircdb
 import supybot.schedule as schedule
 import supybot.utils as utils
+from supybot.utils.str import format as Format
 from fnmatch import fnmatch
 from collections import defaultdict
 import sqlite
@@ -116,7 +117,7 @@ def readTimeDelta(s):
         if c == ' ':
             continue
 
-        if c.isdigit():
+        if c in '+-0123456789':
             if string is None:
                 # start
                 digit, string = True, ''
@@ -146,9 +147,9 @@ def readTimeDelta(s):
     if string is None:
         raise ValueError(s)
 
-    if string.isdigit():
+    try:
         seconds += int(string)
-    else:
+    except ValueError:
         string = string.strip()
         if string:
             try:
@@ -1498,6 +1499,9 @@ class Bantracker(callbacks.Plugin):
         return L[0]
 
     def _setBanDuration(self, id, duration):
+        """Set ban for remove after <duration> time, if <duration> is negative
+        or zero, never remove the ban.
+        """
         # check if ban has already a duration time
         for idx, br in enumerate(self.managedBans):
             if id == br.ban.id:
@@ -1505,6 +1509,10 @@ class Bantracker(callbacks.Plugin):
                 del self.managedBans.shelf[idx]
                 break
         else:
+            if duration < 1:
+                # nothing to do.
+                raise Exception("ban isn't marked for removal")
+
             # ban obj ins't in self.managedBans
             try:
                 mask, channel, removal = self._getBan(id)
@@ -1527,8 +1535,9 @@ class Bantracker(callbacks.Plugin):
                 # ban not in sync it seems, shouldn't happen normally.
                 raise Exception("bans not in sync")
 
-        # add ban duration
-        self.managedBans.add(BanRemoval(ban, duration))
+        # add ban duration if is positive and non-zero
+        if duration > 0:
+            self.managedBans.add(BanRemoval(ban, duration))
 
     def comment(self, irc, msg, args, ids, kickmsg):
         """<id>[,<id> ...] [<comment>][, <duration>]
@@ -1581,12 +1590,16 @@ class Bantracker(callbacks.Plugin):
         # success reply. If duration time used, say which ones were set.
         if kickmsg:
             if banset:
+                if duration < 1:
+                    irc.reply(Format("Comment added. %L won't expire.", banset))
+                    return
+
                 try:
                     time = 'after ' + timeElapsed(duration)
                 except ValueError:
                     time = 'soon'
-                irc.reply("Comment added. %s will be removed %s." \
-                          % (utils.str.format('%L', banset), time))
+                irc.reply(Format("Comment added. %L will be removed %s.",
+                                 banset, time))
             else:
                 # only a comment
                 irc.reply("Comment added.")
@@ -1601,7 +1614,7 @@ class Bantracker(callbacks.Plugin):
         if ids is None:
             count = len(self.managedBans)
             L = [ str(item.ban.id) for item in self.managedBans ]
-            irc.reply(utils.str.format("%n set to expire: %L", (count, 'ban'), L))
+            irc.reply(Format("%n set to expire: %L", (count, 'ban'), L))
             return
 
         if duration is not None:
@@ -1662,11 +1675,15 @@ class Bantracker(callbacks.Plugin):
 
         # reply with the bans ids that were correctly set.
         if banset:
+            if duration < 1:
+                irc.reply(Format("%L won't expire.", banset))
+                return
+
             try:
                 time = 'after ' + timeElapsed(duration)
             except ValueError:
                 time = 'soon'
-            irc.reply("%s will be removed %s." % (utils.str.format('%L', banset), time))
+            irc.reply(Format("%L will be removed %s.", banset, time))
 
     duration = wrap(duration, [optional('something'), optional('text')])
 
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 615b409..0b3d32d 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -160,6 +160,18 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.assertRegexp('comment 1', 'test: this is a test, 1 week 10$')
         self.assertRegexp('duration 1', 'expires in 1 week$')
 
+    def testCommentDurationRemove(self):
+        self.feedBan('asd!*@*')
+        self.assertResponse('comment 1 this is a test, -10',
+                "Failed to set duration time on 1 (ban isn't marked for removal)")
+        msg = self.irc.takeMsg()
+        self.assertEqual(msg.args[1], 'test: Comment added.')
+        self.assertResponse('comment 1 this is a test, 10',
+                            'Comment added. 1 will be removed soon.')
+        self.assertResponse('comment 1 this is a test, -10',
+                "Comment added. 1 won't expire.")
+        self.assertRegexp('duration 1', 'never expires$')
+
     def testCommentRequest(self):
         pluginConf.request.setValue(True)
         # test bans
@@ -397,6 +409,14 @@ class BantrackerTestCase(ChannelPluginTestCase):
         msg = self.irc.takeMsg() # unban msg
         self.assertEqual(str(msg).strip(), "MODE #test -b :asd!*@*")
 
+    def testDurationRemove(self):
+        self.feedBan('asd!*@*')
+        self.assertResponse('duration 1 -1',
+                "Failed to set duration time on 1 (ban isn't marked for removal)")
+        self.assertResponse('duration 1 10', '1 will be removed soon.')
+        self.assertResponse('duration 1 -1', "1 won't expire.")
+        self.assertRegexp('duration 1', 'never expires')
+
     def testDurationMergeModes(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
@@ -405,9 +425,9 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.feedBan('asd!*@*', mode='q')
         self.feedBan('qwe!*@*', mode='q')
         self.feedBan('zxc!*@*', mode='q')
-        self.assertNotError('duration 1,2,3,4,5,6 0')
-        print 'waiting 1 secs ...'
-        time.sleep(1)
+        self.assertNotError('duration 1,2,3,4,5,6 1')
+        print 'waiting 2 secs ...'
+        time.sleep(2)
         cb.autoRemoveBans(self.irc)
         msg = self.irc.takeMsg() # unban msg
         self.assertEqual(str(msg).strip(),
@@ -427,29 +447,29 @@ class BantrackerTestCase(ChannelPluginTestCase):
     def testDurationQuiet(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*', mode='q')
-        self.assertNotError('duration 1 0')
-        print 'waiting 1 sec ...'
-        time.sleep(1)
+        self.assertNotError('duration 1 1')
+        print 'waiting 2 sec ...'
+        time.sleep(2)
         cb.autoRemoveBans(self.irc)
         msg = self.irc.takeMsg() # unban msg
         self.assertEqual(str(msg).strip(), "MODE #test -q :asd!*@*")
 
     def testDurationBadType(self):
         self.feedBan('nick', mode='k')
-        self.assertResponse('duration 1 0',
+        self.assertResponse('duration 1 1',
                 "Failed to set duration time on 1 (not a ban or quiet)")
         self.feedBan('$a:nick')
-        self.assertResponse('duration 2 0', '2 will be removed soon.')
+        self.assertResponse('duration 2 1', '2 will be removed soon.')
 
     def testDurationBadId(self):
-        self.assertResponse('duration 1 0', 
+        self.assertResponse('duration 1 1', 
                 "Failed to set duration time on 1 (unknow id)")
 
     def testDurationInactiveBan(self):
         self.feedBan('asd!*@*')
         self.irc.feedMsg(ircmsgs.unban(self.channel, 'asd!*@*', 
                                        'op!user@host.net'))
-        self.assertResponse('duration 1 0', 
+        self.assertResponse('duration 1 1', 
                 "Failed to set duration time on 1 (ban was removed)")
 
     def testDurationTimeFormat(self):

From 5002195005143450d9906edd3b7bcb619f34523d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Sat, 18 Aug 2012 11:27:50 -0300
Subject: [PATCH 35/40] ask chanserv for op when needed

---
 Bantracker/plugin.py | 62 ++++++++++++++++++++++++++++++--------------
 Bantracker/test.py   | 36 ++++++++++++++++++++++++-
 2 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 6d579b9..8edad95 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -497,7 +497,7 @@ class Bantracker(callbacks.Plugin):
        See '@list Bantracker' and '@help <command>' for commands"""
     noIgnore = True
     threaded = True
-    
+
     def __init__(self, irc):
         self.__parent = super(Bantracker, self)
         self.__parent.__init__(irc)
@@ -509,6 +509,8 @@ class Bantracker(callbacks.Plugin):
         self.nicks = {}
         self.hosts = {}
         self.bans = ircutils.IrcDict()
+        self.opped = defaultdict(lambda: False)
+        self.pendingBanremoval = {}
 
         self.thread_timer = threading.Timer(10.0, dequeue, args=(self,irc))
         self.thread_timer.start()
@@ -536,7 +538,6 @@ class Bantracker(callbacks.Plugin):
         schedule.addPeriodicEvent(lambda: self.autoRemoveBans(irc), 600,
                                   name=self.name() + '_autoremove')
 
-
     def get_nicks(self, irc):
         self.hosts.clear()
         for (channel, c) in irc.state.channels.iteritems():
@@ -892,6 +893,21 @@ class Bantracker(callbacks.Plugin):
             if not L:
                 del self.pendingReviews[None]
 
+    def getOp(self, irc, channel):
+        msg = ircmsgs.privmsg('Chanserv', "op %s %s" % (channel, irc.nick))
+        irc.queueMsg(msg)
+
+    def removeBans(self, irc, channel, modes, deop=False):
+        # send unban messages, with 4 modes max each.
+        maxModes = 4
+        if deop:
+            modes.append(('-o', irc.nick))
+        for i in range(len(modes) / maxModes + 1):
+            L = modes[i * maxModes : (i + 1) * maxModes]
+            if L:
+                msg = ircmsgs.mode(channel, ircutils.joinModes(L))
+                irc.queueMsg(msg)
+
     def autoRemoveBans(self, irc):
         modedict = { 'quiet': '-q', 'ban': '-b' }
         unbandict = defaultdict(list)
@@ -907,14 +923,12 @@ class Bantracker(callbacks.Plugin):
                                                       mask,
                                                       channel)
             unbandict[channel].append((modedict[type], mask))
-        # send unban messages, with 4 modes max each.
-        maxModes = 4
         for channel, modes in unbandict.iteritems():
-            for i in range(len(modes) / maxModes + 1):
-                L = modes[i * maxModes : (i + 1) * maxModes]
-                if L:
-                    msg = ircmsgs.mode(channel, ircutils.joinModes(L))
-                    irc.queueMsg(msg)
+            if not self.opped[channel]:
+                self.pendingBanremoval[channel] = modes
+                self.getOp(irc, channel)
+            else:
+                self.removeBans(irc, channel, modes)
 
         # notify about bans soon to expire
         for ban in self.managedBans.getExpired(600):
@@ -1076,29 +1090,37 @@ class Bantracker(callbacks.Plugin):
                         ' '.join(msg.args[2:])))
             modes = ircutils.separateModes(msg.args[1:])
             for param in modes:
-                realname = ''
                 mode = param[0]
-                mask = ''
-                comment=None
-                if param[0] not in ("+b", "-b", "+q", "-q"):
+                # op stuff
+                if mode[1] == "o":
+                    if ircutils.nickEqual(irc.nick, param[1]):
+                        opped = self.opped[channel] = mode[0] == '+'
+                        if opped == True:
+                            # check if we have bans to remove
+                            if channel in self.pendingBanremoval:
+                                modes = self.pendingBanremoval.pop(channel)
+                                self.removeBans(irc, channel, modes, deop=True)
                     continue
+
+                # channel mask stuff
+                realname = mask = ''
+                comment = None
+                if mode[1] not in "bq":
+                    continue
+
                 mask = param[1]
                 if mask.startswith("$r:"):
                     mask = mask[3:]
                     realname = ' (realname)'
 
-                if param[0][1] == 'q':
+                if mode[1] == 'q':
                     mask = '%' + mask
 
-                if param[0] in ('+b', '+q'):
+                if mode[0] == '+':
                     comment = self.getHostFromBan(irc, msg, mask)
                     ban = self.doKickban(irc, channel, msg.prefix, mask + realname, 
                                          extra_comment=comment)
-                    if False:
-                        # FIXME ban autoremove should be set with a command, but I'm 
-                        # lazy.
-                        self.managedBans.add(BanRemoval(ban, 1))
-                elif param[0] in ('-b', '-q'):
+                elif mode[0] == '-':
                     self.doUnban(irc,channel, msg.nick, mask + realname)
 
     def getHostFromBan(self, irc, msg, mask):
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 0b3d32d..6322f00 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -124,6 +124,16 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.irc.feedMsg(ban)
         return ban
 
+    def op(self):
+        msg = ircmsgs.mode(self.channel, ('+o', self.irc.nick),
+                    'Chanserv!service@service')
+        self.irc.feedMsg(msg)
+
+    def deop(self):
+        msg = ircmsgs.mode(self.channel, ('-o', self.irc.nick),
+                    'Chanserv!service@service')
+        self.irc.feedMsg(msg)
+
     def testComment(self):
         self.assertResponse('comment 1', "I don't know any ban with id 1.")
         self.feedBan('asd!*@*')
@@ -396,6 +406,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.assertEqual((1, '#test', 'troll', 'op'), fetch[0])
 
     def testDuration(self):
+        self.op()
         cb = self.getCallback()
         self.feedBan('asd!*@*')
         cb.autoRemoveBans(self.irc)
@@ -418,6 +429,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.assertRegexp('duration 1', 'never expires')
 
     def testDurationMergeModes(self):
+        self.op()
         cb = self.getCallback()
         self.feedBan('asd!*@*')
         self.feedBan('qwe!*@*')
@@ -443,8 +455,8 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.assertEqual(msg.args[1],
                 "test: 1 will be removed after 1 week and 3 days.")
 
-
     def testDurationQuiet(self):
+        self.op()
         cb = self.getCallback()
         self.feedBan('asd!*@*', mode='q')
         self.assertNotError('duration 1 1')
@@ -556,4 +568,26 @@ class BantrackerTestCase(ChannelPluginTestCase):
         self.assertNotError('duration 2 1d')
         self.assertResponse('duration', "2 bans set to expire: 1 and 2")
 
+    def testOpTrack(self):
+        cb = self.getCallback()
+        self.assertEqual(cb.opped['#test'], False)
+        self.op()
+        self.assertEqual(cb.opped['#test'], True)
+        self.deop()
+        self.assertEqual(cb.opped['#test'], False)
+
+    def testOpDuration(self):
+        cb = self.getCallback()
+        self.feedBan('asd!*@*')
+        self.assertResponse('duration 1 1', "1 will be removed soon.")
+        print 'waiting 2 secs ...'
+        time.sleep(2)
+        cb.autoRemoveBans(self.irc)
+        msg = self.irc.takeMsg() # op msg
+        self.assertEqual(str(msg).strip(), "PRIVMSG Chanserv :op #test test")
+        self.op()
+        msg = self.irc.takeMsg() # unban msg
+        self.assertEqual(str(msg).strip(), "MODE #test -bo asd!*@* :test")
+
+
 

From 77748900274409e92f558abd755220807a97a936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Thu, 23 Aug 2012 07:21:58 -0300
Subject: [PATCH 36/40] Notification message for when bot fails to get op

---
 Bantracker/plugin.py | 18 ++++++++++++++++--
 Bantracker/test.py   | 28 +++++++++++++++++++++++++---
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 8edad95..cd43c4c 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -534,9 +534,9 @@ class Bantracker(callbacks.Plugin):
 
         # add our scheduled events for check bans for reviews or removal
         schedule.addPeriodicEvent(lambda: self.reviewBans(irc), 60*60,
-                                  name=self.name() + '_review')
+                                  'Bantracker_review')
         schedule.addPeriodicEvent(lambda: self.autoRemoveBans(irc), 600,
-                                  name=self.name() + '_autoremove')
+                                  'Bantracker_autoremove')
 
     def get_nicks(self, irc):
         self.hosts.clear()
@@ -896,6 +896,19 @@ class Bantracker(callbacks.Plugin):
     def getOp(self, irc, channel):
         msg = ircmsgs.privmsg('Chanserv', "op %s %s" % (channel, irc.nick))
         irc.queueMsg(msg)
+        schedule.addEvent(lambda: self._getOpFail(irc, channel), 60,
+                          'Bantracker_getop_%s' % channel)
+
+    def _getOpFail(self, irc, channel):
+        for c in self.registryValue('autoremove.notify.channels', channel):
+            notice = ircmsgs.notice(c, "Failed to get op in %s" % channel)
+            irc.queueMsg(notice)
+
+    def _getOpOK(self, channel):
+        try:
+            schedule.removeEvent('Bantracker_getop_%s' % channel)
+        except KeyError:
+            pass
 
     def removeBans(self, irc, channel, modes, deop=False):
         # send unban messages, with 4 modes max each.
@@ -1096,6 +1109,7 @@ class Bantracker(callbacks.Plugin):
                     if ircutils.nickEqual(irc.nick, param[1]):
                         opped = self.opped[channel] = mode[0] == '+'
                         if opped == True:
+                            self._getOpOK(channel)
                             # check if we have bans to remove
                             if channel in self.pendingBanremoval:
                                 modes = self.pendingBanremoval.pop(channel)
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 6322f00..6799e6e 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -507,7 +507,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
         self.assertNotError('duration 1 300')
-        pluginConf.autoremove.notify.channels().append('#test')
+        pluginConf.autoremove.notify.channels.set('#test')
         try:
             cb.autoRemoveBans(self.irc)
             msg = self.irc.takeMsg()
@@ -518,7 +518,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
             cb.autoRemoveBans(self.irc)
             self.assertFalse(self.irc.takeMsg())
         finally:
-            del pluginConf.autoremove.notify.channels()[:]
+            pluginConf.autoremove.notify.channels.set('')
 
     def testAutoremoveStore(self):
         self.feedBan('asd!*@*')
@@ -579,7 +579,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
     def testOpDuration(self):
         cb = self.getCallback()
         self.feedBan('asd!*@*')
-        self.assertResponse('duration 1 1', "1 will be removed soon.")
+        self.assertNotError('duration 1 1')
         print 'waiting 2 secs ...'
         time.sleep(2)
         cb.autoRemoveBans(self.irc)
@@ -589,5 +589,27 @@ class BantrackerTestCase(ChannelPluginTestCase):
         msg = self.irc.takeMsg() # unban msg
         self.assertEqual(str(msg).strip(), "MODE #test -bo asd!*@* :test")
 
+    def testOpFail(self):
+        import supybot.drivers as drivers
+        import supybot.schedule as schedule
+
+        pluginConf.autoremove.notify.channels.set('#test')
+        try:
+            cb = self.getCallback()
+            self.feedBan('asd!*@*')
+            self.assertNotError('duration 1 1')
+            print 'waiting 4 secs ...'
+            time.sleep(2)
+            cb.autoRemoveBans(self.irc)
+            msg = self.irc.takeMsg() # op msg
+            self.assertEqual(str(msg).strip(), "PRIVMSG Chanserv :op #test test")
+            schedule.rescheduleEvent('Bantracker_getop_#test', 1)
+            time.sleep(2)
+            drivers.run()
+            msg = self.irc.takeMsg() # fail msg
+            self.assertEqual(str(msg).strip(),
+                    "NOTICE #test :Failed to get op in #test")
+        finally:
+            pluginConf.autoremove.notify.channels.set('')
 
 

From 772a04a32943149c92cdd6a6515d9ed05dcd734f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Thu, 23 Aug 2012 07:50:39 -0300
Subject: [PATCH 37/40] Don't deop after removing bans If bot fails to get op,
 and is opped later.

---
 Bantracker/plugin.py | 7 ++++---
 Bantracker/test.py   | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index cd43c4c..5492182 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -907,8 +907,9 @@ class Bantracker(callbacks.Plugin):
     def _getOpOK(self, channel):
         try:
             schedule.removeEvent('Bantracker_getop_%s' % channel)
+            return True
         except KeyError:
-            pass
+            return False
 
     def removeBans(self, irc, channel, modes, deop=False):
         # send unban messages, with 4 modes max each.
@@ -1109,11 +1110,11 @@ class Bantracker(callbacks.Plugin):
                     if ircutils.nickEqual(irc.nick, param[1]):
                         opped = self.opped[channel] = mode[0] == '+'
                         if opped == True:
-                            self._getOpOK(channel)
+                            opped_ok = self._getOpOK(channel)
                             # check if we have bans to remove
                             if channel in self.pendingBanremoval:
                                 modes = self.pendingBanremoval.pop(channel)
-                                self.removeBans(irc, channel, modes, deop=True)
+                                self.removeBans(irc, channel, modes, deop=opped_ok)
                     continue
 
                 # channel mask stuff
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 6799e6e..3986f07 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -609,6 +609,9 @@ class BantrackerTestCase(ChannelPluginTestCase):
             msg = self.irc.takeMsg() # fail msg
             self.assertEqual(str(msg).strip(),
                     "NOTICE #test :Failed to get op in #test")
+            self.op()
+            msg = self.irc.takeMsg() # unban msg
+            self.assertEqual(str(msg).strip(), "MODE #test -b :asd!*@*")
         finally:
             pluginConf.autoremove.notify.channels.set('')
 

From 4c0dfd1b84e525727b071bdcb06809b3b45b0021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Sat, 25 Aug 2012 21:24:20 -0300
Subject: [PATCH 38/40] some refactoring

---
 Bantracker/plugin.py | 36 ++++++++++++++++++++++++------------
 Bantracker/test.py   |  1 +
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 5492182..9945094 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -411,9 +411,15 @@ class BanRemoval(object):
         self.expires = expires
         self.notified = False
 
+    def __getattr__(self, attr):
+        return getattr(self.ban, attr)
+
+    def timeLeft(self):
+        return (self.when + self.expires) - nowSeconds()
+
     def expired(self, offset=0):
         """Check if the ban did expire."""
-        if (nowSeconds() + offset) > (self.ban.when + self.expires):
+        if (nowSeconds() + offset) > (self.when + self.expires):
             return True
         return False
 
@@ -471,7 +477,7 @@ class BanStore(object):
     def sort(self):
         """Sort bans by expire date"""
         def key(x):
-            return x.ban.when + x.expires
+            return x.when + x.expires
 
         self.shelf.sort(key=key, reverse=True)
 
@@ -491,6 +497,12 @@ class BanStore(object):
                     yield ban
         return generator()
 
+# opStatus stores in which channels are we currently opped. We define it here
+# in a try-except block so it survives if the plugin is reloaded.
+try:
+    opStatus
+except:
+    opStatus = defaultdict(lambda: False)
 
 class Bantracker(callbacks.Plugin):
     """Plugin to manage bans.
@@ -509,7 +521,7 @@ class Bantracker(callbacks.Plugin):
         self.nicks = {}
         self.hosts = {}
         self.bans = ircutils.IrcDict()
-        self.opped = defaultdict(lambda: False)
+        self.opped = opStatus
         self.pendingBanremoval = {}
 
         self.thread_timer = threading.Timer(10.0, dequeue, args=(self,irc))
@@ -926,14 +938,14 @@ class Bantracker(callbacks.Plugin):
         modedict = { 'quiet': '-q', 'ban': '-b' }
         unbandict = defaultdict(list)
         for ban in self.managedBans.popExpired():
-            channel, mask, type = ban.ban.channel, ban.ban.mask, ban.ban.type
+            channel, mask, type = ban.channel, ban.mask, ban.type
             if not self.registryValue('autoremove', channel):
                 continue
 
             if type == 'quiet':
                 mask = mask[1:]
             self.log.info("%s [%s] %s in %s expired", type,
-                                                      ban.ban.id,
+                                                      ban.id,
                                                       mask,
                                                       channel)
             unbandict[channel].append((modedict[type], mask))
@@ -949,19 +961,19 @@ class Bantracker(callbacks.Plugin):
             if ban.notified:
                 continue
 
-            channel = ban.ban.channel
+            channel = ban.channel
             if not self.registryValue('autoremove', channel) \
                     or not self.registryValue('autoremove.notify', channel):
                 continue
 
-            type, mask = ban.ban.type, ban.ban.mask
+            type, mask = ban.type, ban.mask
             if type == 'quiet':
                 mask = mask[1:]
             for c in self.registryValue('autoremove.notify.channels', channel):
                 notice = ircmsgs.notice(c, "%s %s%s%s %s in %s will expire in a few minutes." \
                         % (type,
                            ircutils.mircColor('[', 'light green'),
-                           ircutils.bold(ban.ban.id),
+                           ircutils.bold(ban.id),
                            ircutils.mircColor(']', 'light green'),
                            ircutils.mircColor(mask, 'teal'),
                            ircutils.mircColor(channel, 'teal')))
@@ -1541,7 +1553,7 @@ class Bantracker(callbacks.Plugin):
         """
         # check if ban has already a duration time
         for idx, br in enumerate(self.managedBans):
-            if id == br.ban.id:
+            if id == br.id:
                 ban = br.ban
                 del self.managedBans.shelf[idx]
                 break
@@ -1650,7 +1662,7 @@ class Bantracker(callbacks.Plugin):
         """
         if ids is None:
             count = len(self.managedBans)
-            L = [ str(item.ban.id) for item in self.managedBans ]
+            L = [ str(item.id) for item in self.managedBans ]
             irc.reply(Format("%n set to expire: %L", (count, 'ban'), L))
             return
 
@@ -1683,14 +1695,14 @@ class Bantracker(callbacks.Plugin):
                 if type == 'quiet':
                     mask = mask[1:]
                 for br in self.managedBans:
-                    if br.ban.id == id:
+                    if br.id == id:
                         break
                 else:
                     br = None
 
                 expires = None
                 if br:
-                    expires = (br.ban.when + br.expires) - nowSeconds()
+                    expires = br.timeLeft()
                     if expires > 0:
                         try:
                             expires = "expires in %s" % timeElapsed(expires)
diff --git a/Bantracker/test.py b/Bantracker/test.py
index 3986f07..292e4e5 100644
--- a/Bantracker/test.py
+++ b/Bantracker/test.py
@@ -57,6 +57,7 @@ class BantrackerTestCase(ChannelPluginTestCase):
             else:
                 return f(*args, **kwargs)
         cb.check_auth = test_check_auth
+        cb.opped.clear()
 
     def setDb(self):
         import sqlite, os

From 48f382917b7eeed2db18b5726cb21aca86d6c698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Mon, 27 Aug 2012 13:59:30 -0300
Subject: [PATCH 39/40] don't request op twice

---
 Bantracker/plugin.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 9945094..d09b220 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -906,10 +906,12 @@ class Bantracker(callbacks.Plugin):
                 del self.pendingReviews[None]
 
     def getOp(self, irc, channel):
-        msg = ircmsgs.privmsg('Chanserv', "op %s %s" % (channel, irc.nick))
-        irc.queueMsg(msg)
-        schedule.addEvent(lambda: self._getOpFail(irc, channel), 60,
-                          'Bantracker_getop_%s' % channel)
+        name = 'Bantracker_getop_%s' % channel
+        # check if we aren't already waiting for op
+        if name not in schedule.schedule.events:
+            msg = ircmsgs.privmsg('Chanserv', "op %s %s" % (channel, irc.nick))
+            irc.queueMsg(msg)
+            schedule.addEvent(lambda: self._getOpFail(irc, channel), 60, name)
 
     def _getOpFail(self, irc, channel):
         for c in self.registryValue('autoremove.notify.channels', channel):

From a1405ef0347433dfa5f01af2191308f90d360184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= <lambdae2@gmail.com>
Date: Thu, 6 Sep 2012 21:05:27 -0300
Subject: [PATCH 40/40] revert previous commit and really fix the notification
 message when opping fails.

---
 Bantracker/plugin.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index d09b220..9ec3c9c 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -906,12 +906,10 @@ class Bantracker(callbacks.Plugin):
                 del self.pendingReviews[None]
 
     def getOp(self, irc, channel):
-        name = 'Bantracker_getop_%s' % channel
-        # check if we aren't already waiting for op
-        if name not in schedule.schedule.events:
-            msg = ircmsgs.privmsg('Chanserv', "op %s %s" % (channel, irc.nick))
-            irc.queueMsg(msg)
-            schedule.addEvent(lambda: self._getOpFail(irc, channel), 60, name)
+        msg = ircmsgs.privmsg('Chanserv', "op %s %s" % (channel, irc.nick))
+        irc.queueMsg(msg)
+        schedule.addEvent(lambda: self._getOpFail(irc, channel), time.time() + 60,
+                          'Bantracker_getop_%s' % channel)
 
     def _getOpFail(self, irc, channel):
         for c in self.registryValue('autoremove.notify.channels', channel):