X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/b336e10881d2ba6afbe4b68187512fc2d4c17071..a33970f92236af6ed6a06f1781972ab11982d635:/modules/trivia.py

diff --git a/modules/trivia.py b/modules/trivia.py
index 1ad319e..30ec604 100644
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -331,6 +331,7 @@ class TriviaState(object):
 		elif self.nextqid is not None:
 			nextqid = self.nextqid
 			nextq = self.questions[nextqid]
+			if len(nextq) > 2: nextq[2] = 0 # Unset the time it was last asked.
 			self.nextqid = None
 		else:
 			nextqid = random.randrange(0, len(self.questions))
@@ -363,9 +364,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 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
+				if not self.getbot().fastmsg(self.chan, "Next up: " + 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
@@ -979,3 +981,14 @@ def spellout(num):
 #		"nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen",
 #		"sixteen", "seventeen", "eighteen", "nineteen", "twenty"
 #	][num]
+
+
+def topa():
+	answers=__import__('collections').defaultdict(int)
+	for a in (x[1] for x in state.db['questions']['general']):
+		 answers[a]+=1;
+	a2=[]
+	for a, num in answers.items():
+		a2.append((a, num))
+	a2.sort(key=lambda v: v[1], reverse=True)
+	return a2