]> git.cworth.org Git - turbot/blobdiff - turbot/events.py
Add some debugging of the turbot home app
[turbot] / turbot / events.py
index ccddc973a1db502e7381c20f068d73c29f23313e..4186e1891b9c799a6244e00417299f4d248ac7ee 100644 (file)
@@ -1,9 +1,12 @@
 from turbot.blocks import (
     section_block, text_block, button_block, actions_block, divider_block
 )
-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 turbot.sheets import (
+    sheets_create, sheets_create_for_puzzle, sheets_create_folder
+)
+from turbot.slack import slack_send_message, slack_channel_members
+from turbot.channel import channel_url
 from boto3.dynamodb.conditions import Key
 
 TURBOT_USER_ID = 'U01B9QM4P9R'
@@ -13,77 +16,14 @@ events = {}
 lambda_success = {'statusCode': 200}
 lambda_error = {'statusCode': 400}
 
-def channel_url(channel_id):
-    return "https://halibutthatbass.slack.com/archives/{}".format(channel_id)
-
-def puzzle_block(puzzle):
-    name = puzzle['name']
-    status = puzzle['status']
-    solution = puzzle['solution']
-    channel_id = puzzle['channel_id']
-    url = puzzle.get('url', None)
-    sheet_url = puzzle.get('sheet_url', None)
-    state = puzzle.get('state', None)
-    status_emoji = ''
-    solution_str = ''
-
-    if status == 'solved':
-        status_emoji = ":ballot_box_with_check:"
-    else:
-        status_emoji = ":white_square:"
-
-    if len(solution):
-        solution_str = "*`" + '`, `'.join(solution) + "`*"
-
-    links = []
-    if url:
-        links.append("<{}|Puzzle>".format(url))
-    if sheet_url:
-        links.append("<{}|Sheet>".format(sheet_url))
-
-    state_str = ''
-    if state:
-        state_str = "\n{}".format(state)
-
-    puzzle_text = "{}{} <{}|{}> ({}){}".format(
-        status_emoji, solution_str,
-        channel_url(channel_id), name,
-        ', '.join(links), state_str
-    )
-
-    return section_block(text_block(puzzle_text))
-
-def hunt_details_block(turb, hunt):
-    name = hunt['name']
-    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']
-
-    hunt_text = "*<{}|{}>*".format(channel_url(channel_id), name)
-
-    return [
-        section_block(text_block(hunt_text)),
-        *[puzzle_block(puzzle) for puzzle in puzzles],
-        divider_block()
-    ]
-
-def available_hunt_block(turb, hunt):
+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)),
-    ]
+    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
@@ -103,13 +43,16 @@ def home(turb, user_id):
     my_hunt_blocks = []
     available_hunt_blocks = []
     for hunt in hunts:
+        print("Generating turbot home view for hunt '" + hunt['hunt_id'] + "'")
         if not hunt['active']:
+            print("Never mind, that hunt is not active.")
             continue
+        print("Hunt '" + hunt['hunt_id'] + "' is active, moving forward.")
         if user_id in slack_channel_members(turb.slack_client,
                                             hunt['channel_id']):
-            my_hunt_blocks += hunt_details_block(turb, hunt)
+            my_hunt_blocks.append(hunt_link_block(turb, hunt))
         else:
-            available_hunt_blocks += available_hunt_block(turb, hunt)
+            available_hunt_blocks.append(hunt_link_block(turb, hunt))
 
     if len(my_hunt_blocks):
         my_hunt_blocks = [
@@ -118,9 +61,9 @@ def home(turb, user_id):
             * my_hunt_blocks
         ]
     else:
-        my_hunt_blocks = [
+        my_hunt_blocks.append([
             section_block(text_block("You do not belong to any hunts"))
-        ]
+        ])
 
     if len(available_hunt_blocks):
         available_hunt_blocks = [
@@ -165,46 +108,48 @@ def hunt_channel_created(turb, channel_name, channel_id):
               .format(channel_id) + "Letting Slack retry this event")
         return lambda_error
 
-    item = response['Items'][0]
+    hunt = response['Items'][0]
 
-    if 'sheet_url' in item:
+    if 'sheet_url' in hunt:
         print("Info: channel_id {} already has sheet_url {}. Exiting."
-              .format(channel_id, item['sheet_url']))
+              .format(channel_id, hunt['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'
-    turb.table.put_item(Item=item)
+    hunt['sheet_url'] = 'pending'
+    turb.table.put_item(Item=hunt)
 
     # Also, let the channel users know what we are up to
     slack_send_message(
         turb.slack_client, channel_id,
-        "Welcome to the channel for the {} hunt! ".format(item['name'])
-        + "Please wait a minute or two while I create some backend resources.")
+        "Welcome to the channel for the {} hunt! ".format(hunt['name'])
+        + "Please wait a moment or two while I create some backend resources.")
 
-    # Create a sheet for the hunt
-    sheet = sheets_create(turb, item['name'])
+    # Create a new folder within Google drive for the hunt
+    hunt['folder_id'] = sheets_create_folder(turb, hunt['hunt_id'])
 
-    # Update the database with the URL of the sheet
-    item['sheet_url'] = sheet['url']
-    turb.table.put_item(Item=item)
+    # Create a sheet for the hunt
+    sheet = sheets_create(turb, hunt['name'], hunt['folder_id'])
+    hunt['sheet_url'] = sheet['url']
 
     # Message the channel with the URL of the sheet
     slack_send_message(turb.slack_client, channel_id,
                        "Sheet created for this hunt: {}".format(sheet['url']))
 
-    # Mark the hunt as active in the database
-    item['active'] = True
-    turb.table.put_item(Item=item)
+    # Mark the hunt as active now
+    hunt['active'] = True
+
+    # Update the database with all the changes we have made to the hunt
+    turb.table.put_item(Item=hunt)
 
     # Message the hunt channel that the database is ready
     slack_send_message(
         turb.slack_client, channel_id,
         "Thank you for waiting. This hunt is now ready to begin! "
-        + "Use `/puzzle` to create puzzles for the hunt.")
+        + "Type `/new` to create a puzzle for the hunt and `/help` for help.")
 
     return lambda_success
 
@@ -249,6 +194,10 @@ def puzzle_channel_created(turb, channel_name, channel_id):
               .format(channel_id, puzzle['sheet_url']))
         return lambda_success
 
+    # We need hunt from the database to know which folder to create
+    # the sheet in.
+    hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id'])
+
     # 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'
@@ -258,7 +207,7 @@ def puzzle_channel_created(turb, channel_name, channel_id):
     turb.table.put_item(Item=puzzle)
 
     # Create a sheet for the puzzle
-    sheet = sheets_create_for_puzzle(turb, puzzle)
+    sheet = sheets_create_for_puzzle(turb, puzzle, hunt['folder_id'])
 
     # Update the database with the URL of the sheet
     puzzle['sheet_url'] = sheet['url']
@@ -272,49 +221,25 @@ def puzzle_channel_created(turb, channel_name, channel_id):
     welcome_msg = (
         "Welcome! This channel is the primary place to "
         + "discuss things as the team works together to solve the "
-        + "puzzle '{}'. ".format(puzzle['name'])
+        + "puzzle \"{}\". ".format(puzzle['name'])
     )
 
     if 'url' in puzzle:
         welcome_msg += (
             "See the <{}|puzzle itself> ".format(puzzle['url'])
-            + "for what was originally presented to us."
+            + "for what was originally presented to us. "
         )
 
-    sheet_msg = (
-        "Actual puzzle solving work will take place within the following "
-        + "<{}|shared spreadsheet> ".format(puzzle['sheet_url'])
+    welcome_msg += (
+        "Actual puzzle solving work will take place within the following " +
+        "<{}|shared spreadsheet> ".format(puzzle['sheet_url']) +
+        "\n\n"
+        "Common commands for updating the puzzle are `/state NEW STATE`, " +
+        "`/tag NEW_TAG`, and `/solved SOLUTION` . See `/help` for details " +
+        "and for additional commands."
     )
 
-    state_msg = (
-        "Whenever the status of the puzzle progress changes "
-        + "significantly, please type `/state` with a brief message "
-        + "explaining where things stand. This could be something "
-        + "like `/state Grid is filled. Need insight for extraction.` "
-        + "or `/state Nathan has printed this and is cutting/assembling`. "
-        + "It's especially important to put information in `/state` "
-        + "when you step away from a puzzle so the next team members "
-        + "to arrive will know what is going on."
-    )
-
-    solved_msg = (
-        "When a puzzle has been solved, submitted, and the solution is "
-        + "confirmed, please type `/solved THE PUZZLE ANSWER HERE`. All "
-        + "information given in `/state` and `/solved` will be presented "
-        + "in this channel's topic as well as in the hunt overview "
-        + "(which is available by selecting \"Turbot\" from the Slack "
-        + "list of members)."
-    )
-
-    turb.slack_client.chat_postMessage(
-        channel=channel_id,
-        text="New puzzle: {}".format(['name']),
-        blocks=[
-            section_block(text_block(welcome_msg)),
-            section_block(text_block(sheet_msg)),
-            section_block(text_block(state_msg)),
-            section_block(text_block(solved_msg))
-        ])
+    turb.slack_client.chat_postMessage(channel=channel_id, text=welcome_msg)
 
     # Finally, finally, notify the hunt channel about the new puzzle
     hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id'])