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=26d46a1f32aa8d7322b3395ccb6590141b444446;hb=ecd020c0e1e220b59875b2d741c2f3867447bcd3;hpb=8eae28919c27d72496e5d6eae00c21c2ac5401ef

diff --git a/Servus-chiark.py b/Servus-chiark.py
index 26d46a1..76fafd1 100755
--- 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
@@ -166,8 +166,34 @@ 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()
+  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