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

diff --git a/commands.py b/commands.py
index fb4175c..9d5dcb4 100644
--- a/commands.py
+++ b/commands.py
@@ -334,9 +334,8 @@ 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" % \
@@ -350,7 +349,11 @@ 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)
 
 ### Deal with URLs spotted in channel