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" % \
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