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

diff --git a/modules/trivia.py b/modules/trivia.py
index b23248c..0343418 100644
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -7,7 +7,7 @@ modinfo = {
 	'author': 'Erebus Team',
 	'license': 'public domain',
 	'compatible': [1], # compatible module API versions
-	'depends': [], # other modules required to work properly?
+	'depends': ['userinfo'], # other modules required to work properly?
 }
 
 # preamble
@@ -30,7 +30,7 @@ def modstop(*args, **kwargs):
 import json, random, threading, re, time, datetime
 
 try:
-	import twitter 
+	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
@@ -41,7 +41,12 @@ def findnth(haystack, needle, n): #http://stackoverflow.com/a/1884151
 
 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)
+def country(num, default="??"): return lib.mod('userinfo')._get(person(num), 'country', default=default)
+
+class MyTimer(threading._Timer):
+	def __init__(self, *args, **kwargs):
+		threading._Timer.__init__(self, *args, **kwargs)
+		self.daemon = True
 
 class TriviaState(object):
 	def __init__(self, parent=None, pointvote=False):
@@ -49,20 +54,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.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()
@@ -71,7 +78,7 @@ class TriviaState(object):
 			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 = MyTimer(self.db['votetimer'], self.endPointVote)
 			self.pointvote.start()
 		else:
 			self.pointvote = None
@@ -106,15 +113,15 @@ class TriviaState(object):
 			revealloc = findnth(''.join(self.hintstr), '*', revealcount)
 			self.revealpossibilities.remove(revealcount)
 			self.hintstr[revealloc] = answer[revealloc]
-		self.parent.channel(self.chan).bot.msg(self.chan, "\00304,01Here's a hint: %s" % (''.join(self.hintstr)))
+		self.parent.channel(self.chan).bot.fastmsg(self.chan, "\00304,01Here's a hint: %s" % (''.join(self.hintstr)))
 
 		self.hintsgiven += 1
 
 		if hintnum < self.db['hintnum']:
-			self.steptimer = threading.Timer(self.db['hinttimer'], self.nexthint, args=[hintnum+1])
+			self.steptimer = MyTimer(self.db['hinttimer'], self.nexthint, args=[hintnum+1])
 			self.steptimer.start()
 		else:
-			self.steptimer = threading.Timer(self.db['hinttimer'], self.nextquestion, args=[True])
+			self.steptimer = MyTimer(self.db['hinttimer'], self.nextquestion, args=[True])
 			self.steptimer.start()
 
 	def doGameOver(self):
@@ -129,6 +136,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()
 
@@ -195,11 +205,13 @@ class TriviaState(object):
 		self.nextquestion() #start the game!
 
 	def nextquestion(self, qskipped=False, iteration=0, skipwait=False):
+		self.lastqid = self.curqid
 		self.curq = None
+		self.curqid = None
 		if self.gameover == True:
 			return self.doGameOver()
 		if qskipped:
-			self.getchan().msg("\00304Fail! The correct answer was: %s" % (self.hintanswer))
+			self.getchan().fastmsg("\00304Fail! The correct answer was: %s" % (self.hintanswer))
 			self.missedquestions += 1
 		else:
 			self.missedquestions = 0
@@ -225,7 +237,7 @@ class TriviaState(object):
 		if skipwait:
 			self._nextquestion(iteration)
 		else:
-			self.nextquestiontimer = threading.Timer(self.db['questionpause'], self._nextquestion, args=[iteration])
+			self.nextquestiontimer = MyTimer(self.db['questionpause'], self._nextquestion, args=[iteration])
 			self.nextquestiontimer.start()
 
 	def _nextquestion(self, iteration):
@@ -251,19 +263,20 @@ 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)
+		self.getbot().fastmsg(self.chan, qtext)
 
 		self.curq = nextq
+		self.curqid = nextqid
 
 		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 = MyTimer(self.db['hinttimer'], self.nexthint, args=[1])
 		self.steptimer.start()
 
 	def checkanswer(self, answer):
@@ -339,13 +352,13 @@ 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)))
+		bot.fastmsg(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)))
 		state.nextquestion()
 
-@lib.hook('points', needchan=False)
-def cmd_points(bot, user, chan, realtarget, *args):
+@lib.hook(needchan=False)
+def points(bot, user, chan, realtarget, *args):
 	if chan is not None and realtarget == chan.name: replyto = chan
 	else: replyto = user
 
@@ -354,9 +367,9 @@ def cmd_points(bot, user, chan, realtarget, *args):
 
 	bot.msg(replyto, "%s has %d points." % (who, state.points(who)))
 
