X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/7b832b55f4d31b9bb12de3c555eb9636d40c52c5..3b51ce573ec339152de082d38d87ae0632931215:/modules/trivia.py

diff --git a/modules/trivia.py b/modules/trivia.py
index c09e33a..6b131cd 100644
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -49,22 +49,22 @@ class TriviaState(object):
 			self.gotParent(parent, pointvote)
 
 	def gotParent(self, parent, pointvote=False):
-		self.parent = parent
-		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
-		self.hintsgiven = 0
+		self.parent              = parent
+		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
+		self.hintsgiven          = 0
 		self.revealpossibilities = None
-		self.gameover = False
-		self.missedquestions = 0
-		self.curqid = None
-		self.lastqid = None
+		self.gameover            = False
+		self.missedquestions     = 0
+		self.curqid              = None
+		self.lastqid             = None
 
 		if 'starttime' not in self.db or self.db['starttime'] is None:
 			self.db['starttime'] = time.time()
@@ -131,6 +131,9 @@ class TriviaState(object):
 		except IndexError: pass
 		except Exception as e: msg("DERP! %r" % (e))
 
+		self.db['lastwinner'] = winner
+		self.db['lastwon'] = time.time()
+
 		if self.db['hofpath'] is not None and self.db['hofpath'] != '':
 			self.writeHof()
 
@@ -255,9 +258,9 @@ class TriviaState(object):
 		nextq[1] = nextq[1].lower()
 
 		qtext = "\00304,01Next up: "
-		if nextqid is not None:
-			qtext += "(%d) " % (nextqid)
+		qtext += "(%5d)" % (random.randint(0,99999))
 		qary = nextq[0].split(None)
+		qtext += " "
 		for qword in qary:
 			qtext += "\00304,01"+qword+"\00301,01"+chr(random.randrange(0x61,0x7A)) #a-z
 		self.getbot().msg(self.chan, qtext)
@@ -376,7 +379,11 @@ def 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]))
+		if user.glevel >= lib.STAFF:
+			respstr = "Done. Next question is: %s" % (state.nextq[0])
+		else:
+			respstr = "Done."
+		bot.msg(user, respstr)
 	except Exception as e:
 		bot.msg(user, "Error: %s" % (e))
 
@@ -561,9 +568,15 @@ 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 a search string.")
+		return
+
 	searcher = re.compile(' '.join(args))
 	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) > 1:
+	if len(matches) > 25:
+		bot.msg(user, "Too many matches! (>25)")
+	elif len(matches) > 1:
 		bot.msg(user, "Multiple matches: %s" % (', '.join(matches)))
 	elif len(matches) == 1:
 		bot.msg(user, "One match: %s" % (matches[0]))
@@ -598,7 +611,7 @@ def triviahelp(bot, user, chan, realtarget, *args):
 	bot.msg(user,             "TOP10")
 	bot.msg(user,             "POINTS        [<user>]")
 	bot.msg(user,             "RANK          [<user>]")
-	bot.msg(user,             "BADQ          <id> <reason>")
+	bot.msg(user,             "BADQ          <reason> (include info to identify question)")
 	if user.glevel >= 1:
 		bot.msg(user,         "SKIP                            (>=KNOWN)")
 		bot.msg(user,         "STOP                            (>=KNOWN)")
@@ -650,6 +663,8 @@ def num_TOPIC(bot, textline):
 			"%s (%s, %s)" % (person(x), pts(x), country(x))
 			for x in range(10) if x < len(state.db['ranks'])
 		]),
+		'lastwinner': state.db['lastwinner'],
+		'lastwon': time.strftime("%b %d", time.gmtime(state.db['lastwon'])),
 		'target': state.db['target'],
 	}
 	if gottopic != formatted: