]> git.cworth.org Git - turbot/blobdiff - turbot/events.py
Add display of rounds in the Turbot home view
[turbot] / turbot / events.py
index 267d9397a6e2ee6d9336d967bf09561c9e0ca158..2f096b276ccae2e97faef2238f442de47c356b66 100644 (file)
@@ -1,9 +1,9 @@
 from turbot.blocks import (
     section_block, text_block, button_block, actions_block, divider_block
 )
-import turbot.slack
 from turbot.sheets import sheets_create, sheets_create_for_puzzle
 from turbot.slack import slack_send_message, slack_channel_members
+from turbot.hunt import find_hunt_for_hunt_id
 from boto3.dynamodb.conditions import Key
 
 TURBOT_USER_ID = 'U01B9QM4P9R'
@@ -53,7 +53,24 @@ def puzzle_block(puzzle):
 
     return section_block(text_block(puzzle_text))
 
-def hunt_block(turb, hunt):
+def round_blocks(round, puzzles):
+
+    round_text = "*Round: {}*".format(round)
+
+    blocks = [
+        section_block(text_block(round_text)),
+    ]
+
+    for puzzle in puzzles:
+        if 'rounds' not in puzzle:
+            continue
+        if round not in puzzle['rounds']:
+            continue
+        blocks.append(puzzle_block(puzzle))
+
+    return blocks
+
+def hunt_details_blocks(turb, hunt):
     name = hunt['name']
     hunt_id = hunt['hunt_id']
     channel_id = hunt['channel_id']
@@ -66,14 +83,45 @@ def hunt_block(turb, hunt):
     )
     puzzles = response['Items']
 
+    # Compute the set of rounds across all puzzles
+    rounds = set()
+    for puzzle in puzzles:
+        if 'rounds' not in puzzle:
+            continue
+        for round in puzzle['rounds']:
+            rounds.add(round)
+
     hunt_text = "*<{}|{}>*".format(channel_url(channel_id), name)
 
