X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/4d98501a23d9ef19d7914307c1c10f3b173bec60..4b5f28dde311d1f8cc5cce200329207e95f4d8f0:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index 255aa25..1f949bd 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -6,8 +6,9 @@ modinfo = { 'author': 'Erebus Team', 'license': 'public domain', - 'compatible': [1], # compatible module API versions - 'depends': ['userinfo'], # other modules required to work properly? + 'compatible': [2], + 'depends': ['userinfo'], + 'softdeps': ['help'], } # preamble @@ -27,7 +28,7 @@ def modstop(*args, **kwargs): return lib.modstop(*args, **kwargs) # module code -import json, random, threading, re, time, datetime +import json, random, threading, re, time, datetime, os try: import twitter @@ -71,6 +72,7 @@ class TriviaState(object): self.parent = parent self.questionfile = self.parent.cfg.get('trivia', 'jsonpath', default="./modules/trivia.json") self.db = json.load(open(self.questionfile, "r")) + self.questions = self.db['questions'][self.db['category']] self.chan = self.db['chan'] self.curq = None self.nextq = None @@ -97,20 +99,39 @@ class TriviaState(object): else: self.pointvote = None - def __del__(self): - self.closeshop() +# def __del__(self): +# self.closeshop() def closeshop(self): - if threading is not None and threading._Timer is not None: - if isinstance(self.steptimer, threading._Timer): - self.steptimer.cancel() - if isinstance(self.nextquestiontimer, threading._Timer): - self.nextquestiontimer.cancel() - self.nextquestiontimer = None - self.savedb() + try: + self.steptimer.cancel() + self.steptimer = None + except: pass + try: + self.nextquestiontimer.cancel() + self.nextquestiontimer = None + except: pass - def savedb(self): + def savedb(self): #returns whether or not it was able to save if json is not None and json.dump is not None: - json.dump(self.db, open(self.questionfile, "w"))#, indent=4, separators=(',', ': ')) +# json.dump(self.db, open(self.questionfile, "w"))#, indent=4, separators=(',', ': ')) + dbjson = json.dumps(self.db) + if len(dbjson) > 0: + os.rename(self.questionfile, self.questionfile+".auto.bak") + tmpfn = os.tempnam('.', 'trivia') + try: + f = open(tmpfn, "w") + f.write(dbjson) + f.close() + os.rename(tmpfn, self.questionfile) + return True + except: #if something happens, restore the backup + os.rename(self.questionfile+".auto.bak", self.questionfile) + try: + os.unlink(tmpfn) + except OSError: # temp file is already gone + pass + raise # we may be better off just swallowing exceptions? + return False def getchan(self): return self.parent.channel(self.chan) @@ -186,6 +207,7 @@ class TriviaState(object): try: return str(self.db['users'][self.db['ranks'][num]]['points']) except: return 0 + status = False try: f = open(self.db['hofpath'], 'rb+') for i in range(self.db['hoflines']): #skip this many lines @@ -205,12 +227,12 @@ class TriviaState(object): 'thirdscore': pts(2), }) f.write(fcontents) - return True + status = True except Exception as e: - raise e #FIXME wtf??? - return False + status = False finally: f.close() + return status def endPointVote(self): self.getchan().msg("Voting has ended!") @@ -239,9 +261,9 @@ class TriviaState(object): if 'topicformat' in self.db and self.db['topicformat'] is not None: self.getbot().conn.send("TOPIC %s" % (self.db['chan'])) - if isinstance(self.steptimer, threading._Timer): + if isinstance(self.steptimer, MyTimer): self.steptimer.cancel() - if isinstance(self.nextquestiontimer, threading._Timer): + if isinstance(self.nextquestiontimer, MyTimer): self.nextquestiontimer.cancel() self.nextquestiontimer = None @@ -250,6 +272,8 @@ class TriviaState(object): self.revealpossibilities = None self.reveal = None + self.savedb() + if self.missedquestions > self.db['maxmissedquestions']: stop() self.getbot().msg(self.getchan(), "%d questions unanswered! Stopping the game." % (self.missedquestions)) @@ -267,14 +291,14 @@ class TriviaState(object): nextq = self.nextq self.nextq = None else: - nextqid = random.randrange(0, len(self.db['questions'])) - nextq = self.db['questions'][nextqid] + nextqid = random.randrange(0, len(self.questions)) + nextq = self.questions[nextqid] - if nextq[0][0] == "!": + if nextq[0].startswith("!"): nextqid = None nextq = specialQuestion(nextq) - if len(nextq) > 2 and nextq[2] - time.time() < 7*24*60*60 and iteration < 10: + if len(nextq) > 2 and time.time() - nextq[2] < 7*24*60*60 and iteration < 10: return self._nextquestion(iteration=iteration+1) #short-circuit to pick another question if len(nextq) > 2: nextq[2] = time.time() @@ -291,7 +315,10 @@ class TriviaState(object): qary = nextq[0].split(None) qtext += " " for qword in qary: - qtext += "\00304,01"+qword+"\00301,01"+chr(random.randrange(0x61,0x7A)) #a-z + spacer = random.choice( + range(0x61,0x7A) + ([0x20]*4) + ) + qtext += "\00304,01"+qword+"\00301,01"+chr(spacer) #a-z self.getbot().fastmsg(self.chan, qtext) self.curq = nextq @@ -363,11 +390,11 @@ class TriviaState(object): if user in self.db['users']: rank = self.db['users'][user]['rank'] if rank == 0: - return "N/A" + return "" else: - return self.db['users'][self.db['ranks'][rank-1]]['points'] + return "("+str(self.db['users'][self.db['ranks'][rank-1]]['points'])+")" else: - return self.db['users'][self.db['ranks'][-1]]['points'] + return "("+str(self.db['users'][self.db['ranks'][-1]]['points'])+")" state = TriviaState() @@ -377,16 +404,28 @@ def trivia_checkanswer(bot, user, chan, *args): if state.checkanswer(line): state.curq = None if state.hintanswer.lower() == line.lower(): - 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))) + 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))) else: - bot.fastmsg(chan, "\00312%s\003 has it! The answer was \00312%s\003 (hinted answer: %s). New score: %d. Rank: %d. Target: %s (%s)." % (user, line, state.hintanswer, 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 (hinted answer: %s). New score: %d. Rank: %d. Target: %s%s" % (user, line, state.hintanswer, 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(needchan=False) +@lib.hook(glevel=1, needchan=False, wantchan=True) +@lib.help(None, "saves the trivia database") +def save(bot, user, chan, realtarget, *args): + if chan is not None: replyto = chan + else: replyto = user + + if state.savedb(): + bot.msg(replyto, "Save successful.") + else: + bot.msg(replyto, "Save failed!") + +@lib.hook(needchan=False, wantchan=True) +@lib.help("[]", "shows how many points you or someone has") def points(bot, user, chan, realtarget, *args): - if chan is not None and realtarget == chan.name: replyto = chan + if chan is not None: eplyto = chan else: replyto = user if len(args) != 0: who = args[0] @@ -395,6 +434,7 @@ def points(bot, user, chan, realtarget, *args): bot.msg(replyto, "%s has %d points." % (who, state.points(who))) @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.help(" []", "gives someone points", "defaults to 1 point") @lib.argsGE(1) def give(bot, user, chan, realtarget, *args): whoto = args[0] @@ -407,10 +447,12 @@ def give(bot, user, chan, realtarget, *args): bot.msg(chan, "%s gave %s %d points. New balance: %d" % (user, whoto, numpoints, balance)) @lib.hook(glevel=1, needchan=False) +@lib.help("", "sets next question to one in the database") +@lib.argsEQ(1) def setnextid(bot, user, chan, realtarget, *args): try: qid = int(args[0]) - state.nextq = state.db['questions'][qid] + state.nextq = state.questions[qid] if user.glevel >= lib.STAFF: respstr = "Done. Next question is: %s" % (state.nextq[0]) else: @@ -420,10 +462,11 @@ def setnextid(bot, user, chan, realtarget, *args): bot.msg(user, "Error: %s" % (e)) @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.help("*", "sets next question to one not in database") @lib.argsGE(1) def setnext(bot, user, chan, realtarget, *args): line = ' '.join([str(arg) for arg in args]) - linepieces = line.split('*') + linepieces = line.split('*', 1) if len(linepieces) < 2: bot.msg(user, "Error: need *") return @@ -433,12 +476,14 @@ def setnext(bot, user, chan, realtarget, *args): bot.msg(user, "Done.") @lib.hook(glevel=1, needchan=False) +@lib.help(None, "skips to next question") def skip(bot, user, chan, realtarget, *args): state.nextquestion(qskipped=True, skipwait=True) -@lib.hook(needchan=False) +@lib.hook(needchan=False, wantchan=True) +@lib.help(None, "starts the trivia game") def start(bot, user, chan, realtarget, *args): - if chan is not None and realtarget == chan.name: replyto = chan + if chan is not None: replyto = chan else: replyto = user if chan is not None and chan.name != state.db['chan']: @@ -454,16 +499,13 @@ def start(bot, user, chan, realtarget, *args): bot.msg(user, "Game is already started!") @lib.hook('stop', glevel=1, needchan=False) +@lib.help(None, "stops the trivia game") def cmd_stop(bot, user, chan, realtarget, *args): if stop(): bot.msg(state.chan, "Game stopped by %s" % (user)) else: bot.msg(user, "Game isn't running.") -@lib.hook('exception', glevel=lib.OWNER) -def cmd_exception(*args, **kwargs): - raise Exception() - def stop(): state.curq = None state.nextq = None @@ -480,17 +522,18 @@ def stop(): return True @lib.hook(needchan=False) +@lib.help("", "reports a bad question to the admins") @lib.argsGE(1) def badq(bot, user, chan, realtarget, *args): lastqid = state.lastqid curqid = state.curqid reason = ' '.join(args) - state.db['badqs'].append([lastqid, curqid, reason]) - state.savedb() + state.db['badqs'].append([state.db['category'], lastqid, curqid, reason]) bot.msg(user, "Reported bad question.") @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.help(None, "shows a list of BADQ reports") def badqs(bot, user, chan, realtarget, *args): if len(state.db['badqs']) == 0: bot.msg(user, "No reports.") @@ -498,10 +541,10 @@ def badqs(bot, user, chan, realtarget, *args): for i in range(len(state.db['badqs'])): try: report = state.db['badqs'][i] - 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])] + bot.msg(user, "Report #%d: Cat=%s LastQ=%r CurQ=%r: %s" % (i, report[0], report[1], report[2], report[3])) + try: lq = state.db['questions'][report[0]][int(report[1])] except Exception as e: lq = (None,None) - try: cq = state.db['questions'][int(report[1])] + try: cq = state.db['questions'][report[0]][int(report[2])] 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])) @@ -509,33 +552,35 @@ def badqs(bot, user, chan, realtarget, *args): bot.msg(user, "- Exception: %r" % (e)) @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.hook(None, "clears list of BADQ reports") def clearbadqs(bot, user, chan, realtarget, *args): state.db['badqs'] = [] - state.savedb() bot.msg(user, "Cleared reports.") @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.hook("", "removes a BADQ report") @lib.argsEQ(1) def delbadq(bot, user, chan, realtarget, *args): try: qid = int(args[0]) del state.db['badqs'][qid] - state.savedb() bot.msg(user, "Removed report #%d" % (qid)) except: bot.msg(user, "Failed!") -@lib.hook(needchan=False) +@lib.hook(needchan=False, wantchan=True) +@lib.help("[]", "shows you or someone else's rank") def rank(bot, user, chan, realtarget, *args): - if chan is not None and realtarget == chan.name: replyto = chan + if chan is not None: replyto = chan else: replyto = user if len(args) != 0: who = args[0] else: who = user - 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))) + bot.msg(replyto, "%s is in %d place (%s points). Target is: %s %s" % (who, state.rank(who), state.points(who), state.targetuser(who), state.targetpoints(who))) @lib.hook(needchan=False) +@lib.help(None, "shows top10 list") def top10(bot, user, chan, realtarget, *args): if len(state.db['ranks']) == 0: return bot.msg(state.db['chan'], "No one is ranked!") @@ -547,6 +592,7 @@ def top10(bot, user, chan, realtarget, *args): bot.msg(state.db['chan'], "Top 10: %s" % (replylist)) @lib.hook(glevel=lib.ADMIN, needchan=False) +@lib.help("", "changes the target score for this round") def settarget(bot, user, chan, realtarget, *args): try: state.db['target'] = int(args[0]) @@ -561,6 +607,7 @@ def settarget(bot, user, chan, realtarget, *args): bot.msg(user, "Failed to set target.") @lib.hook(needchan=False) +@lib.help("", "adds a question") def addq(bot, user, chan, realtarget, *args): + args = list(args) + if args[0].startswith("@"): + cat = args.pop(0)[1:].lower() + questions = state.db['questions'][cat] + else: + questions = state.questions + line = ' '.join([str(arg) for arg in args]) - linepieces = line.split('*') + linepieces = line.split('*', 1) if len(linepieces) < 2: bot.msg(user, "Error: need *") return question = linepieces[0].strip() answer = linepieces[1].strip() - state.db['questions'].append([question, answer]) - state.savedb() - bot.msg(user, "Done. Question is #%s" % (len(state.db['questions'])-1)) + questions.append([question, answer]) + bot.msg(user, "Done. Question is #%s" % (len(questions)-1)) +@lib.hook(needchan=False) +@lib.help(None, "show current category") +def showcat(bot, user, chan, realtarget, *args): + bot.msg(user, "Current category: %s" % (state.db['category'])) + +@lib.hook(glevel=1, needchan=False) +@lib.help("", "change category") +def setcat(bot, user, chan, realtarget, *args): + category = args[0].lower() + if category in state.db['questions']: + state.db['category'] = category + state.questions = state.db['questions'][category] + bot.msg(user, "Changed category to %s" % (category)) + else: + bot.msg(user, "That category doesn't exist.") + +@lib.hook(needchan=False) +@lib.help(None, "list categories", "the current category will be marked with a *") +def listcats(bot, user, chan, realtarget, *args): + cats = ["%s%s (%d)" % ("*" if c == state.db['category'] else "", c, len(state.db['questions'][c])) for c in state.db['questions'].keys()] + bot.msg(user, "Categories: %s" % (', '.join(cats))) + +@lib.hook(glevel=lib.STAFF, needchan=False) +@lib.help("", "adds an empty category") +def addcat(bot, user, chan, realtarget, *args): + category = args[0].lower() + if category not in state.db['questions']: + state.db['questions'][category] = [] + bot.msg(user, "Added category %s" % (category)) + else: + bot.msg(user, "Category already exists.") + +@lib.hook(glevel=lib.MANAGER, needchan=False) +@lib.help("", "deletes an entire category") +def delcat(bot, user, chan, realtarget, *args): + category = args[0].lower() + if category == state.db['category']: + bot.msg(user, "Category currently in use!") + elif category in state.db['questions']: + length = len(state.db['questions'][category]) + del state.db['questions'][category] + bot.msg(user, "Deleted category %s (%d questions)" % (category, length)) + else: + bot.msg(user, "Category does not exist.") @lib.hook(needchan=False) def triviahelp(bot, user, chan, realtarget, *args): @@ -705,7 +838,8 @@ def triviahelp(bot, user, chan, realtarget, *args): @lib.hooknum(417) def num_417(bot, textline): # bot.fastmsg(state.db['chan'], "Whoops, it looks like that question didn't quite go through! (E:417). Let's try another...") - state.nextquestion(qskipped=False, skipwait=True) + if state.curq is not None: + state.nextquestion(qskipped=False, skipwait=True) @lib.hooknum(332) def num_TOPIC(bot, textline): @@ -722,8 +856,8 @@ def num_TOPIC(bot, textline): "%s (%s)" % (person(x), pts(x)) for x in range(3) if x < len(state.db['ranks']) ]), - 'top3c': ' '.join([ - "%s (%s, %s)" % (person(x), pts(x), country(x)) + 'top3c': ', '.join([ + "%s (%s) %s" % (person(x), country(x), pts(x)) for x in range(3) if x < len(state.db['ranks']) ]), 'top10': ' '.join([ @@ -737,6 +871,7 @@ def num_TOPIC(bot, textline): 'lastwinner': state.db['lastwinner'], 'lastwon': time.strftime("%b %d", time.gmtime(state.db['lastwon'])), 'target': state.db['target'], + 'category': state.db['category'], } if gottopic != formatted: state.getbot().conn.send("TOPIC %s :%s" % (state.db['chan'], formatted)) @@ -750,15 +885,50 @@ def specialQuestion(oldq): newq[0] = "What month is it currently (in UTC)?" newq[1] = time.strftime("%B", time.gmtime()).lower() elif qtype == "!MATH+": - randnum1 = random.randrange(0, 11) - randnum2 = random.randrange(0, 11) + try: + maxnum = int(oldq[1]) + except ValueError: + maxnum = 10 + randnum1 = random.randrange(0, maxnum+1) + randnum2 = random.randrange(0, maxnum+1) newq[0] = "What is %d + %d?" % (randnum1, randnum2) newq[1] = spellout(randnum1+randnum2) + elif qtype == "!ALGEBRA+": + try: + num1, num2 = [int(i) for i in oldq[1].split('!')] + except ValueError: + num1, num2 = 10, 10 + randnum1 = random.randrange(0, num1+1) + randnum2 = random.randrange(randnum1, num2+1) + newq[0] = "What is x? %d = %d + x" % (randnum2, randnum1) + newq[1] = spellout(randnum2-randnum1) + else: pass #default to not modifying return newq def spellout(num): - return [ - "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", - "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen", - "sixteen", "seventeen", "eighteen", "nineteen", "twenty" - ][num] + ones = ['', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine'] + teens = ['ten', 'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen', 'sixteen', 'seventeen', 'eighteen', 'nineteen'] + tens = ['', '', 'twenty', 'thirty', 'fourty', 'fifty', 'sixty', 'seventy', 'eighty', 'ninety'] + + if num == 0: + return 'zero' + + ihundreds = num / 100 + itens = num % 100 / 10 + iones = num % 10 + buf = [] + + if ihundreds > 0: + buf.append("%s hundred" % (ones[ihundreds])) + if itens > 1: + buf.append(tens[itens]) + if itens == 1: + buf.append(teens[iones]) + elif iones > 0: + buf.append(ones[iones]) + return ' '.join(buf) +# return [ +# "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", +# "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen", +# "sixteen", "seventeen", "eighteen", "nineteen", "twenty" +# ][num]