modinfo = {
'author': 'Erebus Team',
'license': 'public domain',
- 'compatible': [1], # compatible module API versions
- 'depends': ['userinfo'], # other modules required to work properly?
+ 'compatible': [2],
+ 'depends': ['userinfo'],
+ 'softdeps': ['help'],
}
# preamble
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
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): #returns whether or not it was able to save
if json is not None and json.dump is not None:
os.unlink(tmpfn)
except OSError: # temp file is already gone
pass
- raise #TODO: we may be better off just swallowing exceptions?
+ raise # we may be better off just swallowing exceptions?
return False
def getchan(self):
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
nextq = self.nextq
self.nextq = 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()
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)
+@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 and realtarget == chan.name: replyto = chan
+ if chan is not None: replyto = chan
else: replyto = user
if state.savedb():
else:
bot.msg(replyto, "Save failed!")
-@lib.hook(needchan=False)
+@lib.hook(needchan=False, wantchan=True)
@lib.help("[<user>]", "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]
def setnextid(bot, user, chan, realtarget, *args):
try:
qid = int(args[0])
- state.nextq = state.db['questions'][qid]
+ state.nextq = state.questions[qid]
if user.glevel >= lib.STAFF:
respstr = "Done. Next question is: %s" % (state.nextq[0])
else:
@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 <question>*<answer>")
return
def skip(bot, user, chan, realtarget, *args):
state.nextquestion(qskipped=True, skipwait=True)
-@lib.hook(needchan=False)
+@lib.hook(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']:
curqid = state.curqid
reason = ' '.join(args)
- state.db['badqs'].append([lastqid, curqid, reason])
+ state.db['badqs'].append([state.db['category'], lastqid, curqid, reason])
bot.msg(user, "Reported bad question.")
@lib.hook(glevel=lib.STAFF, needchan=False)
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]))
except:
bot.msg(user, "Failed!")
-@lib.hook(needchan=False)
+@lib.hook(needchan=False, wantchan=True)
@lib.help("[<user>]", "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]
@lib.hook(glevel=1, needchan=False)
@lib.help("<full question>", "finds a qid given a complete question")
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:
bot.msg(user, "No match.")
@lib.hook(glevel=1, needchan=False)
-@lib.help("<regex>", "finds a qid given a regex or partial question")
+@lib.help("[@<category>] <regex>", "finds a qid given a regex or partial question")
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:
bot.msg(user, "No match.")
@lib.hook(glevel=lib.STAFF, needchan=False)
-@lib.help("<qid>", "displays the q*a for a qid")
+@lib.help("[@<category>] <qid>", "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]))
@lib.hook(('delq', 'deleteq'), glevel=lib.STAFF, needchan=False)
-@lib.help("<qid>", "removes a question from the database")
+@lib.help("[@<category>] <qid>", "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])]
+ backup = questions[int(args[0])]
+ del questions[int(args[0])]
bot.msg(user, "Deleted %s*%s" % (backup[0], backup[1]))
except:
bot.msg(user, "Couldn't delete that question. %r" % (e))
@lib.hook(glevel=lib.STAFF, needchan=False)
-@lib.help("<q>*<a>", "adds a question")
+@lib.help("
[@<category>] <q>*<a>", "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 <question>*<answer>")
return
question = linepieces[0].strip()
answer = linepieces[1].strip()
- state.db['questions'].append([question, answer])
- 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("<category>", "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("<category>", "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("<category>", "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):
@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)
+ if state.curq is not None:
+ state.nextquestion(qskipped=False, skipwait=True)
@lib.hooknum(332)
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([
'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))
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]
projects / erebus.git / blobdiff