fix subtext regex

[erebus.git] / modules / trivia.py

diff --git a/modules/trivia.py b/modules/trivia.py
index 4732a1bdde70f8053cf8d48393bfa86f76c924ef..2f3fb77c2c0519c71bc108c57af7868312f954a4 100644 (file)
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -159,11 +159,13 @@ class TriviaState(object):
                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]
+               try:
+                       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]
+               except IndexError: pass # if everything is revealed, random.choice will IndexError
                if oldhintstr != ''.join(self.hintstr): self.getchan().fastmsg("\00304,01Here's a hint: %s" % (''.join(self.hintstr)))
 
                self.hintsgiven += 1
@@ -196,6 +198,7 @@ class TriviaState(object):
 
                self.db['users'] = {}
                self.db['ranks'] = []
+               self.savedb()
                stop()
                self.closeshop()
 
@@ -218,6 +221,7 @@ class TriviaState(object):
                        except: return 0
 
                status = False
+               f = None
                try:
                        f = open(self.db['hofpath'], 'rb+')
                        for i in range(self.db['hoflines']): #skip this many lines
@@ -241,7 +245,8 @@ class TriviaState(object):
                except Exception as e:
                        status = False
                finally:
-                       f.close()
+                       if f is not None:
+                               f.close()
                        return status
 
        def endPointVote(self):
@@ -477,7 +482,7 @@ def setnextid(bot, user, chan, realtarget, *args):
                bot.msg(user, "Error: no such QID.")
                return
        state.nextqid = qid
-       bot.msg(user, "Done. Next question is %d: %s" % (qid, state.questions[qid][0]))
+       bot.msg(user, "Done. Next question is %d: %s" % (qid, state.questions[qid][0]), truncate=True)
 
 @lib.hook(glevel=lib.STAFF, needchan=False)
 @lib.help("<q>*<a>", "sets next question to one not in database")
@@ -498,7 +503,7 @@ def setnext(bot, user, chan, realtarget, *args):
 def skip(bot, user, chan, realtarget, *args):
        state.nextquestion(qskipped=True, skipwait=True)
 
-@lib.hook(needchan=False, wantchan=True)
+@lib.hook(('start','trivia'), needchan=False, wantchan=True)
 @lib.help(None, "starts the trivia game")
 def start(bot, user, chan, realtarget, *args):
        if chan is not None: replyto = chan
@@ -673,7 +678,8 @@ def questionpause(bot, user, chan, realtarget, *args):
                bot.msg(user, "Failed to set questionpause.")
 
 @lib.hook(glevel=1, needchan=False)
-@lib.help("<full question>", "finds a qid given a complete question")
+@lib.help("[@category] <full question>", "finds a qid given a complete question")
+@lib.argsGE(1)
 def findq(bot, user, chan, realtarget, *args):
        args = list(args)
        if args[0].startswith("@"):
@@ -697,6 +703,7 @@ def findq(bot, user, chan, realtarget, *args):
 
 @lib.hook(glevel=1, needchan=False)
 @lib.help("[@<category>] <regex>", "finds a qid given a regex or partial question")
+@lib.argsGE(1)
 def findqre(bot, user, chan, realtarget, *args):
        args = list(args)
        if args[0].startswith("@"):
@@ -740,7 +747,7 @@ def showq(bot, user, chan, realtarget, *args):
        except:
                bot.msg(user, "ID not valid.")
                return
-       bot.msg(user, "%s: %s*%s" % (qid, q[0], q[1]))
+       bot.msg(user, "%s: %s*%s" % (qid, q[0], q[1]), True)
 
 @lib.hook(('delq', 'deleteq'), glevel=lib.STAFF, needchan=False)
 @lib.help("[@<category>] <qid>", "removes a question from the database")