chiark
/
gitweb
/
~matthewv
/
irc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes to migrate from rapun to chiark
[irc.git]
/
commands.py
diff --git
a/commands.py
b/commands.py
index 365b4aa2151832b6d2a6a7ce664f03cdf7cac7a0..f869cd38e059a51022fc7b4f874f1737fe39fb66 100644
(file)
--- a/
commands.py
+++ b/
commands.py
@@
-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,
# 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
# query bot status
@@
-334,7
+334,7
@@
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
- urlstring=urlre.search(c
omman
d).group(1)
+ urlstring=urlre.search(c
m
d).group(1)
url=canonical_url(urlstring)
if (url in urldb):
T = urldb[url]
url=canonical_url(urlstring)
if (url in urldb):
T = urldb[url]
@@
-349,10
+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:
- if urlstring != cmd[1]: #first argument to URL was not the url
- conn.privmsg(bot.channel,"%s remarks
%s",
% (nick," ".join(cmd.split()[1:])))
+ 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:
else:
- conn.privmsg(bot.channel,"
%s would like to draw your attention to
%s"%(nick," ".join(cmd.split()[1:])))
+ 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)