X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?p=irc.git;a=blobdiff_plain;f=Servus-chiark.py;h=76fafd117669b7f543e0b34be8a62b3cf095428f;hp=a0ba8a5189a0d2060f4b6d635293f91c6309e8c5;hb=dc860f4e9909aab578a0d0830da6268d5436538e;hpb=bce7d2086371d534cc8cb19ae0adfc22f85d39d9

diff --git a/Servus-chiark.py b/Servus-chiark.py
old mode 100644
new mode 100755
index a0ba8a5..76fafd1
--- a/Servus-chiark.py
+++ b/Servus-chiark.py
@@ -24,7 +24,9 @@
 # Acrobat configuration file
 
 # The following definitions are required to be present in this module:
-server = "rapun"
+# You can also override them on the command-line
+# e.g. python acrobat.py Servus-chiark nickname=testbot channel=\#test owner=MyNick
+server = "chiark"
 port = 6667
 nickname = "Servus"
 channel = "#chiark"
@@ -33,7 +35,7 @@ owner = "Emperor"
 
 # Everything else in this file is configuration-specific.
 
-import os, time
+import os, time, re, twitter, subprocess, sys, os.path
 
 # Most command implementations are stored in a separate module.
 import commands as c
@@ -49,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):
@@ -101,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")
@@ -132,13 +158,42 @@ 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()
+#expire urls if not asked about or seen for >71 hours
+expirelen=71*60*60
+#do an expiry run every hour
+expirevery=60*60
+
+
+#path where Oauth details are kept
+twioauthpath=os.path.expanduser("~/private/servus_twapi_oauth.txt")
+
+try:
+  f=open(twioauthpath,"r")
+  for line in f:
+    if line[0]=='#':
+      continue
+    key,val=map(str.strip,line.split(':'))
+    if key == "consumer_key":
+      twoaapck = val
+    elif key == "consumer_secret":
+      twoaapcs = val
+    elif key == "access_token":
+      twoapat = val
+    elif key == "access_token_secret":
+      twoapats = val
+    else:
+      raise ValueError, "Invalid line in twitter auth details file %s" % line
+  f.close()
+  twitapi = twitter.Api(consumer_key = twoaapck,
+			consumer_secret = twoaapcs,
+			access_token_key = twoapat,
+			access_token_secret = twoapats)
+except IOError:
+# 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
@@ -158,13 +213,18 @@ commands = {"karma": (c.karmaq,karmadb),
             "reload": reload,
             "quit": quit,
 	    "die": quit,
+	    "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,
-#	    "define": c.defineq,
-#	    "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 }
@@ -174,6 +234,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,twitapi
     ours=0
     try:
 	    if public and cmd[0] in triggers:
@@ -184,6 +245,16 @@ def command(bot, cmd, nick, conn, public):
 	    command = cmd.split()[0]
     except IndexError:
 	    command=""
+
+    t=time.time()
+    if t - lastexp > expirevery:
+	    c.urlexpire(urldb,expirelen)
+	    lastexp=t
+
+    if public:
+      if c.urlre.search(cmd) and command.lower()!="url":
+        c.dourl(bot,conn,nick,cmd,urldb)
+
     # karma: up
     if command.endswith("++"):
         karma(cmd,1)
@@ -197,11 +268,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)
-#