X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/4364943373b4d80f7523d7c65720e4c493e3a799..d85e99b6ef5372e26b9bd1aabf58e604afe2db53:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index 2f3fb77..8abc9ff 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -10,8 +10,8 @@ modinfo = { 'author': 'Erebus Team', 'license': 'public domain', 'compatible': [0], - 'depends': ['userinfo'], - 'softdeps': ['help'], + 'depends': [], + 'softdeps': ['help','userinfo'], } # preamble @@ -35,8 +35,11 @@ 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: @@ -65,7 +68,10 @@ 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(timerbase): def __init__(self, *args, **kwargs): @@ -74,6 +80,8 @@ class MyTimer(timerbase): 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) @@ -125,11 +133,16 @@ class TriviaState(object): if json is not None and json.dump is not None: # 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") - tmpfn = os.tempnam('.', 'trivia') try: - f = open(tmpfn, "w") + 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) @@ -140,7 +153,9 @@ class TriviaState(object): os.unlink(tmpfn) except OSError: # temp file is already gone pass - raise # we may be better off just swallowing exceptions? + except UnboundLocalError: + pass + raise return False def getchan(self): @@ -190,12 +205,12 @@ 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() @@ -266,9 +281,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: @@ -324,7 +342,7 @@ class TriviaState(object): 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]] @@ -335,7 +353,7 @@ class TriviaState(object): qtext += " " for qword in qary: spacer = random.choice( - range(0x61,0x7A) + ([0x20]*4) + 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: @@ -347,7 +365,7 @@ class TriviaState(object): 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]) @@ -356,7 +374,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] @@ -426,12 +444,27 @@ 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(glevel=1, needchan=False, wantchan=True) @@ -510,7 +543,7 @@ def start(bot, user, chan, realtarget, *args): 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: @@ -762,8 +795,8 @@ def delq(bot, user, chan, realtarget, *args): try: backup = questions[int(args[0])] del questions[int(args[0])] - bot.msg(user, "Deleted %s*%s" % (backup[0], backup[1])) - except: + 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)