add nitterize module

[erebus.git] / modules / trivia.py

diff --git a/modules/trivia.py b/modules/trivia.py
index b5191d3eec5e502c08c239762d335e1bff2f2a54..b716a597672834719e26051a0aa5a2473a6daa38 100644 (file)
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -271,7 +271,7 @@ class TriviaState(object):
 
        def endPointVote(self):
                self.getchan().msg("Voting has ended!")
-               votelist = sorted(self.voteamounts.items(), key=lambda item: item[1]) #sort into list of tuples: [(option, number_of_votes), ...]
+               votelist = sorted(self.voteamounts.items(), key=lambda item: (item[1], -item[0])) #sort into list of tuples: [(option, number_of_votes), ...]
                for i in range(len(votelist)-1):
                        item = votelist[i]
                        self.getchan().msg("%s place: %s (%s votes)" % (len(votelist)-i, item[0], item[1]))
@@ -331,6 +331,7 @@ class TriviaState(object):
                elif self.nextqid is not None:
                        nextqid = self.nextqid
                        nextq = self.questions[nextqid]
+                       if len(nextq) > 2: nextq[2] = 0 # Unset the time it was last asked.
                        self.nextqid = None
                else:
                        nextqid = random.randrange(0, len(self.questions))
@@ -363,9 +364,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 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
+                               if not self.getbot().fastmsg(self.chan, "Next up: " + 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
@@ -716,7 +718,7 @@ def questionpause(bot, user, chan, realtarget, *args):
                bot.msg(user, "Failed to set questionpause.")
 
 @lib.hook(glevel=1, needchan=False)
-@lib.help("[@category] <full question>", "finds a qid given a complete question")
+@lib.help("[@category] <question>", "finds a question (qid) given a (partial) question")
 @lib.argsGE(1)
 def findq(bot, user, chan, realtarget, *args):
        args = list(args)
@@ -726,21 +728,11 @@ def findq(bot, user, chan, realtarget, *args):
        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(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, "One match: %s" % (matches[0]))
-       else:
-               bot.msg(user, "No match.")
+       pattern = re.escape(' '.join(args))
+       return _findq(questions, pattern)
 
 @lib.hook(glevel=1, needchan=False)
-@lib.help("[@<category>] <regex>", "finds a qid given a regex or partial question")
+@lib.help("[@<category>] <regex>", "finds a question (qid) given a regex")
 @lib.argsGE(1)
 def findqre(bot, user, chan, realtarget, *args):
        args = list(args)
@@ -749,21 +741,34 @@ def findqre(bot, user, chan, realtarget, *args):
                questions = state.db['questions'][cat]
        else:
                questions = state.questions
+       pattern = ' '.join(args)
+       return _findq(questions, pattern)
 
-       if len(args) == 0:
-               bot.msg(user, "You need to specify a search string.")
-               return
+@lib.hook(glevel=1, needchan=False)
+@lib.help("[@<category>] <phrase>", "finds a question (qid) given a (partial) question or answer")
+@lib.argsGE(1)
+def findqa(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
+       pattern = ' '.join(args)
+       return _findq(questions, pattern, True)
 
-       searcher = re.compile(' '.join(args), re.IGNORECASE)
-       matches = [str(i) for i in range(len(questions)) if searcher.search(questions[i][0]) is not None]
+def _findq(questions, pattern, check_answers=False):
+       searcher = re.compile(pattern, re.IGNORECASE)
+       matches = [i for i in range(len(questions)) if searcher.search(questions[i][0]) is not None or (check_answers and searcher.search(questions[i][1]) is not None)]
        if len(matches) > 25:
-               bot.msg(user, "Too many matches! (>25)")
+               return "Too many matches! (>25)"
        elif len(matches) > 1:
-               bot.msg(user, "Multiple matches: %s" % (', '.join(matches)))
+               return "Multiple matches: %s" % (', '.join(str(x) for x in matches))
        elif len(matches) == 1:
-               bot.msg(user, "One match: %s" % (matches[0]))
+               i = matches[0]
+               return "One match: %s %s*%s" % (i, questions[i][0], questions[i][1])
        else:
-               bot.msg(user, "No match.")
+               return "No match."
 
 @lib.hook(glevel=lib.STAFF, needchan=False)
 @lib.help("[@<category>] <qid>", "displays the q*a for a qid", "category defaults to current")
@@ -990,3 +995,14 @@ def spellout(num):
 #              "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen",
 #              "sixteen", "seventeen", "eighteen", "nineteen", "twenty"
 #      ][num]
+
+
+def topa():
+       answers=__import__('collections').defaultdict(int)
+       for a in (x[1] for x in state.db['questions']['general']):
+                answers[a]+=1;
+       a2=[]
+       for a, num in answers.items():
+               a2.append((a, num))
+       a2.sort(key=lambda v: v[1], reverse=True)
+       return a2