chiark
/
gitweb
/
~matthewv
/
irc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
alter grammar of a slash, from Senji
[irc.git]
/
commands.py
diff --git
a/commands.py
b/commands.py
index c6f27770b539e158ab71d622908e34816bdc6138..9d5dcb450f5765feb1a27a744be68662be14eee3 100644
(file)
--- 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
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 (url in urldb):
T = urldb[url]
complaint="That's %s URL that was first mentioned %s by %s" % \
@@
-350,7
+349,10
@@
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:
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)
bot.automsg(False,nick,"That URL was unique; I have posted it into IRC")
urldb[url]=UrlLog(url,nick)