blame: Remember last 10 trouts, not just 1

[irc.git] / commands.py

diff --git a/commands.py b/commands.py
index 02f23034a2428f5f45aa4fb1ac9cc69b4e1ff755..d6ba5302dee49573d96ae9013fae6526a4c206a8 100755 (executable)
--- a/commands.py
+++ b/commands.py
@@ -55,11 +55,14 @@ def infoq(bot, cmd, nick, conn, public, karma):
 
 class FishPond:
     def __init__(fishpond):
-       fishpond.last=""
-       fishpond.last_cfg=None
+       fishpond.last=[]
        fishpond.DoS=0
        fishpond.quotatime=0
 
+    def note_last(fishpond, msg, cfg):
+       fishpond.last.insert(0,(msg,cfg))
+       fishpond.last = fishpond.last[0:10]
+
 # Check on fish stocks
 def fish_quota(pond):
     if pond.DoS:
@@ -100,8 +103,7 @@ def troutq(bot, cmd, nick, conn, public, cfg):
        return
     me = bot.connection.get_nickname()
     trout_msg = random.choice(fishlist)
-    fishpond.last=trout_msg
-    fishpond.last_cfg=cfg
+    fishpond.note_last(trout_msg,cfg)
     # The bot won't trout or flirt with itself;
     if irc_lower(me) == irc_lower(target) or irc_lower(target) in synonyms:
         target = nick
@@ -142,8 +144,7 @@ def slashq(bot, cmd, nick, conn, public, cfg):
        return
     me = bot.connection.get_nickname()
     slash_msg = random.choice(fishlist)
-    fishpond.last=slash_msg
-    fishpond.last_cfg=cfg
+    fishpond.note_last(slash_msg,cfg)
     # The bot won't slash people with themselves
     if irc_lower(who[0]) == irc_lower(who[1]):
        conn.notice(nick, "oooooh no missus!")
@@ -321,7 +322,7 @@ def __getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,what):
     sans=__getcommits(sdb,sdbk,what)
     return tans+fans+sans
 
-def blameq(bot,cmd,nick,conn,public,fish,cfgs):
+def blameq(bot,cmd,nick,conn,public,fishpond,cfgs):
     tdb,tdbk,x = cfgs[0][7] # urgh, magic, to support magic knowledge below
     fdb,fdbk,x = cfgs[1][7]
     sdb,sdbk,x = cfgs[2][7]
@@ -332,11 +333,12 @@ def blameq(bot,cmd,nick,conn,public,fish,cfgs):
     cwhat=' '.join(clist[2:])
     kindsfile = "fish?"
     if clist[1]=="#last":
-       if fish.last_cfg is None:
+        try: lmsg, lcfg = fishpond.last[0]
+        except IndexError:
            bot.automsg(public,nick,"Nothing")
            return
-       xdb,xdbk,kindsfile = fish.last_cfg[7]
-       ans=__getcommits(xdb,xdbk,fish.last)
+       xdb,xdbk,kindsfile = lcfg[7]
+       ans=__getcommits(xdb,xdbk,lmsg)
     elif clist[1]=="#trouts" or clist[1]=="#trout":
        ans=__getcommits(tdb,tdbk,cwhat)
     elif clist[1]=="#flirts" or clist[1]=="#flirt":