X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=blobdiff_plain;f=commands.py;h=1d29fd7f28fa0b39f13c6fe1d250c47e1fa65144;hb=b2b8e312bcdcc7a65e57f3db168983e328a8e06a;hp=adcd273af76e4d9854b168c61c18090c9c8bbc8d;hpb=59af32a7bae607b92fe9652953949c88ed01ec24;p=irc.git

diff --git a/commands.py b/commands.py
index adcd273..1d29fd7 100755
--- a/commands.py
+++ b/commands.py
@@ -53,6 +53,17 @@ def infoq(bot, cmd, nick, conn, public, karma):
 	(bot.revision.split()[1], bot.channel, conn.get_nickname(),
 	 bot.owner, len(karma.keys())))
 
+class FishPond:
+    def __init__(fishpond):
+	fishpond.last=""
+	fishpond.last_cfg=None
+	fishpond.DoS=0
+	fishpond.quotatime=0
+
+    def note_last(fishpond, msg, cfg):
+	fishpond.last=msg
+	fishpond.last_cfg=cfg
+
 # Check on fish stocks
 def fish_quota(pond):
     if pond.DoS:
@@ -93,8 +104,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
@@ -135,8 +145,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!")
@@ -314,14 +323,22 @@ 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,tdb,tdbk,fdb,fdbk,sdb,sdbk):
+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]
     clist=cmd.split()
     if len(clist) < 2:
 	bot.automsg(public,nick,"Who or what do you want to blame?")
 	return
     cwhat=' '.join(clist[2:])
+    kindsfile = "fish?"
     if clist[1]=="#last":
-	ans=__getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,fish.last)
+	if fishpond.last_cfg is None:
+	    bot.automsg(public,nick,"Nothing")
+	    return
+	xdb,xdbk,kindsfile = fishpond.last_cfg[7]
+	ans=__getcommits(xdb,xdbk,fishpond.last)
     elif clist[1]=="#trouts" or clist[1]=="#trout":
 	ans=__getcommits(tdb,tdbk,cwhat)
     elif clist[1]=="#flirts" or clist[1]=="#flirt":
@@ -337,7 +354,7 @@ def blameq(bot,cmd,nick,conn,public,fish,tdb,tdbk,fdb,fdbk,sdb,sdbk):
 	if len(ans[0])==1:
 	    bot.automsg(public,nick,ans[0])
 	else:
-	    bot.automsg(public,nick,"Modified %s: %s" % (ans[0][2].isoformat(),ans[0][1]))
+	    bot.automsg(public,nick,"Modified %s %s: %s" % (kindsfile, ans[0][2].isoformat(),ans[0][1]))
     elif len(ans)>4:
 	bot.automsg(public,nick,"I found %d matches, which is too many. Please be more specific!" % (len(ans)) )
     else:
@@ -345,7 +362,7 @@ def blameq(bot,cmd,nick,conn,public,fish,tdb,tdbk,fdb,fdbk,sdb,sdbk):
 	    if len(a)==1:
 	        bot.automsg(public,nick,a)
 	    else:
-	        bot.automsg(public,nick,"'%s' modified on %s: %s" % (a[0],a[2].isoformat(),a[1]))
+	        bot.automsg(public,nick,"%s '%s' modified on %s: %s" % (kindsfile, a[0],a[2].isoformat(),a[1]))
 
 ### say to msg/channel            
 def sayq(bot, cmd, nick, conn, public):