X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/c3ff1486929923f394c219e6999df301a5a5bf04..b336e10881d2ba6afbe4b68187512fc2d4c17071:/modules/trivia.py?ds=sidebyside

diff --git a/modules/trivia.py b/modules/trivia.py
index b5191d3..1ad319e 100644
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -716,7 +716,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 +726,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))
+	bot.msg(user, _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 +739,20 @@ def findqre(bot, user, chan, realtarget, *args):
 		questions = state.db['questions'][cat]
 	else:
 		questions = state.questions
+	pattern = ' '.join(args)
+	bot.msg(user, _findq(questions, pattern))
 
-	if len(args) == 0:
-		bot.msg(user, "You need to specify a search string.")
-		return
-
-	searcher = re.compile(' '.join(args), re.IGNORECASE)
+def _findq(questions, pattern):
+	searcher = re.compile(pattern, re.IGNORECASE)
 	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)")
+		return "Too many matches! (>25)"
 	elif len(matches) > 1:
-		bot.msg(user, "Multiple matches: %s" % (', '.join(matches)))
+		return "Multiple matches: %s" % (', '.join(matches))
 	elif len(matches) == 1:
-		bot.msg(user, "One match: %s" % (matches[0]))
+		return "One match: %s" % (matches[0])
 	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")