FishPond: introduce new class and use in Servus-chiark

[irc.git] / commands.py

diff --git a/commands.py b/commands.py
index 8cc34f03ac6f4dc4997b4f435523842bc7b40601..6c5653dc9dd42119b80d1ea6a784007e762a1205 100755 (executable)
--- a/commands.py
+++ b/commands.py
@@ -53,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:
@@ -323,6 +329,7 @@ def blameq(bot,cmd,nick,conn,public,fish,cfgs):
        bot.automsg(public,nick,"Who or what do you want to blame?")
        return
     cwhat=' '.join(clist[2:])
+    kindsfile = "fish?"
     if clist[1]=="#last":
        if fish.last_cfg is None:
            bot.automsg(public,nick,"Nothing")
@@ -344,7 +351,7 @@ def blameq(bot,cmd,nick,conn,public,fish,cfgs):
        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:
@@ -352,7 +359,7 @@ def blameq(bot,cmd,nick,conn,public,fish,cfgs):
            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):