-    return [
+    blocks = [
         section_block(text_block(hunt_text)),
-        *[puzzle_block(puzzle) for puzzle in puzzles],
-        divider_block()
     ]
 
+    # Construct blocks for each round
+    for round in rounds:
+        blocks += round_blocks(round, puzzles)
+
+    # Also blocks for any puzzles not in any round
+    stray_puzzles = [puzzle for puzzle in puzzles if 'rounds' not in puzzle]
+    if len(stray_puzzles):
+        stray_text = "*Puzzles with no asigned round*"
+        blocks.append(section_block(text_block(stray_text)))
+        for puzzle in stray_puzzles:
+            blocks.append(puzzle_block(puzzle))
+
+    blocks.append(divider_block())
+
+    return blocks
+
+def hunt_link_block(turb, hunt):
+
+    name = hunt['name']
+    channel_id = hunt['channel_id']
+
+    hunt_link = "*<{}|{}>*".format(channel_url(channel_id), name)
+
+    return section_block(text_block(hunt_link)),
+
 def home(turb, user_id):
     """Returns a view to be published as the turbot home tab for user_id
 
@@ -89,30 +137,40 @@ def home(turb, user_id):
     except Exception:
         hunts = []
 
-    hunt_blocks = []
+    my_hunt_blocks = []
+    available_hunt_blocks = []
     for hunt in hunts:
         if not hunt['active']:
             continue
-        if user_id not in slack_channel_members(turb.slack_client,
-                                                hunt['channel_id']):
-            continue
-        hunt_blocks += hunt_block(turb, hunt)
-
-    if len(hunt_blocks):
-        hunt_blocks = [
-            section_block(text_block("*Hunts you belong to*")),
+        if user_id in slack_channel_members(turb.slack_client,
+                                            hunt['channel_id']):
+            my_hunt_blocks += hunt_details_blocks(turb, hunt)
+        else:
+            available_hunt_blocks.append(hunt_link_block(turb, hunt))
+
+    if len(my_hunt_blocks):
+        my_hunt_blocks = [
+            section_block(text_block("*Hunts you belong to:*")),
             divider_block(),
-            * hunt_blocks
+            * my_hunt_blocks
         ]
     else:
-        hunt_blocks = [
+        my_hunt_blocks = [
             section_block(text_block("You do not belong to any hunts"))
         ]
 
+    if len(available_hunt_blocks):
+        available_hunt_blocks = [
+            section_block(text_block("*Hunts you can join:*")),
+            divider_block(),
+            * available_hunt_blocks
+        ]
+
     return {
         "type": "home",
         "blocks": [
-            * hunt_blocks,
+            * my_hunt_blocks,
+            * available_hunt_blocks,
             actions_block(button_block("New hunt", "new_hunt"))
         ]
     }
@@ -221,79 +279,48 @@ def puzzle_channel_created(turb, channel_name, channel_id):
               .format(channel_id) + "Letting Slack retry this event")
         return lambda_error
 
-    item = response['Items'][0]
+    puzzle = response['Items'][0]
 
-    if 'sheet_url' in item:
+    if 'sheet_url' in puzzle:
         print("Info: channel_id {} already has sheet_url {}. Exiting."
-              .format(channel_id, item['sheet_url']))
+              .format(channel_id, puzzle['sheet_url']))
         return lambda_success
 
     # Before launching into sheet creation, indicate that we're doing this
     # in the database. This way, if we take too long to create the sheet
     # and Slack retries the event, that next event will see this 'pending'
     # string and cleanly return (eliminating all future retries).
-    item['sheet_url'] = 'pending'
-    item['channel_url'] = channel_url(channel_id)
-    turb.table.put_item(Item=item)
+    puzzle['sheet_url'] = 'pending'
+    puzzle['channel_url'] = channel_url(channel_id)
+    turb.table.put_item(Item=puzzle)
 
     # Create a sheet for the puzzle
-    sheet = sheets_create_for_puzzle(turb, item)
+    sheet = sheets_create_for_puzzle(turb, puzzle)
 
     # Update the database with the URL of the sheet
-    item['sheet_url'] = sheet['url']
-    turb.table.put_item(Item=item)
+    puzzle['sheet_url'] = sheet['url']
+    turb.table.put_item(Item=puzzle)
 
     # Get the new sheet_url into the channel description
-    set_channel_description(turb, item)
-
-    # Lookup and invite all users from this hunt to this new puzzle
-    #    hunts_table = turb.db.Table('hunts')
-    #    response = hunts_table.scan(
-    #        FilterExpression='hunt_id = :hunt_id',
-    #        ExpressionAttributeValues={':hunt_id': hunt_id}
-    #    )
-    #
-    #    if 'Items' in response:
-    if False:
-        hunt_channel_id = response['Items'][0]['channel_id']
-
-        # Find all members of the hunt channel
-        members = turbot.slack.slack_channel_members(turb.slack_client,
-                                                     hunt_channel_id)
-
-        # Filter out Turbot's own ID to avoid inviting itself
-        members = [m for m in members if m != TURBOT_USER_ID]
-
-        slack_send_message(
-            turb.slack_client, channel_id,
-            "Inviting all members from the hunt channel: "
-            + "<#{}>".format(hunt_channel_id))
-
-        # Invite those members to the puzzle channel (in chunks of 500)
-        cursor = 0
-        while cursor < len(members):
-            turb.slack_client.conversations_invite(
-                channel=channel_id,
-                users=members[cursor:cursor + 500])
-            cursor += 500
+    set_channel_description(turb, puzzle)
 
     # And finally, give a welcome message with some documentation
     # on how to update the state of the puzzle in the database.
     welcome_msg = (
         "Welcome! This channel is the primary place to "
         + "discuss things as the team works together to solve the "
-        + "puzzle '{}'. ".format(item['name'])
+        + "puzzle '{}'. ".format(puzzle['name'])
     )
 
-    if 'url' in item:
+    if 'url' in puzzle:
         welcome_msg += (
-            "See the <{}|puzzle itself> ".format(item['url'])
+            "See the <{}|puzzle itself> ".format(puzzle['url'])
             + "for what was originally presented to us."
         )
 
     sheet_msg = (
         "Actual puzzle solving work will take place within the following "
-        + "<{}|shared spreadsheet> ".format(item['sheet_url'])
+        + "<{}|shared spreadsheet> ".format(puzzle['sheet_url'])
     )
 
     state_msg = (
@@ -318,7 +345,7 @@ def puzzle_channel_created(turb, channel_name, channel_id):
 
     turb.slack_client.chat_postMessage(
         channel=channel_id,
-        text="New puzzle: {}".format(item['name']),
+        text="New puzzle: {}".format(['name']),
         blocks=[
             section_block(text_block(welcome_msg)),
             section_block(text_block(sheet_msg)),
@@ -326,6 +353,15 @@ def puzzle_channel_created(turb, channel_name, channel_id):
             section_block(text_block(solved_msg))
         ])
 
+    # Finally, finally, notify the hunt channel about the new puzzle
+    hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id'])
+    slack_send_message(
+        turb.slack_client, hunt['channel_id'],
+        "New puzzle available: <{}|{}>".format(
+            puzzle['channel_url'],
+            puzzle['name'])
+    )
+
     return lambda_success
 
 def channel_created(turb, event):