blame: Put the filename in the loadblame result

[irc.git] / Servus-chiark.py

diff --git a/Servus-chiark.py b/Servus-chiark.py
index d97f84880776eb6aa8704eaf7932bfa6dc6801c1..6d3af24c258625c62231c49635d0b79722e6337c 100755 (executable)
--- a/Servus-chiark.py
+++ b/Servus-chiark.py
@@ -35,7 +35,7 @@ owner = "Emperor"
 
 # Everything else in this file is configuration-specific.
 
-import os, time, re, twitter, subprocess, sys
+import os, time, re, twitter, subprocess, sys, os.path
 
 # Most command implementations are stored in a separate module.
 import commands as c
@@ -52,6 +52,7 @@ class fish:
        Boring_Git='Nobody'
        quotatime=0
        last=""
+       last_cfg=None
 
 # load the "blame" details for a file
 def loadblame(filename):
@@ -69,13 +70,8 @@ def loadblame(filename):
             thing=' '.join(l[2:])
             bdb[thing]=commit
     keys=bdb.keys()
-    return bdb,keys
+    return bdb,keys,filename
     
-#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):
     try:
@@ -94,7 +90,9 @@ troutcfg = (
        "Who do you wish me to trout?",
        "Fish stocks exhausted.",
        fish,
-       0.1)
+       0.1,
+       loadblame("trouts"),
+       )
 
 flirtcfg = (
        __load("flirts"),
@@ -103,7 +101,9 @@ flirtcfg = (
        "Who do you wish me to flirt with?",
        "My libido is over-used!",
        fish,
-       0.1)
+       0.1,
+       loadblame("flirts"),
+       )
 
 slashcfg= ( 
        __load("slashes"),
@@ -112,7 +112,9 @@ slashcfg= (
        "Who do you want to slash?",
        "I have writer's block!",
        fish,
-       0.1)
+       0.1,
+       loadblame("slashes")
+       )
 
 # Hacky command to output the current fishpond state
 def fishq(bot, cmd, nick, conn, public,f):
@@ -166,8 +168,35 @@ 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,
+                        tweet_mode = "extended")
+except IOError:
 # non-authenticated twitter api instance
-twitapi = twitter.Api()
+  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
@@ -194,7 +223,7 @@ commands = {"karma": (c.karmaq,karmadb),
            "nws": (c.nsfwq,urldb),
            "units": c.unitq,
            "currency":c.currencyq,
-#            "blame": (c.blameq,fish,tbdb,tbdbk,fbdb,fbdbk,sbdb,sbdbk),
+            "blame": (c.blameq,fish, [troutcfg,flirtcfg,slashcfg]),
            "help": c.helpq,
             "say": c.sayq,
             "do": c.doq,