]> git.cworth.org Git - turbot/blobdiff - turbot/events.py
Make the error message from /state a little more explicit
[turbot] / turbot / events.py
index a118835d3b8eb0b42a5e04f6483abbebaf95a74b..03c97e18cfd17960176d50ae80674503fb15d563 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'
@@ -58,7 +58,12 @@ def hunt_block(turb, hunt):
     hunt_id = hunt['hunt_id']
     channel_id = hunt['channel_id']
 
-    response = turb.db.Table(hunt_id).scan()
+    response = turb.table.query(
+        KeyConditionExpression=(
+            Key('hunt_id').eq(hunt_id) &
+            Key('SK').begins_with('puzzle-')
+        )
+    )
     puzzles = response['Items']
 
     hunt_text = "*<{}|{}>*".format(channel_url(channel_id), name)
@@ -77,7 +82,9 @@ def home(turb, user_id):
 
     # Behave cleanly if there is no "turbot" table at all yet.
     try:
-        response = turb.table.scan()
+        response = turb.table.scan(
+            IndexName="is_hunt_index",
+        )
         hunts = response['Items']
     except Exception:
         hunts = []
@@ -133,7 +140,7 @@ def hunt_channel_created(turb, channel_name, channel_id):
         KeyConditionExpression=Key("channel_id").eq(channel_id)
     )
     if 'Items' not in response:
-        print("Warning: Cannot find channel_id {} in hunts table. "
+        print("Warning: Cannot find channel_id {} in turbot table. "
               .format(channel_id) + "Letting Slack retry this event")
         return lambda_error
 
@@ -200,96 +207,62 @@ def set_channel_description(turb, puzzle):
     turb.slack_client.conversations_setTopic(channel=channel_id,
                                              topic=description)
 
-def puzzle_channel_created(turb, puzzle_channel_name, puzzle_channel_id):
+def puzzle_channel_created(turb, channel_name, channel_id):
     """Creates sheet and invites user for a newly-created puzzle channel"""
 
-    hunt_id = puzzle_channel_name.split('-')[0]
-
     # First see if we can find an entry for this puzzle in the database.
     # If not, simply return an error and let Slack retry
-    response = turb.table.get_item(
-        Key={'channel_id': puzzle_channel_id},
-        ConsistentRead=True
+    response = turb.table.query(
+        IndexName="channel_id_index",
+        KeyConditionExpression=Key("channel_id").eq(channel_id),
     )
-    if 'Item' not in response:
-        print("Warning: Cannot find channel_id {} in {} table. "
-              .format(puzzle_channel_id, hunt_id)
-              + "Letting Slack retry this event")
+    if 'Items' not in response:
+        print("Warning: Cannot find channel_id {} in turbot table. "
+              .format(channel_id) + "Letting Slack retry this event")
         return lambda_error
 
-    item = response['Item']
+    puzzle = response['Items'][0]
 
-    if 'sheet_url' in item:
+    if 'sheet_url' in puzzle:
         print("Info: channel_id {} already has sheet_url {}. Exiting."
-              .format(puzzle_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(puzzle_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:
-
-        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, puzzle_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=puzzle_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 = (
@@ -313,8 +286,8 @@ def puzzle_channel_created(turb, puzzle_channel_name, puzzle_channel_id):
     )
 
     turb.slack_client.chat_postMessage(
-        channel=puzzle_channel_id,
-        text="New puzzle: {}".format(item['name']),
+        channel=channel_id,
+        text="New puzzle: {}".format(['name']),
         blocks=[
             section_block(text_block(welcome_msg)),
             section_block(text_block(sheet_msg)),
@@ -322,6 +295,15 @@ def puzzle_channel_created(turb, puzzle_channel_name, puzzle_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):