new trout from ewx

[irc.git] / Servus-chiark.py

diff --git a/Servus-chiark.py b/Servus-chiark.py
index 9c381aea2accca3c587f32548d489fd6c86bf4ab..0af2dbce4424bc423676a1581ed22e6ba35b1bf3 100644 (file)
--- a/Servus-chiark.py
+++ b/Servus-chiark.py
@@ -24,6 +24,8 @@
 # Acrobat configuration file
 
 # 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 owner=MyNick
 server = "chiark"
 port = 6667
 nickname = "Servus"
@@ -33,7 +35,7 @@ owner = "Emperor"
 
 # Everything else in this file is configuration-specific.
 
-import os, time, re
+import os, time, re, twitter
 
 # Most command implementations are stored in a separate module.
 import commands as c
@@ -148,6 +150,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
@@ -173,7 +178,8 @@ commands = {"karma": (c.karmaq,karmadb),
            "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 }
@@ -183,7 +189,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: