From efcc50b43270077526fcd4a32c7bd9217a593133 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Mon, 11 Jan 2021 16:50:29 -0800
Subject: [PATCH] Tighten up the welcome messages for a new hunt and a new
 puzzle

And point to `/help` in both cases for more details.
---
 turbot/events.py | 46 +++++++++++-----------------------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

diff --git a/turbot/events.py b/turbot/events.py
index 4ea0684..508e8d9 100644
--- a/turbot/events.py
+++ b/turbot/events.py
@@ -146,7 +146,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! "
-        + "Type `/puzzle new` to create puzzles for the hunt.")
+        + "Type `/new` to create a puzzle for the hunt and `/help` for help.")
 
     return lambda_success
 
@@ -218,49 +218,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'])
-- 
2.43.0