X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/656dc5a4759b810a632859a32721493e522748a1..de8ab9cbaceea92c0b719c3b87f2bc59397b2454:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index f2d3671..2f3fb77 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -1,12 +1,15 @@ # 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': [2], + 'compatible': [0], 'depends': ['userinfo'], 'softdeps': ['help'], } @@ -28,7 +31,13 @@ def modstop(*args, **kwargs): return lib.modstop(*args, **kwargs) # module code -import json, random, threading, re, time, datetime, os +import json, random, threading, re, time, datetime, os, sys + +if sys.version_info.major < 3: + timerbase = threading._Timer +else: + timerbase = threading.Timer + try: import twitter @@ -56,11 +65,11 @@ def pts(num): return 0 def country(num, default="??"): - return lib.mod('userinfo')._get(person(num), 'country', default=default).upper() + return lib.mod('userinfo').get(person(num), 'country', default=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): @@ -92,8 +101,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 " % (', '.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() @@ -150,11 +159,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 @@ -187,6 +198,7 @@ class TriviaState(object): self.db['users'] = {} self.db['ranks'] = [] + self.savedb() stop() self.closeshop() @@ -209,6 +221,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 @@ -232,7 +245,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): @@ -325,9 +339,10 @@ class TriviaState(object): ) 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 @@ -467,7 +482,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("*", "sets next question to one not in database") @@ -488,7 +503,7 @@ 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 @@ -520,12 +535,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 @@ -597,7 +612,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") @@ -611,7 +626,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) @@ -663,7 +678,8 @@ 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("@"): @@ -687,6 +703,7 @@ def findq(bot, user, chan, realtarget, *args): @lib.hook(glevel=1, needchan=False) @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("@"): @@ -730,7 +747,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("[@] ", "removes a question from the database") @@ -843,7 +860,8 @@ def triviahelp(bot, user, chan, realtarget, *args): bot.slowmsg(user, "HINTNUM (ADMIN)") bot.slowmsg(user, "QUESTIONPAUSE (ADMIN)") -@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] @@ -876,7 +894,7 @@ def num_TOPIC(bot, textline): '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):