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

diff --git a/commands.py b/commands.py
index 8dd8e59..9d5dcb4 100644
--- a/commands.py
+++ b/commands.py
@@ -322,8 +322,8 @@ class UrlLog:
     def firstmen(self):
         return nicetime(time.time()-self.first)
     def urltype(self):
-        z=max(len(urlcomplaints), self.count-1)
-        return urlcomplaints(z)
+        z=min(len(urlcomplaints)-1, self.count-1)
+        return urlcomplaints[z]
         
 urlre = re.compile("(https?://[^ ]+)( |$)")
 urlcomplaints = ["a contemporary","an interesting","a fascinating","an overused","a vastly overused"]
@@ -334,22 +334,26 @@ def urlq(bot, cmd, nick, conn, public,urldb):
     bot.automsg(False,nick,"Please use 'url' only with http 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 +367,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)