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

diff --git a/turbot/hunt.py b/turbot/hunt.py
index 1c2ee0e..2d4de51 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,10 +25,26 @@ 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
 
+    Returns a list of lists of blocks, (broken up by round so that
+    the receiver should do one Slack post for each entry in the
+    outer array.
+
     The hunt argument should be a dictionary as returned from the
     database.
 
@@ -42,8 +60,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 +81,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 +116,21 @@ 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)
+            )
+        ]
     ]
+    block = blocks[0]
 
     if not len(puzzles):
-        blocks += [
-            section_block(text_block("No puzzles found."))
+        text = "No puzzles found."
+        if puzzle_status != 'all':
+            text += ' (Consider searching for "all" puzzles?)'
+        block += [
+            section_block(text_block(text))
         ]
 
     # Construct blocks for each round
@@ -117,10 +139,12 @@ def hunt_blocks(turb, hunt, puzzle_status='unsolved', search_terms=[],
             continue
         # If we're only displaying one round the round header is redundant
         if limit_to_rounds and len(limit_to_rounds) == 1:
-            blocks += round_blocks(round, puzzles, omit_header=True)
+            block += round_blocks(round, puzzles, omit_header=True)
         else:
-            blocks += round_blocks(round, puzzles)
-        blocks.append(divider_block())
+            block += round_blocks(round, puzzles)
+        block.append(divider_block())
+        blocks.append([])
+        block = blocks[-1]
 
     # Also blocks for any puzzles not in any round
     stray_puzzles = [puzzle for puzzle in puzzles if 'rounds' not in puzzle]
@@ -132,10 +156,30 @@ def hunt_blocks(turb, hunt, puzzle_status='unsolved', search_terms=[],
     # to rounds but specifically the round of unassigned puzzles
     if len(stray_puzzles) and not limit_to_rounds:
         stray_text = "*Puzzles with no assigned round*"
-        blocks.append(section_block(text_block(stray_text)))
+        block.append(section_block(text_block(stray_text)))
         for puzzle in stray_puzzles:
-            blocks += puzzle_blocks(puzzle)
+            block += puzzle_blocks(puzzle)
 
-    blocks.append(divider_block())
+    block.append(divider_block())
 
     return blocks
+
+def hunt_update_topic(turb, hunt):
+
+    channel_id = hunt['channel_id']
+
+    topic = ''
+
+    url = hunt.get('url', None)
+    if url:
+        topic += "<{}|Hunt website> ".format(url)
+
+    state = hunt.get('state', None)
+    if state:
+        topic += state
+
+    # Slack only allows 250 characters for a topic
+    if len(topic) > 250:
+        topic = topic[:247] + "..."
+    turb.slack_client.conversations_setTopic(channel=channel_id,
+                                             topic=topic)