diff --git a/Code/irc/data/tildejackpot.txt b/Code/irc/data/tildejackpot.txt index bf0d87a..d7765fe 100644 --- a/Code/irc/data/tildejackpot.txt +++ b/Code/irc/data/tildejackpot.txt @@ -1 +1 @@ -4 \ No newline at end of file +70 \ No newline at end of file diff --git a/Code/irc/data/tildescores.txt b/Code/irc/data/tildescores.txt index aab7f6f..1111823 100644 --- a/Code/irc/data/tildescores.txt +++ b/Code/irc/data/tildescores.txt @@ -1,4 +1,4 @@ -krowbar&^%2854&^%1552509758.872889 +krowbar&^%2982&^%1560516431.523981 karlen&^%498&^%1527613440 endorphant&^%809&^%1444775660 jumblesale&^%25&^%1426171214 @@ -40,9 +40,9 @@ xkeeper&^%201&^%1539193279 cosnok&^%807&^%1508878859 escobar&^%1&^%1475431401 amicabot&^%30&^%1481225205 -caff&^%1032&^%1552346661.160125 +caff&^%1047&^%1558110921.231633 kadin&^%19&^%1541514839 -desvox&^%69&^%1551716946.90284 +desvox&^%69&^%1557959318.778502 mankins&^%3&^%1480211581 cinch&^%2&^%1480454755 caffbot&^%969&^%1532662872 @@ -50,11 +50,11 @@ evilbot&^%4&^%1480693919 tybaltcat&^%7&^%1481076625 Minerbot&^%328&^%1548433782 mio&^%347&^%1529720473 -tehfraga&^%811&^%1552634200.805025 +tehfraga&^%847&^%1560136790.62556 sushi&^%10&^%1493253212 -troido&^%303&^%1548409580 -gamebot&^%419&^%1552404970.041536 -nilaky&^%1968&^%1552624002.376977 +troido&^%337&^%1557994464.437409 +gamebot&^%427&^%1557994509.816703 +nilaky&^%2183&^%1560326842.896281 bucket&^%103&^%1507931139 lolbot&^%1&^%1502568407 m455&^%12&^%1550095510.913918 @@ -67,7 +67,7 @@ pinhook&^%8&^%1509744722 emfor&^%3&^%1509671353 k2l8m11n2&^%11&^%1510932395 sacredpixel&^%3&^%1522082931 -login&^%3669&^%1552632831.452062 +login&^%3922&^%1560295944.042895 kelpiebot&^%3&^%1513101957 unreal&^%4&^%1550140674.610166 kinsey&^%26&^%1520446672 @@ -77,13 +77,13 @@ wuz&^%3&^%1518125300 hashdang&^%4&^%1518666906 ubergeek&^%63&^%1530410162 silver&^%9&^%1519333029 -equa&^%94&^%1552602770.059508 +equa&^%96&^%1555952114.070098 audiodude&^%2&^%1519453927 whimsy&^%47&^%1529678733 -wangofett&^%294&^%1552436276.341388 +wangofett&^%301&^%1559063459.270142 saturn&^%3&^%1521429369 lucidiot&^%28&^%1526201925 -tracer&^%1&^%1521744878 +tracer&^%1&^%1555609910.591965 jan6&^%1396&^%1550244555.585356 eeeeeta&^%55&^%1540361066 cmccabe&^%81&^%1529698164 @@ -93,12 +93,12 @@ Halian&^%32&^%1528360263 lunasspecto&^%4&^%1524164784 severak&^%17&^%1546438400 ralph&^%4&^%1526980620 -von&^%497&^%1551951799.571028 +von&^%503&^%1557219954.340999 ensis&^%1750&^%1546853217 simon&^%26&^%1527937489 -benharri&^%3744&^%1552656758.814522 +benharri&^%4175&^%1560347482.168509 cpb&^%3&^%1528930564 -calmbit&^%160&^%1541625694 +calmbit&^%167&^%1555374194.542602 wisebot&^%5652&^%1539612163 paannd_a&^%2&^%1529617165 ninlenna&^%6&^%1531186900 @@ -106,10 +106,10 @@ x4464&^%1&^%1532028546 pounce&^%19&^%1532133325 livix&^%7&^%1533603142 ben&^%3&^%1551976138.688011 -npa&^%467&^%1552622753.295706 +npa&^%521&^%1560424478.878421 ezo&^%6&^%1533883842 aliasless&^%36&^%1541001821 -kirch&^%717&^%1552517847.310872 +kirch&^%725&^%1559152397.415157 root&^%2&^%1535558514 byte&^%5&^%1536416308 qbe&^%7&^%1537850181 @@ -117,34 +117,54 @@ informativeheck&^%3&^%1536733938 h00fi&^%1&^%1537050053 fantoro&^%59&^%1550270271.196303 tildethief&^%7421&^%1542132794 -benjaminwil&^%612&^%1552337192.892643 -deltawitch&^%3551&^%1552602506.535836 +benjaminwil&^%634&^%1560191813.362556 +deltawitch&^%3562&^%1553465376.049636 archangelic&^%492&^%1551543505.698955 diodelass&^%11&^%1550243960.964821 -minerobber&^%424&^%1550645545.053616 -brendantcc&^%3&^%1539908223 +minerobber&^%436&^%1556768081.823201 +brendantcc&^%7&^%1556763317.210358 dozens&^%21&^%1541090333 bowlercaptain&^%6&^%1540926135 nicole&^%6&^%1541276844 littlebigly&^%49&^%1541283119 -ahriman&^%808&^%1552634685.217617 -tunas&^%115&^%1551455658.637688 -netscape_navigator&^%5&^%1545846867 +ahriman&^%835&^%1554866586.935765 +tunas&^%117&^%1560298163.175462 +netscape_navigator&^%6&^%1558110962.20274 roan&^%5&^%1545846612 ckipp01&^%3&^%1545813774 ben&^%4&^%1551976138.688011 l0010o0001l&^%3&^%154529473 rgdrake&^%1&^%1546086404 handyc&^%5&^%1546456002 -fosslinux&^%37&^%1550379331.325722 +fosslinux&^%61&^%1560322972.356979 banterbot&^%3&^%1547588758 testgamebot&^%4&^%1547722176 -minerobber2&^%56&^%1552364229.599098 -minerbot&^%113&^%1552404981.997855 +minerobber2&^%60&^%1559063617.783532 +minerbot&^%118&^%1559063632.795964 desvox__&^%2&^%1549262081.083705 -roy&^%121&^%1551697915.426383 +roy&^%121&^%1552723964.563934 diodelasses&^%19&^%1551139645.230519 asdf&^%47&^%1552038120.672267 -Kneezle&^%1&^%1551975324.060361 strdg&^%2&^%1551967813.490182 -kneezle&^%6&^%1552213173.813114 +kneezle&^%7&^%1552213173.813114 +clarjon1&^%9&^%1553401630.706798 +vantablack&^%4&^%1558130984.593398 +stilbruch&^%2&^%1554903426.825374 +rscham&^%6&^%1558069762.853566 +barf&^%11&^%1556183600.617767 +wingy&^%31&^%1559428066.074812 +gigavinyl&^%2&^%1556759858.270947 +amcclure&^%3&^%1557108990.625545 +coworker&^%4&^%1557454828.446457 +wizard&^%6&^%1557524532.359075 +pie&^%6&^%1557738895.63107 +Brendan&^%1&^%1557787795.608407 +haskal&^%9&^%1558321215.072781 +tawseef&^%6&^%1558976694.056738 +artemis&^%8&^%1559064594.403519 +teddysc&^%3&^%1558967130.362884 +realname&^%1&^%1559070381.420153 +wangofett1&^%2&^%1559675500.939273 +ear7h&^%7&^%1560326126.779239 +notopygos&^%2&^%1560322354.192917 +cori&^%2&^%1560318891.130722 diff --git a/Code/irc/util/tilde.py b/Code/irc/util/tilde.py index d65e442..2dad55f 100755 --- a/Code/irc/util/tilde.py +++ b/Code/irc/util/tilde.py @@ -295,7 +295,7 @@ def valid_answer(answer, guess): # "answers" acidentally have punctuation or other things in them guess = re.sub(r'\W+', '', guess) answer = re.sub(r'\w+', '', str(answer).lower()) - return (msg == answer or msg == p.number_to_words(answer)) + return (guess == answer or guess == p.number_to_words(answer)) def challenge_response(user, time, msg): global challenges diff --git a/Code/irc/util/xkcdApropos.py b/Code/irc/util/xkcdApropos.py index e729a8e..7c7e2e3 100644 --- a/Code/irc/util/xkcdApropos.py +++ b/Code/irc/util/xkcdApropos.py @@ -4,7 +4,7 @@ from bs4 import BeautifulSoup import util.duckduckgo def xkcd(query): - res = util.duckduckgo.get_zci("site:xkcd.com " + query) + res = util.duckduckgo.get_zci("site:m.xkcd.com " + query) title = "" try: # ddg returns a url for these searches. i want a title as well title = BeautifulSoup(requests.get(res).content, "html.parser").title.text diff --git a/public_html/chatcloud/index.html b/public_html/chatcloud/index.html index 79366af..bd37ad1 100644 --- a/public_html/chatcloud/index.html +++ b/public_html/chatcloud/index.html @@ -13,6 +13,9 @@