]> jfr.im git - erebus.git/blobdiff - modules/trivia.py
trivia bugfix
[erebus.git] / modules / trivia.py
index 35b83fb7790adf5e12bb28fc974cec92f6c33703..f7e6a698716b7d269add3234bec586cd72440102 100644 (file)
@@ -14,23 +14,24 @@ modinfo = {
 import modlib
 lib = modlib.modlib(__name__)
 def modstart(parent, *args, **kwargs):
-       state.parent = parent
+       state.gotParent(parent)
+       lib.hookchan(state.db['chan'])(trivia_checkanswer) # we need parent for this. so it goes here.
        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
-import json, random, threading, re, time
+import json, random, threading, re, time, datetime
 
 try:
-       import twitter
-       hastwitter = True
-except ImportError:
-       hastwitter = False
+       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
        parts = haystack.split(needle, n+1)
@@ -38,14 +39,23 @@ 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, questionfile, parent=None):
+       def __init__(self, parent=None, pointvote=False):
+               if parent is not None:
+                       self.gotParent(parent, pointvote)
+
+       def gotParent(self, parent, pointvote=False):
                self.parent = parent
-               self.questionfile = questionfile
-               self.db = json.load(open(questionfile, "r"))
+               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
@@ -54,11 +64,27 @@ class TriviaState(object):
                self.gameover = False
                self.missedquestions = 0
 
+               if 'starttime' not in self.db or self.db['starttime'] is None:
+                       self.db['starttime'] = time.time()
+
+               if pointvote:
+                       self.getchan().msg("Vote for the next round target points! Options: %s. Vote using !vote <choice>" % (', '.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.start()
+               else:
+                       self.pointvote = None
+
        def __del__(self):
                self.closeshop()
        def closeshop(self):
-               if threading is not None and threading._Timer is not None and isinstance(self.steptimer, threading._Timer):
-                       self.steptimer.cancel()
+               if threading is not None and threading._Timer is not None:
+                       if isinstance(self.steptimer, threading._Timer):
+                               self.steptimer.cancel()
+                       if isinstance(self.nextquestiontimer, threading._Timer):
+                               self.nextquestiontimer.cancel()
+                               self.nextquestiontimer = None
                if json is not None and json.dump is not None:
                        json.dump(self.db, open(self.questionfile, "w"))#, indent=4, separators=(',', ': '))
 
@@ -92,9 +118,7 @@ class TriviaState(object):
                        self.steptimer.start()
 
        def doGameOver(self):
-               def msg(line): self.getbot().msg(self.getchan(), line)
-               def person(num): return self.db['users'][self.db['ranks'][num]]['realnick']
-               def pts(num): return self.db['users'][self.db['ranks'][num]]['points']
+               msg = self.getchan().msg
                winner = person(0)
                try:
                        msg("\00312THE GAME IS OVER!!!")
@@ -105,31 +129,88 @@ class TriviaState(object):
                except IndexError: pass
                except Exception as e: msg("DERP! %r" % (e))
 
+               if self.db['hofpath'] is not None and self.db['hofpath'] != '':
+                       self.writeHof()
+
                self.db['users'] = {}
                self.db['ranks'] = []
                stop()
                self.closeshop()
 
-               if hastwitter:
+               try:
                        t = twitter.Twitter(auth=twitter.OAuth(self.getbot().parent.cfg.get('trivia', 'token'),
                                self.getbot().parent.cfg.get('trivia', 'token_sec'),
                                self.getbot().parent.cfg.get('trivia', 'con'),
                                self.getbot().parent.cfg.get('trivia', 'con_sec')))
                        t.statuses.update(status="Round is over! The winner was %s" % (winner))
+               except: pass #don't care if errors happen updating twitter.
+
+               self.__init__(self.parent, True)
 
-               self.__init__(self.questionfile, self.parent)
+       def writeHof(self):
+               def person(num):
+                       try: return self.db['users'][self.db['ranks'][num]]['realnick']
+                       except: return "none"
+               def pts(num):
+                       try: return str(self.db['users'][self.db['ranks'][num]]['points'])
+                       except: return 0
 
-       def nextquestion(self, qskipped=False, iteration=0):
+               try:
+                       f = open(self.db['hofpath'], 'rb+')
+                       for i in range(self.db['hoflines']): #skip this many lines
+                               f.readline()
+                       insertpos = f.tell()
+                       fcontents = f.read()
+                       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'])),
+                               'targetscore': self.db['target'],
+                               'firstperson': person(0),
+                               'firstscore': pts(0),
+                               'secondperson': person(1),
+                               'secondscore': pts(1),
+                               'thirdperson': person(2),
+                               'thirdscore': pts(2),
+                       })
+                       f.write(fcontents)
+                       return True
+               except Exception as e:
+                       raise e
+                       return False
+               finally:
+                       f.close()
+
+       def endPointVote(self):
+               self.getchan().msg("Voting has ended!")
+               votelist = sorted(self.voteamounts.items(), key=lambda item: item[1]) #sort into list of tuples: [(option, number_of_votes), ...]
+               for i in range(len(votelist)-1):
+                       item = votelist[i]
+                       self.getchan().msg("%s place: %s (%s votes)" % (len(votelist)-i, item[0], item[1]))
+               self.getchan().msg("Aaaaand! The next round will be to \002%s\002 points! (%s votes)" % (votelist[-1][0], votelist[-1][1]))
+
+               self.db['target'] = votelist[-1][0]
+               self.pointvote = None
+
+               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:
-                       self.getbot().msg(self.getchan(), "\00304Fail! The correct answer was: %s" % (self.hintanswer))
+                       self.getchan().msg("\00304Fail! The correct answer was: %s" % (self.hintanswer))
                        self.missedquestions += 1
                else:
                        self.missedquestions = 0
+                       if 'topicformat' in self.db and self.db['topicformat'] is not None:
+                               self.getbot().conn.send("TOPIC %s" % (self.db['chan']))
 
                if isinstance(self.steptimer, threading._Timer):
                        self.steptimer.cancel()
+               if isinstance(self.nextquestiontimer, threading._Timer):
+                       self.nextquestiontimer.cancel()
+                       self.nextquestiontimer = None
 
                self.hintstr = None
                self.hintsgiven = 0
@@ -138,33 +219,49 @@ 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 state.nextq is not None:
-                       nextq = state.nextq
-                       state.nextq = None
+               if skipwait:
+                       self._nextquestion(iteration)
+               else:
+                       self.nextquestiontimer = threading.Timer(self.db['questionpause'], self._nextquestion, args=[iteration])
+                       self.nextquestiontimer.start()
+
+       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['question'][0] == "!":
+               if nextq[0][0] == "!":
+                       nextqid = None
                        nextq = specialQuestion(nextq)
 
-               if iteration < 10 and 'lastasked' in nextq and nextq['lastasked'] - time.time() < 24*60*60:
-                       return self.nextquestion(iteration=iteration+1) #short-circuit to pick another question
-               nextq['lastasked'] = time.time()
+               if len(nextq) > 2 and nextq[2] - time.time() < 7*24*60*60 and iteration < 10:
+                       return self._nextquestion(iteration=iteration+1) #short-circuit to pick another question
+               if len(nextq) > 2:
+                       nextq[2] = time.time()
+               else:
+                       nextq.append(time.time())
 
-               nextq['answer'] = nextq['answer'].lower()
+               nextq[1] = nextq[1].lower()
 
                qtext = "\00304,01Next up: "
-               qary = nextq['question'].split(None)
+               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
                self.getbot().msg(self.chan, qtext)
 
                self.curq = nextq
 
-               if isinstance(self.curq['answer'], basestring): self.hintanswer = self.curq['answer']
-               else: self.hintanswer = random.choice(self.curq['answer'])
+               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.start()
@@ -172,26 +269,26 @@ class TriviaState(object):
        def checkanswer(self, answer):
                if self.curq is None:
                        return False
-               elif isinstance(self.curq['answer'], basestring):
-                       return answer.lower() == self.curq['answer']
+               elif isinstance(self.curq[1], basestring):
+                       return answer.lower() == self.curq[1]
                else: # assume it's a list or something.
-                       return answer.lower() in self.curq['answer']
+                       return answer.lower() in self.curq[1]
 
