X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/00ccae727aee9c6e5781c54d732c0dafd7cecb85..0f8352dd7b9e7437ece92f72db01da146aabb51f:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index 4adff01..3e2b093 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -53,8 +53,9 @@ def pts(num): 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) + return lib.mod('userinfo')._get(person(num), 'country', default=default).upper() class MyTimer(threading._Timer): def __init__(self, *args, **kwargs): @@ -105,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=(',', ': ')) @@ -117,16 +121,19 @@ 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.fastmsg(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 @@ -147,7 +154,8 @@ class TriviaState(object): 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() @@ -199,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() @@ -273,7 +281,10 @@ 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 = "\00312,01Next up: " qtext += "(%5d)" % (random.randint(0,99999)) @@ -365,7 +376,10 @@ def trivia_checkanswer(bot, user, chan, *args): line = ' '.join([str(arg) for arg in args]) if state.checkanswer(line): state.curq = None - 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))) + 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() @@ -446,18 +460,18 @@ def cmd_stop(bot, user, chan, realtarget, *args): else: bot.msg(user, "Game isn't running.") -@lib.hook('exception') -def cmd_exception(*args, **kwargs): - raise Exception() - def stop(): state.curq = None state.nextq = None - try: state.steptimer.cancel() - except Exception as e: print "!!! steptimer.cancel(): %s %r" % (e,e) + try: + 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) + try: + state.nextquestiontimer.cancel() + except Exception as e: + print "!!! nextquestiontimer.cancel(): %s %r" % (e,e) state.nextquestiontimer = None return True @@ -469,6 +483,7 @@ 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) @@ -492,14 +507,19 @@ def badqs(bot, user, chan, realtarget, *args): @lib.hook(glevel=lib.STAFF, needchan=False) 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.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) def rank(bot, user, chan, realtarget, *args): @@ -519,7 +539,7 @@ 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)]) + 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) @@ -581,11 +601,26 @@ 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 the question.") + return + + searchkey = ' '.join(args).lower() + matches = [str(i) for i in range(len(state.db['questions'])) if state.db['questions'][i][0].lower() == searchkey] + if 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(glevel=1, needchan=False) +def findqre(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)) + searcher = re.compile(' '.join(args), re.IGNORECASE) 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)") @@ -596,14 +631,29 @@ def findq(bot, user, chan, realtarget, *args): else: bot.msg(user, "No match.") +@lib.hook(glevel=lib.STAFF, needchan=False) +def showq(bot, user, chan, realtarget, *args): + try: + qid = int(args[0]) + except: + bot.msg(user, "Specify a numeric question ID.") + return + try: + q = state.db['questions'][qid] + except: + bot.msg(user, "ID not valid.") + return + bot.msg(user, "%s: %s*%s" % (qid, q[0], q[1])) + @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])] + state.savedb() bot.msg(user, "Deleted %s*%s" % (backup[0], backup[1])) except: - bot.msg(user, "Couldn't delete that question.") + bot.msg(user, "Couldn't delete that question. %r" % (e)) @lib.hook(glevel=lib.STAFF, needchan=False) def addq(bot, user, chan, realtarget, *args): @@ -615,38 +665,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 (include info to identify question)") + 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.fastmsg(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)