FishPond: introduce new class and use in Servus-chiark

[irc.git] / commands.py

diff --git a/commands.py b/commands.py
index 3442dce842dff362274246b8a877bf0a56851128..6c5653dc9dd42119b80d1ea6a784007e762a1205 100755 (executable)
--- a/commands.py
+++ b/commands.py
@@ -1,8 +1,13 @@
 # Part of Acrobat.
-import string, cPickle, random, urllib, sys, time, re, os, twitter, subprocess, datetime, urlparse
+import string, cPickle, random, urllib, sys, time, re, os, twitter, subprocess, datetime, urlparse, hashlib
 from collections import defaultdict
 from irclib import irc_lower, nm_to_n
 
+try:
+    from blame_filter import bfd
+except ImportError:
+    bfd = None
+
 # query karma
 def karmaq(bot, cmd, nick, conn, public, karma):
     try:
@@ -48,6 +53,12 @@ def infoq(bot, cmd, nick, conn, public, karma):
        (bot.revision.split()[1], bot.channel, conn.get_nickname(),
         bot.owner, len(karma.keys())))
 
+class FishPond:
+    DoS=0
+    quotatime=0
+    last=""
+    last_cfg=None
+
 # Check on fish stocks
 def fish_quota(pond):
     if pond.DoS:
@@ -89,6 +100,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
@@ -130,6 +142,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!")
@@ -279,8 +292,12 @@ def __getcommitinfo(commit):
        return(err)
 
     ts,mes=out.split('|')
+    mes=mes.strip()
+    md5mes=hashlib.md5(mes).hexdigest()
+    if bfd and md5mes in bfd:
+        mes=bfd[md5mes]
     when=datetime.date.fromtimestamp(float(ts))
-    return mes.strip(), when
+    return mes, when
 
 ###Return an array of commit messages and timestamps for lines in db that match what
 def __getcommits(db,keys,what):
@@ -303,14 +320,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,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:])
+    kindsfile = "fish?"
     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":
@@ -326,7 +351,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:
@@ -334,7 +359,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):
@@ -401,9 +426,9 @@ class UrlLog:
         return max(self.lastseen,self.lastasked)
     def firstmen(self):
         n=time.localtime(time.time())
-        s="%d:%d" % (self.localfirst.tm_hour,self.localfirst.tm_min)
+        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)
@@ -517,9 +542,9 @@ def getTweet(urlstring,twitapi,inclusion=False,recurlvl=0):
   unobfuscate_urls=True
   expand_included_tweets=True
   stringsout=[]
-  
-  parts = string.split(urlstring,'/')
-  tweetID = parts[-1]
+
+  path = urlparse.urlparse(urlstring).path
+  tweetID = path.split('/')[-1]
   try:
     status = twitapi.GetStatus(tweetID)
     if status == {}: