X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=blobdiff_plain;f=commands.py;h=0075272c54d7f585291e3619217644f7744baf8c;hb=5b64cc351cc73ba65fee7fd3be1b7988802babac;hp=fb4175c2c587a5d09563562513dbe015e97012df;hpb=b6a82529650123d4baab1e4312031c82df33dbb2;p=irc.git

diff --git a/commands.py b/commands.py
index fb4175c..0075272 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
@@ -324,19 +324,20 @@ class UrlLog:
     def urltype(self):
         z=min(len(urlcomplaints)-1, self.count-1)
         return urlcomplaints[z]
-        
-urlre = re.compile("(https?://[^ ]+)( |$)")
+
+#(?:) is a regexp that doesn't group        
+urlre = re.compile("((?:(?:http)|(?:nsfw))s?://[^ ]+)( |$)")
+hturlre= re.compile("(http)(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" % \
@@ -346,11 +347,20 @@ def urlq(bot, cmd, nick, conn, public,urldb):
       T.count+=1
     bot.automsg(False,nick,complaint)
     T.lastasked=time.time()
+    #URL suppressed, so mention in #urls
+    if urlstring != cmd.split()[1]: #first argument to URL was not the url
+      conn.privmsg("#urls","%s remarks: %s" % (nick," ".join(cmd.split()[1:])))
+    else:
+      conn.privmsg("#urls","(via %s) %s"%(nick," ".join(cmd.split()[1:])))
   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
@@ -377,6 +387,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)
@@ -384,3 +396,40 @@ def canonical_url(urlstring):
         urlstring.replace(middle,"/hi/")
   return urlstring
 
+# automatically make nsfw urls for you and pass them on to url
+def nsfwq(bot,cmd,nick,conn,public,urldb):
+  if (not hturlre.search(cmd)):
+    bot.automsg(False,nick,"Please use 'nsfw' only with http or https URLs")
+    return
+  newcmd=hturlre.sub(nsfwify,cmd)
+  urlq(bot,newcmd,nick,conn,public,urldb)
+
+def nsfwify(match):
+    a,b,c=match.groups()
+    return 'nsfw'+b+c
+
+#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