-@lib.hook('give', glevel=lib.STAFF, needchan=False)
+@lib.hook(glevel=lib.STAFF, needchan=False)
 @lib.argsGE(1)
-def cmd_give(bot, user, chan, realtarget, *args):
+def give(bot, user, chan, realtarget, *args):
 	whoto = args[0]
 	if len(args) > 1:
 		numpoints = int(args[1])
@@ -366,18 +379,22 @@ 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('setnextid', glevel=1, needchan=False)
-def cmd_setnextid(bot, user, chan, realtarget, *args):
+@lib.hook(glevel=1, needchan=False)
+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))
 
-@lib.hook('setnext', glevel=lib.STAFF, needchan=False)
+@lib.hook(glevel=lib.STAFF, needchan=False)
 @lib.argsGE(1)
-def cmd_setnext(bot, user, chan, realtarget, *args):
+def setnext(bot, user, chan, realtarget, *args):
 	line = ' '.join([str(arg) for arg in args])
 	linepieces = line.split('*')
 	if len(linepieces) < 2:
@@ -388,16 +405,21 @@ def cmd_setnext(bot, user, chan, realtarget, *args):
 	state.nextq = [question, answer]
 	bot.msg(user, "Done.")
 
-@lib.hook('skip', glevel=1, needchan=False)
-def cmd_skip(bot, user, chan, realtarget, *args):
+@lib.hook(glevel=1, needchan=False)
+def skip(bot, user, chan, realtarget, *args):
 	state.nextquestion(qskipped=True, skipwait=True)
 
-@lib.hook('start', needchan=False)
-def cmd_start(bot, user, chan, realtarget, *args):
+@lib.hook(needchan=False)
+def start(bot, user, chan, realtarget, *args):
 	if chan is not None and realtarget == chan.name: replyto = chan
 	else: replyto = user
 
+	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!")
@@ -411,6 +433,10 @@ def cmd_stop(bot, user, chan, realtarget, *args):
 	else:
 		bot.msg(user, "Game isn't running.")
 
+@lib.hook('exception')
+def cmd_exception(*args, **kwargs):
+	raise Exception()
+
 def stop():
 	try:
 		if state.curq is not None or state.nextq is not None:
@@ -431,43 +457,48 @@ def stop():
 	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(needchan=False)
+@lib.argsGE(1)
+def badq(bot, user, chan, realtarget, *args):
+	lastqid = state.lastqid
+	curqid = state.curqid
 
-@lib.hook('badqs', glevel=lib.STAFF, needchan=False)
-def cmd_badqs(bot, user, chan, realtarget, *args):
+	reason = ' '.join(args)
+	state.db['badqs'].append([lastqid, curqid, reason])
+	bot.msg(user, "Reported bad question.")
+
+@lib.hook(glevel=lib.STAFF, needchan=False)
+def 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:
 			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]))
+			bot.msg(user, "Report #%d: LastQ=%r CurQ=%r: %s" % (i, report[0], report[1], report[2]))
+			try: lq = state.db['questions'][int(report[0])]
+			except Exception as e: lq = (None,None)
+			try: cq = state.db['questions'][int(report[1])]
+			except Exception as e: cq = (None, None)
+			bot.msg(user, "- Last: %s*%s" % (lq[0], lq[1]))
+			bot.msg(user, "- Curr: %s*%s" % (cq[0], cq[1]))
 		except Exception as e:
 			bot.msg(user, "- Exception: %r" % (e))
 
-@lib.hook('clearbadqs', glevel=lib.STAFF, needchan=False)
-def cmd_clearbadqs(bot, user, chan, realtarget, *args):
+@lib.hook(glevel=lib.STAFF, needchan=False)
+def clearbadqs(bot, user, chan, realtarget, *args):
 	state.db['badqs'] = []
 	bot.msg(user, "Cleared reports.")
 
-@lib.hook('delbadq', glevel=lib.STAFF, needchan=False)
+@lib.hook(glevel=lib.STAFF, needchan=False)
 @lib.argsEQ(1)
-def cmd_delbadq(bot, user, chan, realtarget, *args):
+def 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):
+@lib.hook(needchan=False)
+def rank(bot, user, chan, realtarget, *args):
 	if chan is not None and realtarget == chan.name: replyto = chan
 	else: replyto = user
 
@@ -476,8 +507,8 @@ def cmd_rank(bot, user, chan, realtarget, *args):
 
 	bot.msg(replyto, "%s is in %d place (%s points). Target is: %s (%s points)." % (who, state.rank(who), state.points(who), state.targetuser(who), state.targetpoints(who)))
 
-@lib.hook('top10', needchan=False)
-def cmd_top10(bot, user, chan, realtarget, *args):
+@lib.hook(needchan=False)
+def top10(bot, user, chan, realtarget, *args):
 	if len(state.db['ranks']) == 0:
 		return bot.msg(state.db['chan'], "No one is ranked!")
 
@@ -487,8 +518,8 @@ def cmd_top10(bot, user, chan, realtarget, *args):
 	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', glevel=lib.ADMIN, needchan=False)
-def cmd_settarget(bot, user, chan, realtarget, *args):
+@lib.hook(glevel=lib.ADMIN, needchan=False)
+def 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']))
@@ -501,8 +532,8 @@ def cmd_settarget(bot, user, chan, realtarget, *args):
 		print e
 		bot.msg(user, "Failed to set target.")
 
-@lib.hook('vote', needchan=False)
-def cmd_vote(bot, user, chan, realtarget, *args):
+@lib.hook(needchan=False)
+def 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
@@ -512,51 +543,57 @@ def cmd_vote(bot, user, chan, realtarget, *args):
 	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):
+@lib.hook(glevel=lib.ADMIN, needchan=False)
+def maxmissed(bot, user, chan, realtarget, *args):
 	try:
 		state.db['maxmissedquestions'] = int(args[0])
 		bot.msg(state.db['chan'], "Max missed questions before round ends has been changed to %s." % (state.db['maxmissedquestions']))
 	except:
 		bot.msg(user, "Failed to set maxmissed.")
 
-@lib.hook('hinttimer', glevel=lib.ADMIN, needchan=False)
-def cmd_hinttimer(bot, user, chan, realtarget, *args):
+@lib.hook(glevel=lib.ADMIN, needchan=False)
+def hinttimer(bot, user, chan, realtarget, *args):
 	try:
 		state.db['hinttimer'] = float(args[0])
 		bot.msg(state.db['chan'], "Time between hints has been changed to %s." % (state.db['hinttimer']))
 	except:
 		bot.msg(user, "Failed to set hint timer.")
 
-@lib.hook('hintnum', glevel=lib.ADMIN, needchan=False)
-def cmd_hintnum(bot, user, chan, realtarget, *args):
+@lib.hook(glevel=lib.ADMIN, needchan=False)
+def hintnum(bot, user, chan, realtarget, *args):
 	try:
 		state.db['hintnum'] = int(args[0])
 		bot.msg(state.db['chan'], "Max number of hints has been changed to %s." % (state.db['hintnum']))
 	except:
 		bot.msg(user, "Failed to set hintnum.")
 
-@lib.hook('questionpause', glevel=lib.ADMIN, needchan=False)
-def cmd_questionpause(bot, user, chan, realtarget, *args):
+@lib.hook(glevel=lib.ADMIN, needchan=False)
+def 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][0] == ' '.join(args)] #TODO looser equality check
-	if len(matches) > 1:
+@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) > 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]))
 	else:
 		bot.msg(user, "No match.")
 
-@lib.hook('delq', glevel=lib.STAFF, needchan=False)
-@lib.hook('deleteq', glevel=lib.STAFF, needchan=False)
-def cmd_deletequestion(bot, user, chan, realtarget, *args):
+@lib.hook(('delq', 'deleteq'), glevel=lib.STAFF, needchan=False)
+def delq(bot, user, chan, realtarget, *args):
 	try:
 		backup = state.db['questions'][int(args[0])]
 		del state.db['questions'][int(args[0])]
@@ -564,8 +601,8 @@ def cmd_deletequestion(bot, user, chan, realtarget, *args):
 	except:
 		bot.msg(user, "Couldn't delete that question.")
 
-@lib.hook('addq', glevel=lib.STAFF, needchan=False)
-def cmd_addquestion(bot, user, chan, realtarget, *args):
+@lib.hook(glevel=lib.STAFF, needchan=False)
+def addq(bot, user, chan, realtarget, *args):
 	line = ' '.join([str(arg) for arg in args])
 	linepieces = line.split('*')
 	if len(linepieces) < 2:
@@ -577,13 +614,13 @@ def cmd_addquestion(bot, user, chan, realtarget, *args):
 	bot.msg(user, "Done. Question is #%s" % (len(state.db['questions'])-1))
 
 
-@lib.hook('triviahelp', needchan=False)
-def cmd_triviahelp(bot, user, chan, realtarget, *args):
+@lib.hook(needchan=False)
+def triviahelp(bot, user, chan, realtarget, *args):
 	bot.msg(user,             "START")
 	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)")
@@ -635,6 +672,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: