new slash from rejs

[irc.git] / Servus-chiark.py

diff --git a/Servus-chiark.py b/Servus-chiark.py
index ec35a7ff039bacbd071a1a9ca5c5902e93d6b333..81f8076dfd7ad925c42946b4715a833797cae818 100644 (file)
--- a/Servus-chiark.py
+++ b/Servus-chiark.py
@@ -103,7 +103,7 @@ def fishq(bot, cmd, nick, conn, public,f):
                     
 # Karma implementation
 import cPickle
-karmafilename = "chiark-karma"
+karmafilename = "chiark-karma-"+channel
 # load the karma db
 try:
     f = open(karmafilename, "r")
@@ -134,14 +134,6 @@ def quit(bot,cmd,nick,conn,public):
 def reload(bot,cmd,nick,conn,public):
     c.reloadq(bot,cmd,nick,conn,public)
 
-#The game...
-class game:
-       trigger="Servus"
-       grace=time.time()
-       minlose=24*60*60 #1 day
-       maxlose=14*minlose #2 weeks
-       losetime=time.time()+300000
-
 # initialise the urldb on startup
 urldb={}
 lastexp=time.time()
@@ -178,7 +170,6 @@ commands = {"karma": (c.karmaq,karmadb),
            "nws": (c.nsfwq,urldb),
            "units": c.unitq,
            "help": c.helpq,
-#          "game": (c.gameq,game),
             "say": c.sayq,
             "do": c.doq, 
             "twit": (c.twitterq,twitapi) }
@@ -225,11 +216,3 @@ def command(bot, cmd, nick, conn, public):
            e(bot,cmd,nick,conn,public)
        else:
            e[0](bot,cmd,nick,conn,public,*e[1:])
-#    elif public:
-#        if cmd.find("GAME")!=-1: #someone else lost
-#          grace.grace=time.time()+60*20
-#      elif cmd.find(game.trigger)!=-1 and len(game.trigger)>2: #we lost!
-#          c.gameq(bot,"pad "+game.trigger,bot.owner,conn,False,game)
-#      elif time.time()>game.losetime: #we randomly lost, take new trigger
-#          c.gameq(bot,cmd,bot.owner,conn,False,game)
-#