X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=blobdiff_plain;f=Servus-chiark.py;h=81f8076dfd7ad925c42946b4715a833797cae818;hb=76b48de32125340f587ad494363fc2aaec6d4d1f;hp=0af2dbce4424bc423676a1581ed22e6ba35b1bf3;hpb=0d67a17e46e92210a1d8c5d90b10be20211577a9;p=irc.git

diff --git a/Servus-chiark.py b/Servus-chiark.py
index 0af2dbc..81f8076 100644
--- 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()
@@ -174,9 +166,10 @@ commands = {"karma": (c.karmaq,karmadb),
 	    "define": c.defineq,
             "google": c.googleq,
 	    "url": (c.urlq,urldb),
+	    "nsfw": (c.nsfwq,urldb),
+	    "nws": (c.nsfwq,urldb),
 	    "units": c.unitq,
 	    "help": c.helpq,
-#	    "game": (c.gameq,game),
             "say": c.sayq,
             "do": c.doq, 
             "twit": (c.twitterq,twitapi) }
@@ -223,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)
-#