new trouts from rejs

[irc.git] / Servus-chiark.py

diff --git a/Servus-chiark.py b/Servus-chiark.py
old mode 100644 (file)
new mode 100755 (executable)
index df06e4c..26d46a1
--- a/Servus-chiark.py
+++ b/Servus-chiark.py
@@ -25,7 +25,7 @@
 
 # The following definitions are required to be present in this module:
 # You can also override them on the command-line
-# e.g. python acrobat.py Servus-chiark nickname=testbot channel=\#test
+# e.g. python acrobat.py Servus-chiark nickname=testbot channel=\#test owner=MyNick
 server = "chiark"
 port = 6667
 nickname = "Servus"
@@ -35,7 +35,7 @@ owner = "Emperor"
 
 # Everything else in this file is configuration-specific.
 
-import os, time, re
+import os, time, re, twitter, subprocess, sys
 
 # Most command implementations are stored in a separate module.
 import commands as c
@@ -51,6 +51,30 @@ class fish:
        DoS=0
        Boring_Git='Nobody'
        quotatime=0
+       last=""
+
+# load the "blame" details for a file
+def loadblame(filename):
+    p=subprocess.Popen(["git","blame","-s",filename],
+                       stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    out,err=p.communicate()
+    if len(err)>0:
+        sys.exit("git blame failure: %s" % err)
+    bdb={}
+    lines=out.split("\n")
+    for line in lines:
+        l=line.split()
+        if len(line.strip())>0:
+            commit=l[0]
+            thing=' '.join(l[2:])
+            bdb[thing]=commit
+    keys=bdb.keys()
+    return bdb,keys
+    
+#set up blame dbs for trouts/flirts/slashes
+tbdb,tbdbk=loadblame("trouts")
+fbdb,fbdbk=loadblame("flirts")
+sbdb,sbdbk=loadblame("slashes")
 
 # load a file full of flirts or trouts
 def __load(filename):
@@ -103,7 +127,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 +158,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()
@@ -150,6 +166,9 @@ expirelen=71*60*60
 #do an expiry run every hour
 expirevery=60*60
 
+# non-authenticated twitter api instance
+twitapi = twitter.Api()
+
 # Command processing: whenever something is said that the bot can hear,
 # "command" is invoked and must decide what to do.  This configuration
 # defines a couple of special cases (for karma) but is otherwise driven
@@ -171,11 +190,15 @@ 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,
+           "currency":c.currencyq,
+            "blame": (c.blameq,fish,tbdb,tbdbk,fbdb,fbdbk,sbdb,sbdbk),
            "help": c.helpq,
-#          "game": (c.gameq,game),
             "say": c.sayq,
-            "do": c.doq }
+            "do": c.doq, 
+            "twit": (c.twitterq,twitapi) }
 # disconnect and hop annoy people
 #            "disconnect": c.disconnq,
 #            "hop": c.disconnq }
@@ -185,7 +208,7 @@ triggers = ("!", "~") # what character should the bot be invoked by:
                       # eg !trout, ~trout etc.
 
 def command(bot, cmd, nick, conn, public):
-    global urldb,lastexp,expirelen,expirevery
+    global urldb,lastexp,expirelen,expirevery,twitapi
     ours=0
     try:
            if public and cmd[0] in triggers:
@@ -219,11 +242,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)
-#