X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/5ed70e948f881ad7486c0aba588dd46c60ad5b36..96dfdcd3388fede51b41e1e7094c28f6ff2d4715:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index cf75c8c..3e79db3 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 @@ -58,9 +67,9 @@ def pts(num): def country(num, default="??"): 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): @@ -76,6 +85,7 @@ class TriviaState(object): self.chan = self.db['chan'] self.curq = None self.nextq = None + self.nextqid = None self.nextquestiontimer = None self.steptimer = None self.hintstr = None @@ -290,6 +300,10 @@ 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.questions)) nextq = self.questions[nextqid] @@ -298,7 +312,7 @@ class TriviaState(object): 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() @@ -319,7 +333,10 @@ class TriviaState(object): range(0x61,0x7A) + ([0x20]*4) ) qtext += "\00304,01"+qword+"\00301,01"+chr(spacer) #a-z - self.getbot().fastmsg(self.chan, qtext) + 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 self.curq = nextq self.curqid = nextqid @@ -452,21 +469,21 @@ def give(bot, user, chan, realtarget, *args): def setnextid(bot, user, chan, realtarget, *args): try: qid = int(args[0]) - state.nextq = state.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])) @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 @@ -512,12 +529,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 @@ -603,7 +620,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) @@ -752,7 +769,7 @@ def addq(bot, user, chan, realtarget, *args): 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 @@ -835,12 +852,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] @@ -873,7 +886,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):