# 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
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"]
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
(T.urltype(),T.firstmen(),T.nick)
conn.action(bot.channel, message)
T.lastseen=time.time()
+ T.count+=1
else:
urldb[urlstring]=UrlLog(urlstring,nick)