X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=blobdiff_plain;f=commands.py;h=db8ace677d2c1a16ebb519d4fd508cdd8fc12dd3;hb=f735103642de01dab16d0a3bc846d701edda7a64;hp=b669ba3a92f62718d1f4b7674c3d2f9a7fc32c69;hpb=f4320bb8956d5bf85b2664b5ddc1ae3ea5a2de0d;p=irc.git

diff --git a/commands.py b/commands.py
index b669ba3..db8ace6 100644
--- 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
@@ -331,10 +331,10 @@ urlcomplaints = ["a contemporary","an interesting","a fascinating","an overused"
 ### Deal with /msg bot url or ~url in channel
 def urlq(bot, cmd, nick, conn, public,urldb):
   if (not urlre.search(cmd)):
-    bot.automsg(False,nick,"Please use 'url' only with http URLs")
+    bot.automsg(False,nick,"Please use 'url' only with http or https URLs")
     return
 
-  urlstring=urlre.search(command).group(1)
+  urlstring=urlre.search(cmd).group(1)
   url=canonical_url(urlstring)
   if (url in urldb):
     T = urldb[url]
@@ -349,7 +349,10 @@ def urlq(bot, cmd, nick, conn, public,urldb):
     if (public):
       bot.automsg(False,nick,"That URL was unique. There is little point in using !url out loud; please use it via /msg")
     else:
-      conn.privmsg(bot.channel,"%s would like to draw your attention to %s"%(nick,url))
+      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:])))
+      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")
     urldb[url]=UrlLog(url,nick)
 
@@ -384,3 +387,32 @@ 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)
+    try:
+        bot.automsg(public, nick, stringout)
+    except UnicodeEncodeError:
+        bot.automsg(public, nick, "Sorry, that tweet contained non-ASCII characters")
+  
+def getTweet(urlstring,twitapi):
+  parts = string.split(urlstring,'/')
+  tweetID = parts[-1]
+  try:
+    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)
+  except twitter.TwitterError:
+    terror = sys.exc_info()
+    stringout = "Twitter error: %s" % terror[1].__str__()
+  return stringout