X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/71e0b5fbe0a9bf71a435eb691e6d0889fd854e80..5f03d045cd465491760668b3e34453ae6a50034b:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index dae7ee2..b9cd9f8 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -30,7 +30,7 @@ def modstop(*args, **kwargs): import json, random, threading, re, time, datetime try: - import twitter + import twitter except: pass # doesn't matter if we don't have twitter, updating the status just will fall through the try-except if so... def findnth(haystack, needle, n): #http://stackoverflow.com/a/1884151 @@ -39,9 +39,28 @@ def findnth(haystack, needle, n): #http://stackoverflow.com/a/1884151 return -1 return len(haystack)-len(parts[-1])-len(needle) -def person(num): return state.db['users'][state.db['ranks'][num]]['realnick'] -def pts(num): return str(state.db['users'][state.db['ranks'][num]]['points']) -def country(num, default="??"): return lib.mod('userinfo')._get(person(num), 'country', default=default) +def person(num, throwindexerror=False): + try: + return state.db['users'][state.db['ranks'][num]]['realnick'] + except IndexError: + if throwindexerror: + raise + else: + return '' + +def pts(num): + try: + return str(state.db['users'][state.db['ranks'][num]]['points']) + except IndexError: + return 0 + +def country(num, default="??"): + return lib.mod('userinfo')._get(person(num), 'country', default=default).upper() + +class MyTimer(threading._Timer): + def __init__(self, *args, **kwargs): + threading._Timer.__init__(self, *args, **kwargs) + self.daemon = True class TriviaState(object): def __init__(self, parent=None, pointvote=False): @@ -49,31 +68,31 @@ class TriviaState(object): self.gotParent(parent, pointvote) def gotParent(self, parent, pointvote=False): - self.parent = parent - self.questionfile = self.parent.cfg.get('trivia', 'jsonpath', default="./modules/trivia.json") - self.db = json.load(open(self.questionfile, "r")) - self.chan = self.db['chan'] - self.curq = None - self.nextq = None - self.nextquestiontimer = None - self.steptimer = None - self.hintstr = None - self.hintanswer = None - self.hintsgiven = 0 + self.parent = parent + self.questionfile = self.parent.cfg.get('trivia', 'jsonpath', default="./modules/trivia.json") + self.db = json.load(open(self.questionfile, "r")) + self.chan = self.db['chan'] + self.curq = None + self.nextq = None + self.nextquestiontimer = None + self.steptimer = None + self.hintstr = None + self.hintanswer = None + self.hintsgiven = 0 self.revealpossibilities = None - self.gameover = False - self.missedquestions = 0 - self.curqid = None - self.lastqid = None + self.gameover = False + self.missedquestions = 0 + self.curqid = None + self.lastqid = None - if 'starttime' not in self.db or self.db['starttime'] is None: - self.db['starttime'] = time.time() + if 'lastwon' not in self.db or self.db['lastwon'] is None: + self.db['lastwon'] = time.time() if pointvote: self.getchan().msg("Vote for the next round target points! Options: %s. Vote using !vote " % (', '.join([str(x) for x in self.db['targetoptions']]))) self.getchan().msg("You have %s seconds." % (self.db['votetimer'])) self.voteamounts = dict([(x, 0) for x in self.db['targetoptions']]) # make a dict {pointsoptionA: 0, pointsoptionB: 0, ...} - self.pointvote = threading.Timer(self.db['votetimer'], self.endPointVote) + self.pointvote = MyTimer(self.db['votetimer'], self.endPointVote) self.pointvote.start() else: self.pointvote = None @@ -87,6 +106,9 @@ class TriviaState(object): if isinstance(self.nextquestiontimer, threading._Timer): self.nextquestiontimer.cancel() self.nextquestiontimer = None + self.savedb() + + def savedb(self): if json is not None and json.dump is not None: json.dump(self.db, open(self.questionfile, "w"))#, indent=4, separators=(',', ': ')) @@ -99,24 +121,27 @@ class TriviaState(object): answer = self.hintanswer if self.hintstr is None or self.revealpossibilities is None or self.reveal is None: + oldhintstr = "" self.hintstr = list(re.sub(r'[a-zA-Z0-9]', '*', answer)) self.revealpossibilities = range(''.join(self.hintstr).count('*')) - self.reveal = int(''.join(self.hintstr).count('*') * (7/24.0)) + self.reveal = int(round(''.join(self.hintstr).count('*') * (7/24.0))) + else: + oldhintstr = ''.join(self.hintstr) for i in range(self.reveal): revealcount = random.choice(self.revealpossibilities) revealloc = findnth(''.join(self.hintstr), '*', revealcount) self.revealpossibilities.remove(revealcount) self.hintstr[revealloc] = answer[revealloc] - self.parent.channel(self.chan).bot.msg(self.chan, "\00304,01Here's a hint: %s" % (''.join(self.hintstr))) + if oldhintstr != ''.join(self.hintstr): self.getchan().fastmsg("\00304,01Here's a hint: %s" % (''.join(self.hintstr))) self.hintsgiven += 1 if hintnum < self.db['hintnum']: - self.steptimer = threading.Timer(self.db['hinttimer'], self.nexthint, args=[hintnum+1]) + self.steptimer = MyTimer(self.db['hinttimer'], self.nexthint, args=[hintnum+1]) self.steptimer.start() else: - self.steptimer = threading.Timer(self.db['hinttimer'], self.nextquestion, args=[True]) + self.steptimer = MyTimer(self.db['hinttimer'], self.nextquestion, args=[True]) self.steptimer.start() def doGameOver(self): @@ -124,12 +149,16 @@ class TriviaState(object): winner = person(0) try: msg("\00312THE GAME IS OVER!!!") - msg("THE WINNER IS: %s (%s)" % (person(0), pts(0))) - msg("2ND PLACE: %s (%s)" % (person(1), pts(1))) - msg("3RD PLACE: %s (%s)" % (person(2), pts(2))) - [msg("%dth place: %s (%s)" % (i+1, person(i), pts(i))) for i in range(3,10)] + msg("THE WINNER IS: %s (%s)" % (person(0, True), pts(0))) + msg("2ND PLACE: %s (%s)" % (person(1, True), pts(1))) + msg("3RD PLACE: %s (%s)" % (person(2, True), pts(2))) + [msg("%dth place: %s (%s)" % (i+1, person(i, True), pts(i))) for i in range(3,10)] except IndexError: pass - except Exception as e: msg("DERP! %r" % (e)) + except Exception as e: + msg("DERP! %r" % (e)) + + self.db['lastwinner'] = winner + self.db['lastwon'] = time.time() if self.db['hofpath'] is not None and self.db['hofpath'] != '': self.writeHof() @@ -166,7 +195,7 @@ class TriviaState(object): f.seek(insertpos) f.write((self.db['hofformat']+"\n") % { 'date': time.strftime("%F", time.gmtime()), - 'duration': str(datetime.timedelta(seconds=time.time()-self.db['starttime'])), + 'duration': str(datetime.timedelta(seconds=time.time()-self.db['lastwon'])), 'targetscore': self.db['target'], 'firstperson': person(0), 'firstscore': pts(0), @@ -178,7 +207,7 @@ class TriviaState(object): f.write(fcontents) return True except Exception as e: - raise e + raise e #FIXME wtf??? return False finally: f.close() @@ -203,7 +232,7 @@ class TriviaState(object): if self.gameover == True: return self.doGameOver() if qskipped: - self.getchan().msg("\00304Fail! The correct answer was: %s" % (self.hintanswer)) + self.getchan().fastmsg("\00304Fail! The correct answer was: %s" % (self.hintanswer)) self.missedquestions += 1 else: self.missedquestions = 0 @@ -229,7 +258,7 @@ class TriviaState(object): if skipwait: self._nextquestion(iteration) else: - self.nextquestiontimer = threading.Timer(self.db['questionpause'], self._nextquestion, args=[iteration]) + self.nextquestiontimer = MyTimer(self.db['questionpause'], self._nextquestion, args=[iteration]) self.nextquestiontimer.start() def _nextquestion(self, iteration): @@ -252,15 +281,18 @@ class TriviaState(object): else: nextq.append(time.time()) - nextq[1] = nextq[1].lower() + if isinstance(nextq[1], basestring): + nextq[1] = nextq[1].lower() + else: + nextq[1] = [s.lower() for s in nextq[1]] - qtext = "\00304,01Next up: " - qtext += "(%5d)"% (random.randint(0,99999)) + qtext = "\00312,01Next up: " + qtext += "(%5d)" % (random.randint(0,99999)) qary = nextq[0].split(None) qtext += " " for qword in qary: qtext += "\00304,01"+qword+"\00301,01"+chr(random.randrange(0x61,0x7A)) #a-z - self.getbot().msg(self.chan, qtext) + self.getbot().fastmsg(self.chan, qtext) self.curq = nextq self.curqid = nextqid @@ -268,7 +300,7 @@ class TriviaState(object): if isinstance(self.curq[1], basestring): self.hintanswer = self.curq[1] else: self.hintanswer = random.choice(self.curq[1]) - self.steptimer = threading.Timer(self.db['hinttimer'], self.nexthint, args=[1]) + self.steptimer = MyTimer(self.db['hinttimer'], self.nexthint, args=[1]) self.steptimer.start() def checkanswer(self, answer): @@ -344,12 +376,16 @@ def trivia_checkanswer(bot, user, chan, *args): line = ' '.join([str(arg) for arg in args]) if state.checkanswer(line): state.curq = None - bot.msg(chan, "\00312%s\003 has it! The answer was \00312%s\003. New score: %d. Rank: %d. Target: %s (%s)." % (user, line, state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user))) + if state.hintanswer.lower() == line.lower(): + bot.fastmsg(chan, "\00312%s\003 has it! The answer was \00312%s\003. New score: %d. Rank: %d. Target: %s (%s)." % (user, line, state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user))) + else: + bot.fastmsg(chan, "\00312%s\003 has it! The answer was \00312%s\003 (hinted answer: %s). New score: %d. Rank: %d. Target: %s (%s)." % (user, line, state.hintanswer, state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user))) if state.hintsgiven == 0: bot.msg(chan, "\00312%s\003 got an extra point for getting it before the hints! New score: %d." % (user, state.addpoint(user))) state.nextquestion() @lib.hook(needchan=False) +@lib.help("[]", "shows how many points you or someone has") def points(bot, user, chan, realtarget, *args): if chan is not None and realtarget == chan.name: replyto = chan else: replyto = user @@ -360,6 +396,7 @@ def points(bot, user, chan, realtarget, *args): bot.msg(replyto, "%s has %d points." % (who, state.points(who))) @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.help(" []", "gives someone points", "defaults to 1 point") @lib.argsGE(1) def give(bot, user, chan, realtarget, *args): whoto = args[0] @@ -372,6 +409,8 @@ def give(bot, user, chan, realtarget, *args): bot.msg(chan, "%s gave %s %d points. New balance: %d" % (user, whoto, numpoints, balance)) @lib.hook(glevel=1, needchan=False) +@lib.help("", "sets next question to one in the database") +@lib.argsEQ(1) def setnextid(bot, user, chan, realtarget, *args): try: qid = int(args[0]) @@ -385,6 +424,7 @@ def setnextid(bot, user, chan, realtarget, *args): bot.msg(user, "Error: %s" % (e)) @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.help("*", "sets next question to one not in database") @lib.argsGE(1) def setnext(bot, user, chan, realtarget, *args): line = ' '.join([str(arg) for arg in args]) @@ -398,10 +438,12 @@ def setnext(bot, user, chan, realtarget, *args): bot.msg(user, "Done.") @lib.hook(glevel=1, needchan=False) +@lib.help(None, "skips to next question") def skip(bot, user, chan, realtarget, *args): state.nextquestion(qskipped=True, skipwait=True) @lib.hook(needchan=False) +@lib.help(None, "starts the trivia game") def start(bot, user, chan, realtarget, *args): if chan is not None and realtarget == chan.name: replyto = chan else: replyto = user @@ -414,11 +456,12 @@ def start(bot, user, chan, realtarget, *args): bot.msg(state.db['chan'], "%s has started the game!" % (user)) state.nextquestion(skipwait=True) elif state.pointvote is not None: - bot.msg(replyto, "There's a vote in progress!") + bot.msg(user, "There's a vote in progress!") else: - bot.msg(replyto, "Game is already started!") + bot.msg(user, "Game is already started!") @lib.hook('stop', glevel=1, needchan=False) +@lib.help(None, "stops the trivia game") def cmd_stop(bot, user, chan, realtarget, *args): if stop(): bot.msg(state.chan, "Game stopped by %s" % (user)) @@ -426,26 +469,22 @@ def cmd_stop(bot, user, chan, realtarget, *args): bot.msg(user, "Game isn't running.") def stop(): + state.curq = None + state.nextq = None try: - if state.curq is not None or state.nextq is not None: - state.curq = None - state.nextq = None - try: - state.steptimer.cancel() - except Exception as e: - print "!!! steptimer.cancel(): %s %r" % (e,e) - try: - state.nextquestiontimer.cancel() - state.nextquestiontimer = None - except Exception as e: - print "!!! nextquestiontimer.cancel(): %s %r" % (e,e) - return True - else: - return False - except NameError: - pass + state.steptimer.cancel() + except Exception as e: + print "!!! steptimer.cancel(): %s %r" % (e,e) + state.steptimer = None + try: + state.nextquestiontimer.cancel() + except Exception as e: + print "!!! nextquestiontimer.cancel(): %s %r" % (e,e) + state.nextquestiontimer = None + return True @lib.hook(needchan=False) +@lib.help("", "reports a bad question to the admins") @lib.argsGE(1) def badq(bot, user, chan, realtarget, *args): lastqid = state.lastqid @@ -453,9 +492,11 @@ def badq(bot, user, chan, realtarget, *args): reason = ' '.join(args) state.db['badqs'].append([lastqid, curqid, reason]) + state.savedb() bot.msg(user, "Reported bad question.") @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.help(None, "shows a list of BADQ reports") def badqs(bot, user, chan, realtarget, *args): if len(state.db['badqs']) == 0: bot.msg(user, "No reports.") @@ -474,18 +515,26 @@ def badqs(bot, user, chan, realtarget, *args): bot.msg(user, "- Exception: %r" % (e)) @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.hook(None, "clears list of BADQ reports") def clearbadqs(bot, user, chan, realtarget, *args): state.db['badqs'] = [] + state.savedb() bot.msg(user, "Cleared reports.") @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.hook("", "removes a BADQ report") @lib.argsEQ(1) def delbadq(bot, user, chan, realtarget, *args): - qid = int(args[0]) - del state.db['badqs'][qid] - bot.msg(user, "Removed report #%d" % (qid)) + try: + qid = int(args[0]) + del state.db['badqs'][qid] + state.savedb() + bot.msg(user, "Removed report #%d" % (qid)) + except: + bot.msg(user, "Failed!") @lib.hook(needchan=False) +@lib.help("[]", "shows you or someone else's rank") def rank(bot, user, chan, realtarget, *args): if chan is not None and realtarget == chan.name: replyto = chan else: replyto = user @@ -496,6 +545,7 @@ def rank(bot, user, chan, realtarget, *args): bot.msg(replyto, "%s is in %d place (%s points). Target is: %s (%s points)." % (who, state.rank(who), state.points(who), state.targetuser(who), state.targetpoints(who))) @lib.hook(needchan=False) +@lib.help(None, "shows top10 list") def top10(bot, user, chan, realtarget, *args): if len(state.db['ranks']) == 0: return bot.msg(state.db['chan'], "No one is ranked!") @@ -503,10 +553,11 @@ def top10(bot, user, chan, realtarget, *args): max = len(state.db['ranks']) if max > 10: max = 10 - replylist = ', '.join(["%s (%s) %s" % (person(x), country(x, "unknown"), pts(x)) for x in range(max)]) - bot.msg(state.db['chan'], "Top %d: %s" % (max, replylist)) + replylist = ', '.join(["%s (%s) %s" % (person(x), country(x), pts(x)) for x in range(max)]) + bot.msg(state.db['chan'], "Top 10: %s" % (replylist)) @lib.hook(glevel=lib.ADMIN, needchan=False) +@lib.help("", "changes the target score for this round") def settarget(bot, user, chan, realtarget, *args): try: state.db['target'] = int(args[0]) @@ -521,6 +572,7 @@ def settarget(bot, user, chan, realtarget, *args): bot.msg(user, "Failed to set target.") @lib.hook(needchan=False) +@lib.help("", "adds a question") def addq(bot, user, chan, realtarget, *args): line = ' '.join([str(arg) for arg in args]) linepieces = line.split('*') @@ -593,38 +690,42 @@ def addq(bot, user, chan, realtarget, *args): question = linepieces[0].strip() answer = linepieces[1].strip() state.db['questions'].append([question, answer]) + state.savedb() bot.msg(user, "Done. Question is #%s" % (len(state.db['questions'])-1)) @lib.hook(needchan=False) def triviahelp(bot, user, chan, realtarget, *args): - bot.msg(user, "START") - bot.msg(user, "TOP10") - bot.msg(user, "POINTS []") - bot.msg(user, "RANK []") - bot.msg(user, "BADQ ") + bot.slowmsg(user, "START") + bot.slowmsg(user, "TOP10") + bot.slowmsg(user, "POINTS []") + bot.slowmsg(user, "RANK []") + bot.slowmsg(user, "BADQ (include info to identify question)") if user.glevel >= 1: - bot.msg(user, "SKIP (>=KNOWN)") - bot.msg(user, "STOP (>=KNOWN)") - bot.msg(user, "FINDQ (>=KNOWN)") + bot.slowmsg(user, "SKIP (KNOWN)") + bot.slowmsg(user, "STOP (KNOWN)") + bot.slowmsg(user, "FINDQ (KNOWN)") + bot.slowmsg(user, "FINDQRE (KNOWN)") + bot.slowmsg(user, "SETNEXTID (KNOWN)") if user.glevel >= lib.STAFF: - bot.msg(user, "GIVE [] (>=STAFF)") - bot.msg(user, "SETNEXT * (>=STAFF)") - bot.msg(user, "ADDQ * (>=STAFF)") - bot.msg(user, "DELETEQ * (>=STAFF) [aka DELQ]") - bot.msg(user, "BADQS (>=STAFF)") - bot.msg(user, "CLEARBADQS (>=STAFF)") - bot.msg(user, "DELBADQ (>=STAFF)") + bot.slowmsg(user, "GIVE [] (STAFF)") + bot.slowmsg(user, "SETNEXT * (STAFF)") + bot.slowmsg(user, "ADDQ * (STAFF)") + bot.slowmsg(user, "DELQ * (STAFF) [aka DELETEQ]") + bot.slowmsg(user, "SHOWQ (STAFF)") + bot.slowmsg(user, "BADQS (STAFF)") + bot.slowmsg(user, "CLEARBADQS (STAFF)") + bot.slowmsg(user, "DELBADQ (STAFF)") if user.glevel >= lib.ADMIN: - bot.msg(user, "SETTARGET (>=ADMIN)") - bot.msg(user, "MAXMISSED (>=ADMIN)") - bot.msg(user, "HINTTIMER (>=ADMIN)") - bot.msg(user, "HINTNUM (>=ADMIN)") - bot.msg(user, "QUESTIONPAUSE (>=ADMIN)") + bot.slowmsg(user, "SETTARGET (ADMIN)") + bot.slowmsg(user, "MAXMISSED (ADMIN)") + bot.slowmsg(user, "HINTTIMER (ADMIN)") + bot.slowmsg(user, "HINTNUM (ADMIN)") + bot.slowmsg(user, "QUESTIONPAUSE (ADMIN)") @lib.hooknum(417) def num_417(bot, textline): - bot.msg(state.db['chan'], "Whoops, it looks like that question didn't quite go through! (E:417). Let's try another...") +# bot.fastmsg(state.db['chan'], "Whoops, it looks like that question didn't quite go through! (E:417). Let's try another...") state.nextquestion(qskipped=False, skipwait=True) @lib.hooknum(332) @@ -654,6 +755,8 @@ def num_TOPIC(bot, textline): "%s (%s, %s)" % (person(x), pts(x), country(x)) for x in range(10) if x < len(state.db['ranks']) ]), + 'lastwinner': state.db['lastwinner'], + 'lastwon': time.strftime("%b %d", time.gmtime(state.db['lastwon'])), 'target': state.db['target'], } if gottopic != formatted: @@ -676,7 +779,7 @@ def specialQuestion(oldq): def spellout(num): return [ - "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", + "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen", "eighteen", "nineteen", "twenty" ][num]