X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/aaa67e6d13101adf4533afe1ed630ca98563eb4f..3b51ce573ec339152de082d38d87ae0632931215:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index 837181d..6b131cd 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -49,20 +49,22 @@ 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.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() @@ -129,6 +131,9 @@ class TriviaState(object): except IndexError: pass 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() @@ -195,7 +200,9 @@ class TriviaState(object): self.nextquestion() #start the game! def nextquestion(self, qskipped=False, iteration=0, skipwait=False): + self.lastqid = self.curqid self.curq = None + self.curqid = None if self.gameover == True: return self.doGameOver() if qskipped: @@ -251,14 +258,15 @@ class TriviaState(object): nextq[1] = nextq[1].lower() qtext = "\00304,01Next up: " - if nextqid is not None: - qtext += "(%d) " % (nextqid) + 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.curq = nextq + self.curqid = nextqid if isinstance(self.curq[1], basestring): self.hintanswer = self.curq[1] else: self.hintanswer = random.choice(self.curq[1]) @@ -371,7 +379,11 @@ def setnextid(bot, user, chan, realtarget, *args): try: qid = int(args[0]) state.nextq = state.db['questions'][qid] - bot.msg(user, "Done. Next question is: %s" % (state.nextq[0])) + if user.glevel >= lib.STAFF: + respstr = "Done. Next question is: %s" % (state.nextq[0]) + else: + respstr = "Done." + bot.msg(user, respstr) except Exception as e: bot.msg(user, "Error: %s" % (e)) @@ -437,12 +449,14 @@ def stop(): pass @lib.hook(needchan=False) -@lib.argsGE(2) +@lib.argsGE(1) def badq(bot, user, chan, realtarget, *args): - qid = int(args[0]) - reason = ' '.join(args[1:]) - state.db['badqs'].append([qid, reason]) - bot.msg(user, "Reported bad question #%d" % (qid)) + lastqid = state.lastqid + curqid = state.curqid + + reason = ' '.join(args) + state.db['badqs'].append([lastqid, curqid, reason]) + bot.msg(user, "Reported bad question.") @lib.hook(glevel=lib.STAFF, needchan=False) def badqs(bot, user, chan, realtarget, *args): @@ -452,10 +466,13 @@ def badqs(bot, user, chan, realtarget, *args): for i in range(len(state.db['badqs'])): try: report = state.db['badqs'][i] - bot.msg(user, "Report #%d: Q%d: %s" % (i, report[0], report[1])) - question = state.db['questions'][int(report[0])] - bot.msg(user, "- Question is: %s" % (question[0])) - bot.msg(user, "- Answer is: %s" % (question[1])) + bot.msg(user, "Report #%d: LastQ=%r CurQ=%r: %s" % (i, report[0], report[1], report[2])) + try: lq = state.db['questions'][int(report[0])] + except Exception as e: lq = (None,None) + try: cq = state.db['questions'][int(report[1])] + except Exception as e: cq = (None, None) + bot.msg(user, "- Last: %s*%s" % (lq[0], lq[1])) + bot.msg(user, "- Curr: %s*%s" % (cq[0], cq[1])) except Exception as e: bot.msg(user, "- Exception: %r" % (e)) @@ -551,9 +568,15 @@ def questionpause(bot, user, chan, realtarget, *args): @lib.hook(glevel=1, needchan=False) def findq(bot, user, chan, realtarget, *args): + if len(args) == 0: + bot.msg(user, "You need to specify a search string.") + return + searcher = re.compile(' '.join(args)) matches = [str(i) for i in range(len(state.db['questions'])) if searcher.search(state.db['questions'][i][0]) is not None] - if len(matches) > 1: + if len(matches) > 25: + bot.msg(user, "Too many matches! (>25)") + elif len(matches) > 1: bot.msg(user, "Multiple matches: %s" % (', '.join(matches))) elif len(matches) == 1: bot.msg(user, "One match: %s" % (matches[0])) @@ -588,7 +611,7 @@ def triviahelp(bot, user, chan, realtarget, *args): bot.msg(user, "TOP10") bot.msg(user, "POINTS []") bot.msg(user, "RANK []") - bot.msg(user, "BADQ ") + bot.msg(user, "BADQ (include info to identify question)") if user.glevel >= 1: bot.msg(user, "SKIP (>=KNOWN)") bot.msg(user, "STOP (>=KNOWN)") @@ -640,6 +663,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: