X-Git-Url: https://git.cworth.org/git?p=turbot;a=blobdiff_plain;f=turbot%2Fpuzzle.py;h=1dbea5d74906c447b3e6b09df70758f4379389d5;hp=b361b10f3d322ce5efb43abd92c3e978e3e8c9d3;hb=0878d40471403513b6da016d7412d07a5d903e9b;hpb=3385d460742786491db31c1587a86886a3e1b6c8

diff --git a/turbot/puzzle.py b/turbot/puzzle.py
index b361b10..1dbea5d 100644
--- a/turbot/puzzle.py
+++ b/turbot/puzzle.py
@@ -129,8 +129,9 @@ def puzzle_matches_one(puzzle, pattern):
     """Returns True if this puzzle matches the given string (regexp)
 
     A match will be considered on any of puzzle title, round title,
-    puzzle URL, puzzle state, or solution string. The string can
-    include regular expression syntax. Matching is case insensitive.
+    puzzle URL, puzzle state, puzzle type, tags, or solution
+    string. The string can include regular expression syntax. Matching
+    is case insensitive.
     """
 
     p = re.compile('.*'+pattern+'.*', re.IGNORECASE)
@@ -151,21 +152,31 @@ def puzzle_matches_one(puzzle, pattern):
         if p.match(puzzle['state']):
             return True
 
+    if 'type' in puzzle:
+        if p.match(puzzle['type']):
+            return True
+
     if 'solution' in puzzle:
         for solution in puzzle['solution']:
             if p.match(solution):
                 return True
 
+    if 'tags' in puzzle:
+        for tag in puzzle['tags']:
+            if p.match(tag):
+                return True
+
     return False
 
 def puzzle_matches_all(puzzle, patterns):
     """Returns True if this puzzle matches all of the given list of patterns
 
     A match will be considered on any of puzzle title, round title,
-    puzzle URL, puzzle state, or solution string. All patterns must
-    match the puzzle somewhere, (that is, there is an implicit logical
-    AND between patterns). Patterns can include regular expression
-    syntax. Matching is case insensitive.
+    puzzle URL, puzzle state, puzzle types, tags, or solution
+    string. All patterns must match the puzzle somewhere, (that is,
+    there is an implicit logical AND between patterns). Patterns can
+    include regular expression syntax. Matching is case insensitive.
+
     """
 
     for pattern in patterns: