Quote parameters to HYPERLINK

[turbot] / turbot / events.py

diff --git a/turbot/events.py b/turbot/events.py
index 7a8654e837fad7d6a1cbf447c1fa158fdb907197..0dabb71d5cbca6902da2105fa314a8714d780a80 100644 (file)
--- a/turbot/events.py
+++ b/turbot/events.py
@@ -3,7 +3,7 @@ from turbot.blocks import (
 )
 import turbot.sheets
 import turbot.slack
-from turbot.slack import slack_send_message
+from turbot.slack import slack_send_message, slack_channel_members
 
 TURBOT_USER_ID = 'U01B9QM4P9R'
 
@@ -83,13 +83,17 @@ def home(turb, user_id):
 
     hunt_blocks = []
     for hunt in hunts:
-        if hunt['active']:
-            hunt_blocks += hunt_block(turb, hunt)
+        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)
 
     return {
         "type": "home",
         "blocks": [
-            section_block(text_block("*Active hunts*")),
+            section_block(text_block("*Hunts you belong to*")),
             divider_block(),
             * hunt_blocks,
             actions_block(button_block("New hunt", "new_hunt"))
@@ -148,8 +152,8 @@ def hunt_channel_created(turb, channel_name, channel_id):
         "Welcome to the channel for the {} hunt! ".format(item['name'])
         + "Please wait a minute or two while I create some backend resources.")
 
-    # Create a sheet for the channel
-    sheet = turbot.sheets.sheets_create(turb, channel_name)
+    # Create a sheet for the hunt
+    sheet = turbot.sheets.sheets_create(turb, item['name'])
 
     # Update the database with the URL of the sheet
     item['sheet_url'] = sheet['url']
@@ -243,10 +247,11 @@ def puzzle_channel_created(turb, puzzle_channel_name, puzzle_channel_id):
     # 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)
     puzzle_table.put_item(Item=item)
 
     # Create a sheet for the puzzle
-    sheet = turbot.sheets.sheets_create_for_puzzle(turb, puzzle_channel_name)
+    sheet = turbot.sheets.sheets_create_for_puzzle(turb, item)
 
     # Update the database with the URL of the sheet
     item['sheet_url'] = sheet['url']
@@ -255,6 +260,7 @@ def puzzle_channel_created(turb, puzzle_channel_name, puzzle_channel_id):
     # 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',
@@ -274,8 +280,8 @@ def puzzle_channel_created(turb, puzzle_channel_name, puzzle_channel_id):
 
         slack_send_message(
             turb.slack_client, puzzle_channel_id,
-            "Inviting all members from the hunt channel:  {}"
-            .format(hunt_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
@@ -285,6 +291,55 @@ def puzzle_channel_created(turb, puzzle_channel_name, puzzle_channel_id):
                 users=members[cursor:cursor + 500])
             cursor += 500
 
+    # 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'])
+    )
+
+    if 'url' in item:
+        welcome_msg += (
+            "See the <{}|puzzle itself> ".format(item['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'])
+    )
+
+    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=puzzle_channel_id,
+        text="New puzzle: {}".format(item['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))
+        ])
+
     return lambda_success
 
 def channel_created(turb, event):