X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?p=irc.git;a=blobdiff_plain;f=commands.py;h=6049640b62fddce7749fa01f1d5b5b3c83b3099b;hp=8dd8e595c650baabf9d8da4051a99a11f06f0995;hb=244cd25795f26cf35f7853c836f07ac1d52ff110;hpb=c0b84406e088cfa837f29e7ea44e3ee87c7a158e

diff --git a/commands.py b/commands.py
index 8dd8e59..6049640 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
@@ -322,34 +322,39 @@ class UrlLog:
     def firstmen(self):
         return nicetime(time.time()-self.first)
     def urltype(self):
-        z=max(len(urlcomplaints), self.count-1)
-        return urlcomplaints(z)
-        
-urlre = re.compile("(https?://[^ ]+)( |$)")
+        z=min(len(urlcomplaints)-1, self.count-1)
+        return urlcomplaints[z]
+
+#(?:) is a regexp that doesn't group        
+urlre = re.compile("((?:(?:http)|(?:nsfw))s?://[^ ]+)( |$)")
 urlcomplaints = ["a contemporary","an interesting","a fascinating","an overused","a vastly 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, https, nsfw, or nsfws URLs")
     return
 
-  url="".join(cmd.split(" ")[1:])
-
-  url=canonical_url(url)
+  urlstring=urlre.search(cmd).group(1)
+  url=canonical_url(urlstring)
   if (url in urldb):
     T = urldb[url]
     complaint="That's %s URL that was first mentioned %s by %s" % \
                (T.urltype(),T.firstmen(),T.nick)
     if (public):
       complaint=complaint+". Furthermore it defeats the point of this command to use it other than via /msg."
+      T.count+=1
     bot.automsg(False,nick,complaint)
     T.lastasked=time.time()
   else:
     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)
 
 ### Deal with URLs spotted in channel
@@ -363,6 +368,7 @@ def dourl(bot,conn,nick,command,urldb):
              (T.urltype(),T.firstmen(),T.nick)
     conn.action(bot.channel, message)
     T.lastseen=time.time()
+    T.count+=1
   else:
     urldb[urlstring]=UrlLog(urlstring,nick)
 
@@ -375,6 +381,8 @@ def urlexpire(urldb,expire):
 
 # canonicalise BBC URLs (internal use only)
 def canonical_url(urlstring):
+  if "nsfw://" in urlstring or "nsfws://" in urlstring:
+      urlstring=urlstring.replace("nsfw","http",1)
   if (urlstring.find("news.bbc.co.uk") != -1):
     for middle in ("/low/","/mobile/"):
       x = urlstring.find(middle)
@@ -382,3 +390,29 @@ 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)
+    bot.automsg(public, nick, stringout)
+  
+def getTweet(urlstring,twitapi):
+  parts = string.split(urlstring,'/')
+  tweetID = parts[-1]
+  try:
+    status = twitapi.GetStatus(tweetID)
+    tweeter_screen = status.user.screen_name.encode('UTF-8', 'replace')
+    tweeter_name = status.user.name.encode('UTF-8', 'replace')
+    tweetText = status.text.encode('UTF-8', 'replace')
+    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