X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Fevents.py;h=4186e1891b9c799a6244e00417299f4d248ac7ee;hb=c381dad4cf05f49da812d10841d102a732d8273d;hp=adf7c9e04853f0a3561bf96749af14e05b4157ee;hpb=5f54f1ee53b8ae1b9d93df3f56c6a992f1d1bf0a;p=turbot

diff --git a/turbot/events.py b/turbot/events.py
index adf7c9e..4186e18 100644
--- a/turbot/events.py
+++ b/turbot/events.py
@@ -1,7 +1,7 @@
 from turbot.blocks import (
     section_block, text_block, button_block, actions_block, divider_block
 )
-from turbot.hunt import hunt_blocks, find_hunt_for_hunt_id
+from turbot.hunt import find_hunt_for_hunt_id
 from turbot.sheets import (
     sheets_create, sheets_create_for_puzzle, sheets_create_folder
 )
@@ -43,11 +43,14 @@ 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_blocks(turb, hunt, puzzle_status='all')
+            my_hunt_blocks.append(hunt_link_block(turb, hunt))
         else:
             available_hunt_blocks.append(hunt_link_block(turb, hunt))
 
@@ -58,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 = [
@@ -123,7 +126,7 @@ def hunt_channel_created(turb, channel_name, channel_id):
     slack_send_message(
         turb.slack_client, channel_id,
         "Welcome to the channel for the {} hunt! ".format(hunt['name'])
-        + "Please wait a minute or two while I create some backend resources.")
+        + "Please wait a moment or two while I create some backend resources.")
 
     # Create a new folder within Google drive for the hunt
     hunt['folder_id'] = sheets_create_folder(turb, hunt['hunt_id'])
@@ -146,7 +149,7 @@ def hunt_channel_created(turb, channel_name, channel_id):
     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
 
@@ -218,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'])
-    )
-
-    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)."
+    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."
     )
 
-    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'])