]> jfr.im git - erebus.git/blobdiff - modules/trivia.py
py3 updates
[erebus.git] / modules / trivia.py
index 3e79db35ed96434d3b4da8a0a941d3be28b5da5b..8abc9ff7230467d09e15a48575424786760ab7b9 100644 (file)
@@ -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)
 
@@ -101,8 +109,8 @@ 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 <choice>" % (', '.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 <choice>" % (', '.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()
@@ -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):
@@ -159,11 +174,13 @@ class TriviaState(object):
                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
@@ -188,14 +205,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()
 
@@ -218,6 +236,7 @@ class TriviaState(object):
                        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
@@ -241,7 +260,8 @@ class TriviaState(object):
                except Exception as e:
                        status = False
                finally:
-                       f.close()
+                       if f is not None:
+                               f.close()
                        return status
 
        def endPointVote(self):
@@ -261,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:
@@ -319,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]]
@@ -330,18 +353,19 @@ 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:
-                       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, "\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])
@@ -350,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]
@@ -420,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)
@@ -476,7 +515,7 @@ def setnextid(bot, user, chan, realtarget, *args):
                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]))
+       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("<q>*<a>", "sets next question to one not in database")
@@ -497,14 +536,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, wantchan=True)
+@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: 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:
@@ -606,7 +645,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("<target score>", "changes the target score for this round")
@@ -672,7 +711,8 @@ def questionpause(bot, user, chan, realtarget, *args):
                bot.msg(user, "Failed to set questionpause.")
 
 @lib.hook(glevel=1, needchan=False)
-@lib.help("<full question>", "finds a qid given a complete question")
+@lib.help("[@category] <full question>", "finds a qid given a complete question")
+@lib.argsGE(1)
 def findq(bot, user, chan, realtarget, *args):
        args = list(args)
        if args[0].startswith("@"):
@@ -696,6 +736,7 @@ def findq(bot, user, chan, realtarget, *args):
 
 @lib.hook(glevel=1, needchan=False)
 @lib.help("[@<category>] <regex>", "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("@"):
@@ -739,7 +780,7 @@ def showq(bot, user, chan, realtarget, *args):
        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("[@<category>] <qid>", "removes a question from the database")
@@ -754,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)