-       def addpoint(self, _user, count=1):
-               _user = str(_user)
-               user = _user.lower()
+       def addpoint(self, user_obj, count=1):
+               user_nick = str(user_obj)
+               user = user_nick.lower() # save this separately as we use both
                if user in self.db['users']:
                        self.db['users'][user]['points'] += count
                else:
-                       self.db['users'][user] = {'points': count, 'realnick': _user, 'rank': len(self.db['ranks'])}
+                       self.db['users'][user] = {'points': count, 'realnick': user_nick, 'rank': len(self.db['ranks'])}
                        self.db['ranks'].append(user)
 
-               self.db['ranks'].sort(key=lambda nick: state.db['users'][nick]['points'], reverse=True)
+               self.db['ranks'].sort(key=lambda nick: self.db['users'][nick]['points'], reverse=True) #re-sort ranks, rather than dealing with anything more efficient
                for i in range(0, len(self.db['ranks'])):
                        nick = self.db['ranks'][i]
                        self.db['users'][nick]['rank'] = i
 
-               if self.db['users'][user]['points'] >= state.db['target']:
+               if self.db['users'][user]['points'] >= self.db['target']:
                        self.gameover = True
 
                return self.db['users'][user]['points']
@@ -235,12 +332,13 @@ class TriviaState(object):
                else:
                        return self.db['users'][self.db['ranks'][-1]]['points']
 
-state = TriviaState("/home/jrunyon/erebus/modules/trivia.json") #TODO get path from config
+state = TriviaState()
 
-@lib.hookchan(state.db['chan'])
+# we have to hook this in modstart, since we don't know the channel until then.
 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)))
@@ -248,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]
@@ -256,7 +354,7 @@ def cmd_points(bot, user, chan, realtarget, *args):
 
        bot.msg(replyto, "%s has %d points." % (who, state.points(who)))
 
-@lib.hook('give', clevel=lib.OP, needchan=False)
+@lib.hook('give', glevel=lib.STAFF, needchan=False)
 @lib.argsGE(1)
 def cmd_give(bot, user, chan, realtarget, *args):
        whoto = args[0]
@@ -268,7 +366,16 @@ 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('setnext', clevel=lib.OP, needchan=False)
+@lib.hook('setnextid', glevel=1, needchan=False)
+def cmd_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]))
+       except Exception as e:
+               bot.msg(user, "Error: %s" % (e))
+
+@lib.hook('setnext', glevel=lib.STAFF, needchan=False)
 @lib.argsGE(1)
 def cmd_setnext(bot, user, chan, realtarget, *args):
        line = ' '.join([str(arg) for arg in args])
@@ -278,25 +385,31 @@ def cmd_setnext(bot, user, chan, realtarget, *args):
                return
        question = linepieces[0].strip()
        answer = linepieces[1].strip()
-       state.nextq = {'question':question,'answer':answer}
+       state.nextq = [question, answer]
        bot.msg(user, "Done.")
 
-@lib.hook('skip', clevel=lib.KNOWN, needchan=False)
+@lib.hook('skip', glevel=1, needchan=False)
 def cmd_skip(bot, user, chan, realtarget, *args):
-       state.nextquestion(True)
+       state.nextquestion(qskipped=True, skipwait=True)
 
 @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 state.curq is None:
-               state.nextquestion()
+       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!")
        else:
                bot.msg(replyto, "Game is already started!")
 
-#FIXME @lib.hook('stop', clevel=lib.KNOWN, needchan=False)
-@lib.hook('stop', needchan=False) #FIXME
+@lib.hook('stop', glevel=1, needchan=False)
 def cmd_stop(bot, user, chan, realtarget, *args):
        if stop():
                bot.msg(state.chan, "Game stopped by %s" % (user))
@@ -304,19 +417,63 @@ def cmd_stop(bot, user, chan, realtarget, *args):
                bot.msg(user, "Game isn't running.")
 
 def stop():
-       if state.curq is not None:
-               state.curq = 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
+
+@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:
-                       state.steptimer.cancel()
+                       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:
-                       print "!!! steptimer.cancel(): e"
-               return True
-       else:
-               return False
+                       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]
@@ -329,21 +486,38 @@ 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', clevel=lib.MASTER, needchan=False)
+@lib.hook('settarget', glevel=lib.ADMIN, needchan=False)
 def cmd_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']))
-       except:
+
+               if state.pointvote is not None:
+                       state.pointvote.cancel()
+                       state.pointvote = None
+                       bot.msg(state.db['chan'], "Vote has been cancelled!")
+       except Exception as e:
+               print e
                bot.msg(user, "Failed to set target.")
 
-@lib.hook('maxmissed', clevel=lib.MASTER, needchan=False)
+@lib.hook('vote', needchan=False)
+def cmd_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
+                       bot.msg(user, "Your vote has been recorded.")
+               else:
+                       bot.msg(user, "Sorry - that's not an option!")
+       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):
        try:
                state.db['maxmissedquestions'] = int(args[0])
@@ -351,7 +525,7 @@ def cmd_maxmissed(bot, user, chan, realtarget, *args):
        except:
                bot.msg(user, "Failed to set maxmissed.")
 
-@lib.hook('hinttimer', clevel=lib.MASTER, needchan=False)
+@lib.hook('hinttimer', glevel=lib.ADMIN, needchan=False)
 def cmd_hinttimer(bot, user, chan, realtarget, *args):
        try:
                state.db['hinttimer'] = float(args[0])
@@ -359,7 +533,7 @@ def cmd_hinttimer(bot, user, chan, realtarget, *args):
        except:
                bot.msg(user, "Failed to set hint timer.")
 
-@lib.hook('hintnum', clevel=lib.MASTER, needchan=False)
+@lib.hook('hintnum', glevel=lib.ADMIN, needchan=False)
 def cmd_hintnum(bot, user, chan, realtarget, *args):
        try:
                state.db['hintnum'] = int(args[0])
@@ -367,9 +541,17 @@ def cmd_hintnum(bot, user, chan, realtarget, *args):
        except:
                bot.msg(user, "Failed to set hintnum.")
 
-@lib.hook('findq', clevel=lib.KNOWN, needchan=False)
+@lib.hook('questionpause', glevel=lib.ADMIN, needchan=False)
+def cmd_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]['question'] == ' '.join(args)] #FIXME: looser equality check
+       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:
                bot.msg(user, "Multiple matches: %s" % (', '.join(matches)))
        elif len(matches) == 1:
@@ -377,17 +559,17 @@ def cmd_findquestion(bot, user, chan, realtarget, *args):
        else:
                bot.msg(user, "No match.")
 
-@lib.hook('delq', clevel=lib.OP, needchan=False)
-@lib.hook('deleteq', clevel=lib.OP, needchan=False)
+@lib.hook('delq', glevel=lib.STAFF, needchan=False)
+@lib.hook('deleteq', glevel=lib.STAFF, needchan=False)
 def cmd_deletequestion(bot, user, chan, realtarget, *args):
        try:
                backup = state.db['questions'][int(args[0])]
                del state.db['questions'][int(args[0])]
-               bot.msg(user, "Deleted %s*%s" % (backup['question'], backup['answer']))
+               bot.msg(user, "Deleted %s*%s" % (backup[0], backup[1]))
        except:
                bot.msg(user, "Couldn't delete that question.")
 
-@lib.hook('addq', clevel=lib.OP, needchan=False)
+@lib.hook('addq', glevel=lib.STAFF, needchan=False)
 def cmd_addquestion(bot, user, chan, realtarget, *args):
        line = ' '.join([str(arg) for arg in args])
        linepieces = line.split('*')
@@ -396,7 +578,7 @@ def cmd_addquestion(bot, user, chan, realtarget, *args):
                return
        question = linepieces[0].strip()
        answer = linepieces[1].strip()
-       state.db['questions'].append({'question':question,'answer':answer})
+       state.db['questions'].append([question, answer])
        bot.msg(user, "Done. Question is #%s" % (len(state.db['questions'])-1))
 
 
@@ -404,41 +586,78 @@ def cmd_addquestion(bot, user, chan, realtarget, *args):
 def cmd_triviahelp(bot, user, chan, realtarget, *args):
        bot.msg(user,             "START")
        bot.msg(user,             "TOP10")
