blameq: Rename fish variable to fishpond

[irc.git] / commands.py

diff --git a/commands.py b/commands.py
index 6c5653dc9dd42119b80d1ea6a784007e762a1205..1d29fd7f28fa0b39f13c6fe1d250c47e1fa65144 100755 (executable)
--- a/commands.py
+++ b/commands.py
@@ -54,10 +54,15 @@ def infoq(bot, cmd, nick, conn, public, karma):
         bot.owner, len(karma.keys())))
 
 class FishPond:
-    DoS=0
-    quotatime=0
-    last=""
-    last_cfg=None
+    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):
@@ -99,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
@@ -141,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!")
@@ -320,7 +323,7 @@ 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,cfgs):
+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]
@@ -331,11 +334,11 @@ def blameq(bot,cmd,nick,conn,public,fish,cfgs):
     cwhat=' '.join(clist[2:])
     kindsfile = "fish?"
     if clist[1]=="#last":
-       if fish.last_cfg is None:
+       if fishpond.last_cfg is None:
            bot.automsg(public,nick,"Nothing")
            return
-       xdb,xdbk,kindsfile = fish.last_cfg[7]
-       ans=__getcommits(xdb,xdbk,fish.last)
+       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":