X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Fhunt.py;h=97712982fd32aa7afb4367a7b65ce0838f3c910f;hb=268ef53019a9886ece748684e214158d6ae5cdb3;hp=1c2ee0e1120c579d8462e65cb721e29c95c122dc;hpb=2b1b344f4734089e591acac75d8c2d2f1bc70f3b;p=turbot

diff --git a/turbot/hunt.py b/turbot/hunt.py
index 1c2ee0e..9771298 100644
--- a/turbot/hunt.py
+++ b/turbot/hunt.py
@@ -1,4 +1,6 @@
-from turbot.blocks import section_block, text_block, divider_block
+from turbot.blocks import (
+    section_block, text_block, divider_block, accessory_block, button_block
+)
 from turbot.round import round_blocks
 from turbot.puzzle import puzzle_blocks, puzzle_matches_all
 from turbot.channel import channel_url
@@ -23,6 +25,18 @@ def find_hunt_for_hunt_id(turb, hunt_id):
     else:
         return None
 
+def hunt_puzzles_for_hunt_id(turb, hunt_id):
+    """Return all puzzles that belong to the given hunt_id"""
+
+    response = turb.table.query(
+        KeyConditionExpression=(
+            Key('hunt_id').eq(hunt_id) &
+            Key('SK').begins_with('puzzle-')
+        )
+    )
+
+    return response['Items']
+
 def hunt_blocks(turb, hunt, puzzle_status='unsolved', search_terms=[],
                 limit_to_rounds=None):
     """Generate Slack blocks for a hunt
@@ -42,8 +56,9 @@ def hunt_blocks(turb, hunt, puzzle_status='unsolved', search_terms=[],
                     all of these terms will be included in the
                     result. A match will be considered on any of
                     puzzle title, round title, puzzle URL, puzzle
-                    state or solution string. Terms can include
-                    regular expression syntax.
+                    state, puzzle type, tags, or solution
+                    string. Terms can include regular expression
+                    syntax.
 
       limit_to_rounds: A list of rounds. If provided only the given
                        rounds will be included in the output. Note:
@@ -62,13 +77,7 @@ def hunt_blocks(turb, hunt, puzzle_status='unsolved', search_terms=[],
     hunt_id = hunt['hunt_id']
     channel_id = hunt['channel_id']
 
-    response = turb.table.query(
-        KeyConditionExpression=(
-            Key('hunt_id').eq(hunt_id) &
-            Key('SK').begins_with('puzzle-')
-        )
-    )
-    puzzles = response['Items']
+    puzzles = hunt_puzzles_for_hunt_id(turb, hunt_id)
 
     # Filter the set of puzzles according the the requested puzzle_status
     if puzzle_status in ('solved', 'unsolved'):
@@ -103,12 +112,18 @@ def hunt_blocks(turb, hunt, puzzle_status='unsolved', search_terms=[],
         hunt_text += " matching {}".format(" AND ".join(quoted_terms))
 
     blocks = [
-        section_block(text_block(hunt_text)),
+        accessory_block(
+            section_block(text_block(hunt_text)),
+            button_block("✏", "edit_hunt", hunt_id)
+        )
     ]
 
     if not len(puzzles):
+        text = "No puzzles found."
+        if puzzle_status != 'all':
+            text += ' (Consider searching for "all" puzzles?)'
         blocks += [
-            section_block(text_block("No puzzles found."))
+            section_block(text_block(text))
         ]
 
     # Construct blocks for each round