From a379f77c0099738fdd7c8e55c22d9c63a6954bb5 Mon Sep 17 00:00:00 2001 From: Matthew Vernon Date: Tue, 25 May 2010 16:07:06 +0100 Subject: [PATCH] remove debugging prints, and correct handling of http in channel --- Servus-chiark.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Servus-chiark.py b/Servus-chiark.py index 51c4bbc..3fb7adc 100644 --- a/Servus-chiark.py +++ b/Servus-chiark.py @@ -163,13 +163,11 @@ urlre = re.compile("(https?://[^ ]+)( |$)") urlcomplaints = [" contemporary","n interesting"," fascinating","n overused"," vastly overused"] def urlq(bot, cmd, nick, conn, public): - print "debug: ",bot,cmd,nick,conn,public if (not urlre.search(cmd)): bot.automsg(False,nick,"Please use 'url' only with http URLs") return url="".join(cmd.split(" ")[1:]) - print "##",url,"##" url=canonical_url(url) if (url in urldb): @@ -184,16 +182,13 @@ def urlq(bot, cmd, nick, conn, public): else: conn.privmsg(bot.channel,"%s would like to draw your attention to %s"%(nick,url)) urldb[url]=[[nick,time.time()]] - print [bot, cmd, nick, conn] def dourl(bot,conn,nick,command): urlstring=urlre.search(command).group(1) - print "dourl: ",urlstring urlstring=canonical_url(urlstring) if urlstring in urldb: T=urldb[urlstring] - print T uci = len(T) if uci >= len(urlcomplaints): uci = len(urlcomplaints) @@ -261,7 +256,7 @@ def command(bot, cmd, nick, conn, public): command="" if public: - if cmd.find("http") != -1: + if urlre.search(cmd): dourl(bot,conn,nick,cmd) # karma: up -- 2.30.2