X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/77a265cdce6e50ad965401f58a1a521f96b5377b..3b51ce573ec339152de082d38d87ae0632931215:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index f7e6a69..6b131cd 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -7,7 +7,7 @@ modinfo = { 'author': 'Erebus Team', 'license': 'public domain', 'compatible': [1], # compatible module API versions - 'depends': [], # other modules required to work properly? + 'depends': ['userinfo'], # other modules required to work properly? } # preamble @@ -41,7 +41,7 @@ def findnth(haystack, needle, n): #http://stackoverflow.com/a/1884151 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 country(num, default="??"): return lib.mod('userinfo')._get(person(num), 'country', default=default) class TriviaState(object): def __init__(self, parent=None, pointvote=False): @@ -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]) @@ -344,8 +352,8 @@ def trivia_checkanswer(bot, user, chan, *args): 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('points', needchan=False) -def cmd_points(bot, user, chan, realtarget, *args): +@lib.hook(needchan=False) +def points(bot, user, chan, realtarget, *args): if chan is not None and realtarget == chan.name: replyto = chan else: replyto = user @@ -354,9 +362,9 @@ def cmd_points(bot, user, chan, realtarget, *args): bot.msg(replyto, "%s has %d points." % (who, state.points(who))) -@lib.hook('give', glevel=lib.STAFF, needchan=False) +@lib.hook(glevel=lib.STAFF, needchan=False) @lib.argsGE(1) -def cmd_give(bot, user, chan, realtarget, *args): +def give(bot, user, chan, realtarget, *args): whoto = args[0] if len(args) > 1: numpoints = int(args[1]) @@ -366,18 +374,22 @@ def cmd_give(bot, user, chan, realtarget, *args): bot.msg(chan, "%s gave %s %d points. New balance: %d" % (user, whoto, numpoints, balance)) -@lib.hook('setnextid', glevel=1, needchan=False) -def cmd_setnextid(bot, user, chan, realtarget, *args): +@lib.hook(glevel=1, needchan=False) +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)) -@lib.hook('setnext', glevel=lib.STAFF, needchan=False) +@lib.hook(glevel=lib.STAFF, needchan=False) @lib.argsGE(1) -def cmd_setnext(bot, user, chan, realtarget, *args): +def setnext(bot, user, chan, realtarget, *args): line = ' '.join([str(arg) for arg in args]) linepieces = line.split('*') if len(linepieces) < 2: @@ -388,12 +400,12 @@ def cmd_setnext(bot, user, chan, realtarget, *args): state.nextq = [question, answer] bot.msg(user, "Done.") -@lib.hook('skip', glevel=1, needchan=False) -def cmd_skip(bot, user, chan, realtarget, *args): +@lib.hook(glevel=1, needchan=False) +def skip(bot, user, chan, realtarget, *args): state.nextquestion(qskipped=True, skipwait=True) -@lib.hook('start', needchan=False) -def cmd_start(bot, user, chan, realtarget, *args): +@lib.hook(needchan=False) +def start(bot, user, chan, realtarget, *args): if chan is not None and realtarget == chan.name: replyto = chan else: replyto = user @@ -436,43 +448,48 @@ def stop(): except NameError: pass -@lib.hook('badq', needchan=False) -@lib.argsGE(2) -def cmd_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)) +@lib.hook(needchan=False) +@lib.argsGE(1) +def badq(bot, user, chan, realtarget, *args): + lastqid = state.lastqid + curqid = state.curqid + + reason = ' '.join(args) + state.db['badqs'].append([lastqid, curqid, reason]) + bot.msg(user, "Reported bad question.") -@lib.hook('badqs', glevel=lib.STAFF, needchan=False) -def cmd_badqs(bot, user, chan, realtarget, *args): +@lib.hook(glevel=lib.STAFF, needchan=False) +def badqs(bot, user, chan, realtarget, *args): if len(state.db['badqs']) == 0: bot.msg(user, "No reports.") 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)) -@lib.hook('clearbadqs', glevel=lib.STAFF, needchan=False) -def cmd_clearbadqs(bot, user, chan, realtarget, *args): +@lib.hook(glevel=lib.STAFF, needchan=False) +def clearbadqs(bot, user, chan, realtarget, *args): state.db['badqs'] = [] bot.msg(user, "Cleared reports.") -@lib.hook('delbadq', glevel=lib.STAFF, needchan=False) +@lib.hook(glevel=lib.STAFF, needchan=False) @lib.argsEQ(1) -def cmd_delbadq(bot, user, chan, realtarget, *args): +def delbadq(bot, user, chan, realtarget, *args): qid = int(args[0]) del state.db['badqs'][qid] bot.msg(user, "Removed report #%d" % (qid)) -@lib.hook('rank', needchan=False) -def cmd_rank(bot, user, chan, realtarget, *args): +@lib.hook(needchan=False) +def rank(bot, user, chan, realtarget, *args): if chan is not None and realtarget == chan.name: replyto = chan else: replyto = user @@ -481,8 +498,8 @@ def cmd_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('top10', needchan=False) -def cmd_top10(bot, user, chan, realtarget, *args): +@lib.hook(needchan=False) +def top10(bot, user, chan, realtarget, *args): if len(state.db['ranks']) == 0: return bot.msg(state.db['chan'], "No one is ranked!") @@ -492,8 +509,8 @@ def cmd_top10(bot, user, chan, realtarget, *args): 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)) -@lib.hook('settarget', glevel=lib.ADMIN, needchan=False) -def cmd_settarget(bot, user, chan, realtarget, *args): +@lib.hook(glevel=lib.ADMIN, needchan=False) +def settarget(bot, user, chan, realtarget, *args): try: state.db['target'] = int(args[0]) bot.msg(state.db['chan'], "Target has been changed to %s points!" % (state.db['target'])) @@ -506,8 +523,8 @@ def cmd_settarget(bot, user, chan, realtarget, *args): print e bot.msg(user, "Failed to set target.") -@lib.hook('vote', needchan=False) -def cmd_vote(bot, user, chan, realtarget, *args): +@lib.hook(needchan=False) +def vote(bot, user, chan, realtarget, *args): if state.pointvote is not None: if int(args[0]) in state.voteamounts: state.voteamounts[int(args[0])] += 1 @@ -517,51 +534,57 @@ def cmd_vote(bot, user, chan, realtarget, *args): else: bot.msg(user, "There's no vote in progress.") -@lib.hook('maxmissed', glevel=lib.ADMIN, needchan=False) -def cmd_maxmissed(bot, user, chan, realtarget, *args): +@lib.hook(glevel=lib.ADMIN, needchan=False) +def maxmissed(bot, user, chan, realtarget, *args): try: state.db['maxmissedquestions'] = int(args[0]) bot.msg(state.db['chan'], "Max missed questions before round ends has been changed to %s." % (state.db['maxmissedquestions'])) except: bot.msg(user, "Failed to set maxmissed.") -@lib.hook('hinttimer', glevel=lib.ADMIN, needchan=False) -def cmd_hinttimer(bot, user, chan, realtarget, *args): +@lib.hook(glevel=lib.ADMIN, needchan=False) +def hinttimer(bot, user, chan, realtarget, *args): try: state.db['hinttimer'] = float(args[0]) bot.msg(state.db['chan'], "Time between hints has been changed to %s." % (state.db['hinttimer'])) except: bot.msg(user, "Failed to set hint timer.") -@lib.hook('hintnum', glevel=lib.ADMIN, needchan=False) -def cmd_hintnum(bot, user, chan, realtarget, *args): +@lib.hook(glevel=lib.ADMIN, needchan=False) +def hintnum(bot, user, chan, realtarget, *args): try: state.db['hintnum'] = int(args[0]) bot.msg(state.db['chan'], "Max number of hints has been changed to %s." % (state.db['hintnum'])) except: bot.msg(user, "Failed to set hintnum.") -@lib.hook('questionpause', glevel=lib.ADMIN, needchan=False) -def cmd_questionpause(bot, user, chan, realtarget, *args): +@lib.hook(glevel=lib.ADMIN, needchan=False) +def questionpause(bot, user, chan, realtarget, *args): try: state.db['questionpause'] = float(args[0]) bot.msg(state.db['chan'], "Pause between questions has been changed to %s." % (state.db['questionpause'])) except: bot.msg(user, "Failed to set questionpause.") -@lib.hook('findq', glevel=1, needchan=False) -def cmd_findquestion(bot, user, chan, realtarget, *args): - matches = [str(i) for i in range(len(state.db['questions'])) if state.db['questions'][i][0] == ' '.join(args)] #TODO looser equality check - if len(matches) > 1: +@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) > 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])) else: bot.msg(user, "No match.") -@lib.hook('delq', glevel=lib.STAFF, needchan=False) -@lib.hook('deleteq', glevel=lib.STAFF, needchan=False) -def cmd_deletequestion(bot, user, chan, realtarget, *args): +@lib.hook(('delq', 'deleteq'), glevel=lib.STAFF, needchan=False) +def delq(bot, user, chan, realtarget, *args): try: backup = state.db['questions'][int(args[0])] del state.db['questions'][int(args[0])] @@ -569,8 +592,8 @@ def cmd_deletequestion(bot, user, chan, realtarget, *args): except: bot.msg(user, "Couldn't delete that question.") -@lib.hook('addq', glevel=lib.STAFF, needchan=False) -def cmd_addquestion(bot, user, chan, realtarget, *args): +@lib.hook(glevel=lib.STAFF, needchan=False) +def addq(bot, user, chan, realtarget, *args): line = ' '.join([str(arg) for arg in args]) linepieces = line.split('*') if len(linepieces) < 2: @@ -582,13 +605,13 @@ def cmd_addquestion(bot, user, chan, realtarget, *args): bot.msg(user, "Done. Question is #%s" % (len(state.db['questions'])-1)) -@lib.hook('triviahelp', needchan=False) -def cmd_triviahelp(bot, user, chan, realtarget, *args): +@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.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: