X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/5f03d045cd465491760668b3e34453ae6a50034b..c3ff1486929923f394c219e6999df301a5a5bf04:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index b9cd9f8..b5191d3 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -1,13 +1,17 @@ # Erebus IRC bot - Author: Erebus Team +# vim: fileencoding=utf-8 # trivia module # This file is released into the public domain; see http://unlicense.org/ +from __future__ import print_function + # module info modinfo = { 'author': 'Erebus Team', 'license': 'public domain', - 'compatible': [1], # compatible module API versions - 'depends': ['userinfo'], # other modules required to work properly? + 'compatible': [0], + 'depends': [], + 'softdeps': ['help','userinfo'], } # preamble @@ -27,7 +31,16 @@ 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, sys + +if sys.version_info.major < 3: + timerbase = threading._Timer + stringbase = basestring +else: + import tempfile + timerbase = threading.Timer + stringbase = str + try: import twitter @@ -55,15 +68,20 @@ def pts(num): return 0 def country(num, default="??"): - return lib.mod('userinfo')._get(person(num), 'country', default=default).upper() + try: + return lib.mod('userinfo').get(person(num), 'country', default=default).upper() + except KeyError: + return default.upper() -class MyTimer(threading._Timer): +class MyTimer(timerbase): def __init__(self, *args, **kwargs): - threading._Timer.__init__(self, *args, **kwargs) + timerbase.__init__(self, *args, **kwargs) self.daemon = True class TriviaState(object): def __init__(self, parent=None, pointvote=False): + self.streak = 0 + self.streak_holder = None if parent is not None: self.gotParent(parent, pointvote) @@ -71,9 +89,11 @@ 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 + self.nextqid = None self.nextquestiontimer = None self.steptimer = None self.hintstr = None @@ -89,28 +109,55 @@ 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 " % (', '.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 " % (', '.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() 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) + # we have to do a dance to save the file to make the update atomic, and also because Py3 doesn't have os.tempnam in the misguided pursuit of "security" + if len(dbjson) > 0: + os.rename(self.questionfile, self.questionfile+".auto.bak") + try: + # TODO replace both of these with tempfile.NamedTemporaryFile(delete=False, dir=os.path.dirname(self.questionfile), prefix='trivia') & f.name : + if sys.version_info.major < 3: + tmpfn = os.tempnam('.', 'trivia') + f = open(tmpfn, "w") + else: + fd, tmpfn = tempfile.mkstemp(dir='.', prefix='trivia') + f = open(fd, "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 + except UnboundLocalError: + pass + raise + return False def getchan(self): return self.parent.channel(self.chan) @@ -123,16 +170,18 @@ class TriviaState(object): if self.hintstr is None or self.revealpossibilities is None or self.reveal is None: oldhintstr = "" self.hintstr = list(re.sub(r'[a-zA-Z0-9]', '*', answer)) - self.revealpossibilities = range(''.join(self.hintstr).count('*')) + self.revealpossibilities = list(range(''.join(self.hintstr).count('*'))) self.reveal = int(round(''.join(self.hintstr).count('*') * (7/24.0))) 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 @@ -157,14 +206,15 @@ class TriviaState(object): 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() + self.db['lastwinner'] = winner + self.db['lastwon'] = time.time() + self.db['users'] = {} self.db['ranks'] = [] + self.savedb() stop() self.closeshop() @@ -186,6 +236,8 @@ class TriviaState(object): try: return str(self.db['users'][self.db['ranks'][num]]['points']) 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 @@ -193,7 +245,7 @@ class TriviaState(object): insertpos = f.tell() fcontents = f.read() f.seek(insertpos) - f.write((self.db['hofformat']+"\n") % { + new_line = self.db['hofformat'] % { 'date': time.strftime("%F", time.gmtime()), 'duration': str(datetime.timedelta(seconds=time.time()-self.db['lastwon'])), 'targetscore': self.db['target'], @@ -203,14 +255,19 @@ class TriviaState(object): 'secondscore': pts(1), 'thirdperson': person(2), 'thirdscore': pts(2), - }) + } + f.write(new_line.encode() + b"\n") f.write(fcontents) - return True + status = True except Exception as e: - raise e #FIXME wtf??? - return False + print(repr(e)) + print(type(e)) + print(e.message) + status = False finally: - f.close() + if f is not None: + f.close() + return status def endPointVote(self): self.getchan().msg("Voting has ended!") @@ -229,9 +286,12 @@ class TriviaState(object): self.lastqid = self.curqid self.curq = None self.curqid = None + self.lastqtime = time.time() if self.gameover == True: return self.doGameOver() if qskipped: + self.streak = 0 + self.streak_holder = None self.getchan().fastmsg("\00304Fail! The correct answer was: %s" % (self.hintanswer)) self.missedquestions += 1 else: @@ -239,9 +299,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 +310,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)) @@ -266,22 +328,26 @@ class TriviaState(object): nextqid = None nextq = self.nextq self.nextq = None + elif self.nextqid is not None: + nextqid = self.nextqid + nextq = self.questions[nextqid] + self.nextqid = 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() else: nextq.append(time.time()) - if isinstance(nextq[1], basestring): + if isinstance(nextq[1], stringbase): nextq[1] = nextq[1].lower() else: nextq[1] = [s.lower() for s in nextq[1]] @@ -291,13 +357,20 @@ 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 - self.getbot().fastmsg(self.chan, qtext) + spacer = random.choice( + list(range(0x61,0x7A)) + ([0x20]*4) + ) + 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 self.curq = nextq self.curqid = nextqid - if isinstance(self.curq[1], basestring): self.hintanswer = self.curq[1] + if isinstance(self.curq[1], stringbase): self.hintanswer = self.curq[1] else: self.hintanswer = random.choice(self.curq[1]) self.steptimer = MyTimer(self.db['hinttimer'], self.nexthint, args=[1]) @@ -306,7 +379,7 @@ class TriviaState(object): def checkanswer(self, answer): if self.curq is None: return False - elif isinstance(self.curq[1], basestring): + elif isinstance(self.curq[1], stringbase): return answer.lower() == self.curq[1] else: # assume it's a list or something. return answer.lower() in self.curq[1] @@ -363,11 +436,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() @@ -376,18 +449,44 @@ def trivia_checkanswer(bot, user, chan, *args): line = ' '.join([str(arg) for arg in 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))) + + if state.streak_holder == user: + state.streak += 1 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))) + if state.streak >= 3: + bot.fastmsg(chan, "\00312%s\003 broke \00304%s\003's streak of \00307%d\003!" % (user, state.streak_holder, state.streak)) + state.streak_holder = user + state.streak = 1 + + response = "\00312%s\003 got it in %d seconds! The answer was \00312%s\003" % (user, time.time()-state.lastqtime, line) + if state.hintanswer.lower() != line.lower(): + response += " (hinted answer: %s)" % (state.hintanswer) + response += ". New score: %d. Rank: %d. Target: %s %s" % (state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user)) + bot.fastmsg(chan, response) + + if state.streak >= 3: + bot.msg(chan, "\00312%s\003 is on a streak! \00307%d\003 answers correct in a row!" % (user, state.streak)) + 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] @@ -414,21 +513,21 @@ def give(bot, user, chan, realtarget, *args): def setnextid(bot, user, chan, realtarget, *args): try: qid = int(args[0]) - state.nextq = state.db['questions'][qid] - 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)) + except ValueError: + bot.msg(user, "Error: QID must be a number.") + return + if qid >= len(state.questions): + 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]), truncate=True) @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 @@ -442,14 +541,14 @@ def setnext(bot, user, chan, realtarget, *args): def skip(bot, user, chan, realtarget, *args): state.nextquestion(qskipped=True, skipwait=True) -@lib.hook(needchan=False) +@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 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']: - bot.msg(replyto, "That command isn't valid here.") + bot.msg(replyto, "That command is only valid in %s" % (state.db['chan'])) return if state.curq is None and state.pointvote is None and state.nextquestiontimer is None: @@ -474,12 +573,12 @@ def stop(): try: state.steptimer.cancel() except Exception as e: - print "!!! steptimer.cancel(): %s %r" % (e,e) + print("!!! steptimer.cancel(): %s %r" % (e,e)) state.steptimer = None try: state.nextquestiontimer.cancel() except Exception as e: - print "!!! nextquestiontimer.cancel(): %s %r" % (e,e) + print("!!! nextquestiontimer.cancel(): %s %r" % (e,e)) state.nextquestiontimer = None return True @@ -491,8 +590,7 @@ def badq(bot, user, chan, realtarget, *args): 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) @@ -504,10 +602,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])) @@ -518,7 +616,6 @@ def badqs(bot, user, chan, realtarget, *args): @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) @@ -528,21 +625,20 @@ 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") @@ -554,7 +650,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("", "changes the target score for this round") @@ -568,7 +664,7 @@ def settarget(bot, user, chan, realtarget, *args): state.pointvote = None bot.msg(state.db['chan'], "Vote has been cancelled!") except Exception as e: - print e + print(e) bot.msg(user, "Failed to set target.") @lib.hook(needchan=False) @@ -620,14 +716,22 @@ def questionpause(bot, user, chan, realtarget, *args): bot.msg(user, "Failed to set questionpause.") @lib.hook(glevel=1, needchan=False) -@lib.help("", "finds a qid given a complete question") +@lib.help("[@category] ", "finds a qid given a complete question") +@lib.argsGE(1) def findq(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 + if len(args) == 0: bot.msg(user, "You need to specify the question.") return searchkey = ' '.join(args).lower() - matches = [str(i) for i in range(len(state.db['questions'])) if state.db['questions'][i][0].lower() == searchkey] + matches = [str(i) for i in range(len(questions)) if questions[i][0].lower() == searchkey] if len(matches) > 1: bot.msg(user, "Multiple matches: %s" % (', '.join(matches))) elif len(matches) == 1: @@ -636,14 +740,22 @@ def findq(bot, user, chan, realtarget, *args): bot.msg(user, "No match.") @lib.hook(glevel=1, needchan=False) -@lib.help("", "finds a qid given a regex or partial question") +@lib.help("[@] ", "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("@"): + cat = args.pop(0)[1:].lower() + questions = state.db['questions'][cat] + else: + questions = state.questions + if len(args) == 0: bot.msg(user, "You need to specify a search string.") return searcher = re.compile(' '.join(args), re.IGNORECASE) - matches = [str(i) for i in range(len(state.db['questions'])) if searcher.search(state.db['questions'][i][0]) is not None] + matches = [str(i) for i in range(len(questions)) if searcher.search(questions[i][0]) is not None] if len(matches) > 25: bot.msg(user, "Too many matches! (>25)") elif len(matches) > 1: @@ -654,45 +766,108 @@ def findqre(bot, user, chan, realtarget, *args): bot.msg(user, "No match.") @lib.hook(glevel=lib.STAFF, needchan=False) -@lib.help("", "displays the q*a for a qid") +@lib.help("[@] ", "displays the q*a for a qid", "category defaults to current") def showq(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 + try: qid = int(args[0]) except: bot.msg(user, "Specify a numeric question ID.") return try: - q = state.db['questions'][qid] + q = questions[qid] except: bot.msg(user, "ID not valid.") return - bot.msg(user, "%s: %s*%s" % (qid, q[0], q[1])) + bot.msg(user, "%s: %s*%s" % (qid, q[0], q[1]), True) @lib.hook(('delq', 'deleteq'), glevel=lib.STAFF, needchan=False) -@lib.help("", "removes a question from the database") +@lib.help("[@] ", "removes a question from the database") def delq(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 + try: - backup = state.db['questions'][int(args[0])] - del state.db['questions'][int(args[0])] - state.savedb() - bot.msg(user, "Deleted %s*%s" % (backup[0], backup[1])) - except: + backup = questions[int(args[0])] + del questions[int(args[0])] + bot.msg(user, "Deleted %s*%s" % (backup[0], backup[1]), True) + except Exception as e: bot.msg(user, "Couldn't delete that question. %r" % (e)) @lib.hook(glevel=lib.STAFF, needchan=False) -@lib.help("*", "adds a question") +@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): @@ -723,12 +898,8 @@ def triviahelp(bot, user, chan, realtarget, *args): bot.slowmsg(user, "HINTNUM (ADMIN)") bot.slowmsg(user, "QUESTIONPAUSE (ADMIN)") -@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) - -@lib.hooknum(332) +@lib.hooknum(332) # topic is... +@lib.hooknum(331) # no topic set def num_TOPIC(bot, textline): pieces = textline.split(None, 4) chan = pieces[3] @@ -743,8 +914,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([ @@ -758,9 +929,10 @@ 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)) + state.getbot().conn.send(bot.parent.cfg.get('trivia', 'topiccommand', default="TOPIC %(chan)s :%(topic)s") % {'chan': state.db['chan'], 'topic': formatted}) def specialQuestion(oldq): @@ -771,15 +943,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]