X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/4477123de1254afa80243f7f9eab62c5cbf7b786..bdf2b61fb24617e143cb65c37f2dd77a34dcde3c:/modules/trivia.py

diff --git a/modules/trivia.py b/modules/trivia.py
index 3e79db3..ae4bbad 100644
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -65,7 +65,7 @@ def pts(num):
 		return 0
 
 def country(num, default="??"):
-	return lib.mod('userinfo')._get(person(num), 'country', default=default).upper()
+	return lib.mod('userinfo').get(person(num), 'country', default=default).upper()
 
 class MyTimer(timerbase):
 	def __init__(self, *args, **kwargs):
@@ -101,8 +101,8 @@ class TriviaState(object):
 			self.db['lastwon'] = 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.getchan().fastmsg("Vote for the next round target points! Options: %s. Vote using !vote <choice>" % (', '.join([str(x) for x in self.db['targetoptions']])))
+			self.getchan().fastmsg("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 = MyTimer(self.db['votetimer'], self.endPointVote)
 			self.pointvote.start()
@@ -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):
@@ -334,9 +339,10 @@ class TriviaState(object):
 			)
 			qtext += "\00304,01"+qword+"\00301,01"+chr(spacer) #a-z
 		if not self.getbot().fastmsg(self.chan, qtext): #if message is too long:
-			if nextqid is None: nextqid = "manual"
-			self.getbot().slowmsg(self.chan, "(Unable to ask question #%s: line too long)" % (nextqid))
-			return self._nextquestion(iteration) #retry; don't increment the iteration
+			if not self.getbot().fastmsg(self.chan, "\00312,01Next up: " + ("(%5d)" % (random.randint(0,99999))) + "\00304,01" + nextq[0]):
+				if nextqid is None: nextqid = "manual"
+				self.getbot().slowmsg(self.chan, "(Unable to ask question #%s: line too long)" % (nextqid))
+				return self._nextquestion(iteration) #retry; don't increment the iteration
 
 		self.curq = nextq
 		self.curqid = nextqid
@@ -476,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")
@@ -497,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
@@ -606,7 +612,7 @@ def top10(bot, user, chan, realtarget, *args):
 	if max > 10:
 		max = 10
 	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))
+	bot.msg(state.db['chan'], "Game is to %s! Top 10: %s" % (state.db['target'], replylist))
 
 @lib.hook(glevel=lib.ADMIN, needchan=False)
 @lib.help("<target score>", "changes the target score for this round")
@@ -672,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("@"):
@@ -696,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("@"):