make clear you can twit by /msg or in-channel

[irc.git] / commands.py

diff --git a/commands.py b/commands.py
index 159bbb4e888dc67d28bff0e64eeb13d0e389d8af..32ac05e8b49bcac10dbbd635f81cc3eb89fa48bc 100644 (file)
--- a/commands.py
+++ b/commands.py
@@ -1,5 +1,5 @@
 # Part of Acrobat.
-import string, cPickle, random, urllib, sys, time, re, os
+import string, cPickle, random, urllib, sys, time, re, os, twitter
 from irclib import irc_lower, nm_to_n
 
 # query karma
@@ -36,7 +36,7 @@ def karmadelq(bot, cmd, nick, conn, public, karma):
 # help - provides the URL of the help file
 def helpq(bot, cmd, nick, conn, public):
     bot.automsg(public,nick,
-                "For help see http://www.pick.ucam.org/~matthew/irc/servus.html")
+                "For help see http://www.chiark.greenend.org.uk/~matthewv/irc/servus.html")
 
 
 # query bot status
@@ -350,7 +350,7 @@ def urlq(bot, cmd, nick, conn, public,urldb):
       bot.automsg(False,nick,"That URL was unique. There is little point in using !url out loud; please use it via /msg")
     else:
       if urlstring != cmd.split()[1]: #first argument to URL was not the url
-        conn.privmsg(bot.channel,"%s remarks %s" % (nick," ".join(cmd.split()[1:])))
+        conn.privmsg(bot.channel,"%s remarks: %s" % (nick," ".join(cmd.split()[1:])))
       else:
         conn.privmsg(bot.channel,"(via %s) %s"%(nick," ".join(cmd.split()[1:])))
       bot.automsg(False,nick,"That URL was unique; I have posted it into IRC")
@@ -387,3 +387,28 @@ def canonical_url(urlstring):
         urlstring.replace(middle,"/hi/")
   return urlstring
 
+
+#get tweet text
+def twitterq(bot,cmd,nick,conn,public,twitapi):
+  
+  if (not urlre.search(cmd)):
+    bot.automsg(False,nick,"Please use 'twit' only with http URLs")
+    return
+
+  urlstring = urlre.search(cmd).group(1)
+  if (urlstring.find("twitter.com") !=-1):
+    stringout = getTweet(urlstring,twitapi)
+    if public:
+      conn.action(bot.channel,stringout)
+    else:
+      bot.automsg(public, nick, stringout)
+  
+def getTweet(urlstring,twitapi):
+  parts = string.split(urlstring,'/')
+  tweetID = parts[-1]
+  status = twitapi.GetStatus(tweetID)
+  tweeter_screen = status.user.screen_name
+  tweeter_name = status.user.name
+  tweetText = status.text
+  stringout = "tweet by %s (%s): %s" %(tweeter_screen,tweeter_name,tweetText)
+  return stringout