diff --git a/Code/irc/banterbot.py b/Code/irc/banterbot.py index 7b4f3b7..70bdb0a 100755 --- a/Code/irc/banterbot.py +++ b/Code/irc/banterbot.py @@ -337,16 +337,16 @@ def rollcall(channel): def listen(botnick): while 1: # loop forever - try: - ircmsg = ircsock.recv(2048).decode('utf-8') - ircmsg = ircmsg.strip("\n\r") - if ircmsg[:4] == "PING": - util.ping(ircsock, ircmsg) - print("** " + ircmsg) + ircmsg = ircsock.recv(2048).decode('utf-8') + for msg in ircmsg.split("\n"): + msg = msg.strip("\n\r") + + if msg[:4] == "PING": + util.ping(ircsock, msg) continue - formatted = util.format_message(ircmsg) + formatted = util.format_message(msg) if "" == formatted: continue @@ -419,17 +419,16 @@ def listen(botnick): util.part(ircsock, messageText[6:]) if messageText.startswith("!quit") and user == args.owner: - util.part(ircsock, "Later chumps!") + util.quit(ircsock, "Later chumps!") return - sys.stdout.flush() - time.sleep(1) - - except socket.timeout: - return # ABORT! We got kicked or something else weird happened + sys.stdout.flush() + time.sleep(1) # ROOT: i commented this out until it stops pegging the CPU. +# ~krowbar: this has the same logic loop as tildebot but for whatever reason +# it is banterbot that gets booted from IRC then rage-thrashes the machine ircsock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) util.connect(ircsock, args) listen(args.nick) diff --git a/Code/irc/tildescores.txt b/Code/irc/tildescores.txt index 242e9e6..70ccc73 100644 --- a/Code/irc/tildescores.txt +++ b/Code/irc/tildescores.txt @@ -1,10 +1,10 @@ -krowbar&^%2596&^%1542728099 +krowbar&^%2640&^%1544031477 karlen&^%498&^%1527613440 -endorphant&^%801&^%1444775660 +endorphant&^%803&^%1543250496 jumblesale&^%25&^%1426171214 marcus&^%2578&^%1538071912 papa&^%181&^%1474509971 -epicmorphism&^%7&^%1541346396 +epicmorphism&^%11&^%1543094151 audy&^%83&^%1504564254 kc&^%28&^%1480730333 vilmibm&^%24&^%1540452691 @@ -37,14 +37,14 @@ synergian&^%22&^%1458152889 dheeraj&^%5&^%1456489270 demobot&^%6&^%1454439605 premysl&^%65&^%1461768606 -minerobber&^%279&^%1542508589 +minerobber&^%280&^%1543039424 xkeeper&^%201&^%1539193279 cosnok&^%807&^%1508878859 escobar&^%1&^%1475431401 amicabot&^%30&^%1481225205 caff&^%1030&^%1540040705 kadin&^%19&^%1542733284 -desvox&^%36&^%1542379512 +desvox&^%42&^%1543941924 mankins&^%3&^%1480211581 cinch&^%2&^%1480454755 caffbot&^%969&^%1532662872 @@ -52,12 +52,12 @@ evilbot&^%4&^%1480693919 tybaltcat&^%7&^%1481076625 minerbot&^%146&^%1520382015 mio&^%347&^%1529720473 -archangelic&^%482&^%1538689239 +archangelic&^%484&^%1542913092 tehfraga&^%671&^%1542490496 sushi&^%10&^%1493253212 troido&^%302&^%1538991819 -gamebot&^%203&^%1542505151 -nilaky&^%1511&^%1542738605 +gamebot&^%203&^%1542958081 +nilaky&^%1552&^%1544038067 bucket&^%103&^%1507931139 lolbot&^%1&^%1502568407 m455&^%12&^%1512076715 @@ -70,8 +70,8 @@ pinhook&^%8&^%1509744722 emfor&^%3&^%1509671353 k2l8m11n2&^%11&^%1510932395 sacredpix&^%3&^%1522082931 -deltawitch&^%3309&^%1542655912 -login&^%2643&^%1542737740 +deltawitch&^%3351&^%1544023739 +login&^%2766&^%1544040853 kelpiebot&^%3&^%1513101957 unreal&^%2&^%1534387108 tildethief&^%7421&^%1542467787 @@ -85,12 +85,12 @@ silver&^%9&^%1519333029 equa&^%53&^%1534373756 audiodude&^%2&^%1519453927 whimsy&^%47&^%1529678733 -wangofett&^%206&^%1542635705 +wangofett&^%242&^%1544037429 saturn597&^%3&^%1521429369 cwmccabe&^%2&^%1521598124 lucidiot&^%28&^%1526201925 tracer&^%1&^%1521744878 -jan6&^%1116&^%1542729468 +jan6&^%1143&^%1543703382 jan&^%10&^%1522319160 etathetae&^%3&^%1522937843 eeeeeta&^%52&^%1540361066 @@ -104,10 +104,10 @@ lunasspec&^%4&^%1524164784 littlebigly&^%49&^%1535927253 severak&^%17&^%1540822455 ralph&^%4&^%1526980620 -von&^%426&^%1542728162 +von&^%449&^%1543590188 ensis&^%1750&^%1539356542 simon&^%26&^%1527937489 -benharri&^%2295&^%1542743369 +benharri&^%2533&^%1544038200 cpb&^%3&^%1528930564 calmbit&^%160&^%1542220635 wisebot&^%5652&^%1542183214 @@ -118,23 +118,24 @@ pounce&^%19&^%1532133325 von_&^%5&^%1532502104 livix&^%7&^%1533603142 ben&^%3&^%1533767627 -npa&^%146&^%1542708198 +npa&^%261&^%1543988008 ezo&^%6&^%1533883842 aliasless&^%36&^%1541001821 -kirch&^%217&^%1542659656 +kirch&^%246&^%1544033582 root&^%2&^%1535558514 byte&^%5&^%1536416308 qbe&^%7&^%1537850181 informati&^%3&^%1536733938 h00fi&^%1&^%1537050053 -fantoro&^%31&^%1542657642 -benjaminwil&^%553&^%1542737924 +fantoro&^%50&^%1543968518 +benjaminwil&^%558&^%1543607099 diodelass&^%3&^%1539382302 brendantcc&^%3&^%1539908223 dozens&^%21&^%1542222479 bowlercaptain&^%6&^%1540926135 nicole&^%6&^%1541276844 midnightpupil&^%12&^%1542216854 -ahriman&^%97&^%1542748742 -tunas&^%79&^%1542748854 -khuxkm&^%2&^%1542566334 +ahriman&^%332&^%1544037605 +tunas&^%101&^%1543361911 +khuxkm&^%19&^%1543867110 +ckipp01&^%3&^%1543438777 diff --git a/Code/irc/util.py b/Code/irc/util.py index c68ce04..9f23116 100644 --- a/Code/irc/util.py +++ b/Code/irc/util.py @@ -7,6 +7,7 @@ MAX_LINE = 400 def ping(ircsock, msg): + print("{} => PONG {}".format(msg, msg.split(" ")[1])) ircsock.send("PONG {}\n".format(msg.split(" ")[1]).encode()) diff --git a/public_html/chatcloud/index.html b/public_html/chatcloud/index.html index 51d4c49..4cb7425 100644 --- a/public_html/chatcloud/index.html +++ b/public_html/chatcloud/index.html @@ -13,6 +13,7 @@