X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=blobdiff_plain;f=commands.py;h=8cc34f03ac6f4dc4997b4f435523842bc7b40601;hb=fe2636ef4ab3ee35896aefab0595ef09370c1aa6;hp=698bfdbe64c7161b83afba284a580203bfe2ff20;hpb=af3b399b7517466d27bb1487fc7a45f3f92d7bcf;p=irc.git

diff --git a/commands.py b/commands.py
index 698bfdb..8cc34f0 100755
--- a/commands.py
+++ b/commands.py
@@ -94,6 +94,7 @@ def troutq(bot, cmd, nick, conn, public, cfg):
     me = bot.connection.get_nickname()
     trout_msg = random.choice(fishlist)
     fishpond.last=trout_msg
+    fishpond.last_cfg=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,6 +136,7 @@ def slashq(bot, cmd, nick, conn, public, cfg):
     me = bot.connection.get_nickname()
     slash_msg = random.choice(fishlist)
     fishpond.last=slash_msg
+    fishpond.last_cfg=cfg
     # The bot won't slash people with themselves
     if irc_lower(who[0]) == irc_lower(who[1]):
 	conn.notice(nick, "oooooh no missus!")
@@ -312,14 +314,21 @@ 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,fish,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:])
     if clist[1]=="#last":
-	ans=__getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,fish.last)
+	if fish.last_cfg is None:
+	    bot.automsg(public,nick,"Nothing")
+	    return
+	xdb,xdbk,kindsfile = fish.last_cfg[7]
+	ans=__getcommits(xdb,xdbk,fish.last)
     elif clist[1]=="#trouts" or clist[1]=="#trout":
 	ans=__getcommits(tdb,tdbk,cwhat)
     elif clist[1]=="#flirts" or clist[1]=="#flirt":
@@ -412,7 +421,7 @@ class UrlLog:
         n=time.localtime(time.time())
         s="%02d:%02d" % (self.localfirst.tm_hour,self.localfirst.tm_min)
         if n.tm_yday != self.localfirst.tm_yday:
-            s+=time.strftime(" on %d %B", n)
+            s+=time.strftime(" on %d %B", self.localfirst)
         return s
     def urltype(self):
         z=min(len(urlinfos)-1, self.count-1)