X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/b9daa51aa77546843da6c903804a9c06b0a7b905..163cc00ad85a00a88ae8c4031827b922b4e531eb:/modules/trivia.py diff --git a/modules/trivia.py b/modules/trivia.py index 0d045c8..6199790 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -186,6 +186,7 @@ class TriviaState(object): try: return str(self.db['users'][self.db['ranks'][num]]['points']) except: return 0 + status = False try: f = open(self.db['hofpath'], 'rb+') for i in range(self.db['hoflines']): #skip this many lines @@ -205,12 +206,12 @@ class TriviaState(object): 'thirdscore': pts(2), }) f.write(fcontents) - return True + status = True except Exception as e: - raise e #FIXME wtf??? - return False + status = False finally: f.close() + return status def endPointVote(self): self.getchan().msg("Voting has ended!") @@ -385,6 +386,7 @@ def trivia_checkanswer(bot, user, chan, *args): state.nextquestion() @lib.hook(needchan=False) +@lib.help("[]", "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 else: replyto = user @@ -395,6 +397,7 @@ def points(bot, user, chan, realtarget, *args): bot.msg(replyto, "%s has %d points." % (who, state.points(who))) @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.help(" []", "gives someone points", "defaults to 1 point") @lib.argsGE(1) def give(bot, user, chan, realtarget, *args): whoto = args[0] @@ -407,6 +410,8 @@ def give(bot, user, chan, realtarget, *args): bot.msg(chan, "%s gave %s %d points. New balance: %d" % (user, whoto, numpoints, balance)) @lib.hook(glevel=1, needchan=False) +@lib.help("", "sets next question to one in the database") +@lib.argsEQ(1) def setnextid(bot, user, chan, realtarget, *args): try: qid = int(args[0]) @@ -420,6 +425,7 @@ def setnextid(bot, user, chan, realtarget, *args): bot.msg(user, "Error: %s" % (e)) @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]) @@ -433,10 +439,12 @@ def setnext(bot, user, chan, realtarget, *args): bot.msg(user, "Done.") @lib.hook(glevel=1, needchan=False) +@lib.help(None, "skips to next question") def skip(bot, user, chan, realtarget, *args): state.nextquestion(qskipped=True, skipwait=True) @lib.hook(needchan=False) +@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 else: replyto = user @@ -454,16 +462,13 @@ def start(bot, user, chan, realtarget, *args): bot.msg(user, "Game is already started!") @lib.hook('stop', glevel=1, needchan=False) +@lib.help(None, "stops the trivia game") def cmd_stop(bot, user, chan, realtarget, *args): if stop(): bot.msg(state.chan, "Game stopped by %s" % (user)) else: bot.msg(user, "Game isn't running.") -@lib.hook('exception', glevel=lib.OWNER) -def cmd_exception(*args, **kwargs): - raise Exception() - def stop(): state.curq = None state.nextq = None @@ -480,6 +485,7 @@ def stop(): return True @lib.hook(needchan=False) +@lib.help("", "reports a bad question to the admins") @lib.argsGE(1) def badq(bot, user, chan, realtarget, *args): lastqid = state.lastqid @@ -487,9 +493,11 @@ def badq(bot, user, chan, realtarget, *args): reason = ' '.join(args) state.db['badqs'].append([lastqid, curqid, reason]) + state.savedb() bot.msg(user, "Reported bad question.") @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.help(None, "shows a list of BADQ reports") def badqs(bot, user, chan, realtarget, *args): if len(state.db['badqs']) == 0: bot.msg(user, "No reports.") @@ -508,18 +516,26 @@ def badqs(bot, user, chan, realtarget, *args): bot.msg(user, "- Exception: %r" % (e)) @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.hook(None, "clears list of BADQ reports") def clearbadqs(bot, user, chan, realtarget, *args): state.db['badqs'] = [] + state.savedb() bot.msg(user, "Cleared reports.") @lib.hook(glevel=lib.STAFF, needchan=False) +@lib.hook("", "removes a BADQ report") @lib.argsEQ(1) def delbadq(bot, user, chan, realtarget, *args): - qid = int(args[0]) - del state.db['badqs'][qid] - bot.msg(user, "Removed report #%d" % (qid)) + try: + qid = int(args[0]) + del state.db['badqs'][qid] + state.savedb() + bot.msg(user, "Removed report #%d" % (qid)) + except: + bot.msg(user, "Failed!") @lib.hook(needchan=False) +@lib.help("[]", "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 else: replyto = user @@ -530,6 +546,7 @@ def rank(bot, user, chan, realtarget, *args): bot.msg(replyto, "%s is in %d place (%s points). Target is: %s (%s points)." % (who, state.rank(who), state.points(who), state.targetuser(who), state.targetpoints(who))) @lib.hook(needchan=False) +@lib.help(None, "shows top10 list") def top10(bot, user, chan, realtarget, *args): if len(state.db['ranks']) == 0: return bot.msg(state.db['chan'], "No one is ranked!") @@ -541,6 +558,7 @@ def top10(bot, user, chan, realtarget, *args): bot.msg(state.db['chan'], "Top 10: %s" % (replylist)) @lib.hook(glevel=lib.ADMIN, needchan=False) +@lib.help("", "changes the target score for this round") def settarget(bot, user, chan, realtarget, *args): try: state.db['target'] = int(args[0]) @@ -555,6 +573,7 @@ def settarget(bot, user, chan, realtarget, *args): bot.msg(user, "Failed to set target.") @lib.hook(needchan=False) +@lib.help("", "adds a question") def addq(bot, user, chan, realtarget, *args): line = ' '.join([str(arg) for arg in args]) linepieces = line.split('*') @@ -662,7 +705,8 @@ def triviahelp(bot, user, chan, realtarget, *args): if user.glevel >= 1: bot.slowmsg(user, "SKIP (KNOWN)") bot.slowmsg(user, "STOP (KNOWN)") - bot.slowmsg(user, "FINDQ (KNOWN)") + bot.slowmsg(user, "FINDQ (KNOWN)") + bot.slowmsg(user, "FINDQRE (KNOWN)") bot.slowmsg(user, "SETNEXTID (KNOWN)") if user.glevel >= lib.STAFF: bot.slowmsg(user, "GIVE [] (STAFF)")