-       bot.msg(user,             "POINTS    [<user>]")
-       bot.msg(user,             "RANK      [<user>]")
-       if bot.parent.channel(state.db['chan']).levelof(user.auth) >= lib.KNOWN:
-               bot.msg(user,         "SKIP                        (>=KNOWN )")
-               bot.msg(user,         "STOP                        (>=KNOWN )")
-               bot.msg(user,         "FINDQ     <question>     (>=KNOWN )")
-               if bot.parent.channel(state.db['chan']).levelof(user.auth) >= lib.OP:
-                       bot.msg(user,     "GIVE      <user> [<points>] (>=OP    )")
-                       bot.msg(user,     "SETNEXT   <q>*<a>           (>=OP    )")
-                       bot.msg(user,     "ADDQ      <q>*<a>           (>=OP    )")
-                       bot.msg(user,     "DELETEQ   <q>*<a>           (>=OP    )  [aka DELQ]")
-                       if bot.parent.channel(state.db['chan']).levelof(user.auth) >= lib.MASTER:
-                               bot.msg(user, "SETTARGET <points>          (>=MASTER)")
-                               bot.msg(user, "MAXMISSED <questions>       (>=MASTER)")
-                               bot.msg(user, "HINTTIMER <float seconds>   (>=MASTER)")
-                               bot.msg(user, "HINTNUM   <hints>           (>=MASTER)")
+       bot.msg(user,             "POINTS        [<user>]")
+       bot.msg(user,             "RANK          [<user>]")
+       bot.msg(user,             "BADQ          <id> <reason>")
+       if user.glevel >= 1:
+               bot.msg(user,         "SKIP                            (>=KNOWN)")
+               bot.msg(user,         "STOP                            (>=KNOWN)")
+               bot.msg(user,         "FINDQ         <question>        (>=KNOWN)")
+               if user.glevel >= lib.STAFF:
+                       bot.msg(user,     "GIVE          <user> [<points>] (>=STAFF)")
+                       bot.msg(user,     "SETNEXT       <q>*<a>           (>=STAFF)")
+                       bot.msg(user,     "ADDQ          <q>*<a>           (>=STAFF)")
+                       bot.msg(user,     "DELETEQ       <q>*<a>           (>=STAFF)  [aka DELQ]")
+                       bot.msg(user,     "BADQS                           (>=STAFF)")
+                       bot.msg(user,     "CLEARBADQS                      (>=STAFF)")
+                       bot.msg(user,     "DELBADQ       <reportid>        (>=STAFF)")
+                       if user.glevel >= lib.ADMIN:
+                               bot.msg(user, "SETTARGET     <points>          (>=ADMIN)")
+                               bot.msg(user, "MAXMISSED     <questions>       (>=ADMIN)")
+                               bot.msg(user, "HINTTIMER     <float seconds>   (>=ADMIN)")
+                               bot.msg(user, "HINTNUM       <hints>           (>=ADMIN)")
+                               bot.msg(user, "QUESTIONPAUSE <float seconds>   (>=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...")
-       state.nextquestion(False)
+       state.nextquestion(qskipped=False, skipwait=True)
+
+@lib.hooknum(332)
+def num_TOPIC(bot, textline):
+       pieces = textline.split(None, 4)
+       chan = pieces[3]
+       if chan != state.db['chan']:
+               return
+       gottopic = pieces[4][1:]
+
+       formatted = state.db['topicformat'] % {
+               'chan': state.db['chan'],
+               '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:
+               state.getbot().conn.send("TOPIC %s :%s" % (state.db['chan'], formatted))
 
 
 def specialQuestion(oldq):
-       newq = {'question': oldq['question'], 'answer': oldq['answer']}
-       qtype = oldq['question'].upper()
+       newq = [oldq[0], oldq[1]]
+       qtype = oldq[0].upper()
 
        if qtype == "!MONTH":
-               newq['question'] = "What month is it currently (in UTC)?"
-               newq['answer'] = time.strftime("%B").lower()
+               newq[0] = "What month is it currently (in UTC)?"
+               newq[1] = time.strftime("%B", time.gmtime()).lower()
        elif qtype == "!MATH+":
                randnum1 = random.randrange(0, 11)
                randnum2 = random.randrange(0, 11)
-               newq['question'] = "What is %d + %d?" % (randnum1, randnum2)
-               newq['answer'] = spellout(randnum1+randnum2)
+               newq[0] = "What is %d + %d?" % (randnum1, randnum2)
+               newq[1] = spellout(randnum1+randnum2)
        return newq
 
 def spellout(num):