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

diff --git a/commands.py b/commands.py
index 698bfdb..512b4f7 100755
--- a/commands.py
+++ b/commands.py
@@ -53,6 +53,16 @@ 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.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:
@@ -93,7 +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.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
@@ -134,7 +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.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!")
@@ -312,14 +322,30 @@ 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)
+        try:
+            n = abs(int(clist[2]))-1
+            if n < 0: raise ValueError
+        except IndexError: n = 0
+        except ValueError:
+            bot.automsg(public,nick,"Huh?")
+            return
+        try: lmsg, lcfg = fishpond.last[n]
+        except IndexError:
+	    bot.automsg(public,nick,"Nothing")
+	    return
+	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":
@@ -335,7 +361,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:
@@ -343,7 +369,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):
@@ -412,7 +438,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)
@@ -545,12 +571,11 @@ def getTweet(urlstring,twitapi,inclusion=False,recurlvl=0):
         tweeter_name = tweeter_name + " RTing " + status.user.name #.encode('UTF-8', 'replace')
     tweetText = status.full_text
     if status.media:
-        replacements = defaultdict( list )
+        replacements = defaultdict(list)
         for medium in status.media:
             replacements[medium.url].append(medium.media_url_https)
 
         for k,v in replacements.items():
-
             v = [re.sub(r"/tweet_video_thumb/([\w\-]+).jpg", r"/tweet_video/\1.mp4", link) for link in v]
             if len(v) > 1:
                 replacementstring = "[" +  " ; ".join(v) +"]"