X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/f8cc01248bbc0923ae8b52dfb259bb98a23eb01a..77a265cdce6e50ad965401f58a1a521f96b5377b:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index 7dd460c..f7e6a69 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -19,9 +19,11 @@ def modstart(parent, *args, **kwargs): return lib.modstart(parent, *args, **kwargs) def modstop(*args, **kwargs): global state - stop() - state.closeshop() - del state + try: + stop() + state.closeshop() + del state + except Exception: pass return lib.modstop(*args, **kwargs) # module code @@ -37,6 +39,10 @@ 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) + class TriviaState(object): def __init__(self, parent=None, pointvote=False): if parent is not None: @@ -44,7 +50,7 @@ class TriviaState(object): def gotParent(self, parent, pointvote=False): self.parent = parent - self.questionfile = self.parent.cfg.get('trivia', 'jsonpath') + 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 @@ -113,8 +119,6 @@ class TriviaState(object): def doGameOver(self): msg = self.getchan().msg - def person(num): return self.db['users'][self.db['ranks'][num]]['realnick'] - def pts(num): return str(self.db['users'][self.db['ranks'][num]]['points']) winner = person(0) try: msg("\00312THE GAME IS OVER!!!") @@ -191,6 +195,7 @@ class TriviaState(object): self.nextquestion() #start the game! def nextquestion(self, qskipped=False, iteration=0, skipwait=False): + self.curq = None if self.gameover == True: return self.doGameOver() if qskipped: @@ -214,24 +219,26 @@ class TriviaState(object): if self.missedquestions > self.db['maxmissedquestions']: stop() - self.getbot().msg(self.getchan(), "%d questions unanswered! Stopping the game.") + self.getbot().msg(self.getchan(), "%d questions unanswered! Stopping the game." % (self.missedquestions)) + return if skipwait: - self._nextquestion(qskipped, iteration) + self._nextquestion(iteration) else: - print "making timer" - self.nextquestiontimer = threading.Timer(self.db['questionpause'], self._nextquestion, args=[qskipped, iteration]) + self.nextquestiontimer = threading.Timer(self.db['questionpause'], self._nextquestion, args=[iteration]) self.nextquestiontimer.start() - def _nextquestion(self, qskipped, iteration): - print "_" + def _nextquestion(self, iteration): if self.nextq is not None: + nextqid = None nextq = self.nextq self.nextq = None else: - nextq = random.choice(self.db['questions']) + nextqid = random.randrange(0, len(self.db['questions'])) + nextq = self.db['questions'][nextqid] if nextq[0][0] == "!": + nextqid = None nextq = specialQuestion(nextq) if len(nextq) > 2 and nextq[2] - time.time() < 7*24*60*60 and iteration < 10: @@ -244,6 +251,8 @@ class TriviaState(object): nextq[1] = nextq[1].lower() qtext = "\00304,01Next up: " + if nextqid is not None: + qtext += "(%d) " % (nextqid) qary = nextq[0].split(None) for qword in qary: qtext += "\00304,01"+qword+"\00301,01"+chr(random.randrange(0x61,0x7A)) #a-z @@ -329,6 +338,7 @@ state = TriviaState() 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.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))) @@ -336,7 +346,7 @@ def trivia_checkanswer(bot, user, chan, *args): @lib.hook('points', needchan=False) def cmd_points(bot, user, chan, realtarget, *args): - if chan == realtarget: replyto = chan + if chan is not None and realtarget == chan.name: replyto = chan else: replyto = user if len(args) != 0: who = args[0] @@ -384,10 +394,15 @@ def cmd_skip(bot, user, chan, realtarget, *args): @lib.hook('start', needchan=False) def cmd_start(bot, user, chan, realtarget, *args): - if chan == realtarget: replyto = chan + if chan is not None and realtarget == chan.name: replyto = chan else: replyto = user + if chan is not None and chan.name != state.db['chan']: + bot.msg(replyto, "That command isn't valid here.") + return + if state.curq is None and state.pointvote is None and state.nextquestiontimer is None: + 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!") @@ -403,8 +418,9 @@ def cmd_stop(bot, user, chan, realtarget, *args): def stop(): try: - if state.curq is not None: + 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: @@ -420,9 +436,44 @@ 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('badqs', glevel=lib.STAFF, needchan=False) +def cmd_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])) + 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): + state.db['badqs'] = [] + bot.msg(user, "Cleared reports.") + +@lib.hook('delbadq', glevel=lib.STAFF, needchan=False) +@lib.argsEQ(1) +def cmd_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): - if chan == realtarget: replyto = chan + if chan is not None and realtarget == chan.name: replyto = chan else: replyto = user if len(args) != 0: who = args[0] @@ -435,11 +486,11 @@ def cmd_top10(bot, user, chan, realtarget, *args): if len(state.db['ranks']) == 0: return bot.msg(state.db['chan'], "No one is ranked!") - replylist = [] - for nick in state.db['ranks'][0:10]: - user = state.db['users'][nick] - replylist.append("%s (%s)" % (user['realnick'], user['points'])) - bot.msg(state.db['chan'], ', '.join(replylist)) + 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)) @lib.hook('settarget', glevel=lib.ADMIN, needchan=False) def cmd_settarget(bot, user, chan, realtarget, *args): @@ -533,16 +584,11 @@ def cmd_addquestion(bot, user, chan, realtarget, *args): @lib.hook('triviahelp', needchan=False) def cmd_triviahelp(bot, user, chan, realtarget, *args): - if user.glevel == 0: - bot.msg(user, "START") - bot.msg(user, "TOP10") - bot.msg(user, "POINTS []") - bot.msg(user, "RANK []") - else: - bot.msg(user, "START (ANYONE )") - bot.msg(user, "TOP10 (ANYONE )") - bot.msg(user, "POINTS [] (ANYONE )") - bot.msg(user, "RANK [] (ANYONE )") + bot.msg(user, "START") + bot.msg(user, "TOP10") + bot.msg(user, "POINTS []") + bot.msg(user, "RANK []") + bot.msg(user, "BADQ ") if user.glevel >= 1: bot.msg(user, "SKIP (>=KNOWN)") bot.msg(user, "STOP (>=KNOWN)") @@ -552,6 +598,9 @@ def cmd_triviahelp(bot, user, chan, realtarget, *args): 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)") if user.glevel >= lib.ADMIN: bot.msg(user, "SETTARGET (>=ADMIN)") bot.msg(user, "MAXMISSED (>=ADMIN)") @@ -574,9 +623,23 @@ def num_TOPIC(bot, textline): formatted = state.db['topicformat'] % { 'chan': state.db['chan'], - 'top': state.db['users'][state.db['ranks'][0]]['realnick'], - 'top3': '/'.join([state.db['users'][state.db['ranks'][x]]['realnick'] for x in range(3) if x < len(state.db['ranks'])]), - 'topscore': state.db['users'][state.db['ranks'][0]]['points'], + 'top1': "%s (%s)" % (person(0), pts(0)), + 'top3': '/'.join([ + "%s (%s)" % (person(x), pts(x)) + for x in range(3) if x < len(state.db['ranks']) + ]), + 'top3c': ' '.join([ + "%s (%s, %s)" % (person(x), pts(x), country(x)) + for x in range(3) if x < len(state.db['ranks']) + ]), + 'top10': ' '.join([ + "%s (%s)" % (person(x), pts(x)) + for x in range(10) if x < len(state.db['ranks']) + ]), + 'top10c': ' '.join([ + "%s (%s, %s)" % (person(x), pts(x), country(x)) + for x in range(10) if x < len(state.db['ranks']) + ]), 'target': state.db['target'], } if gottopic != formatted: