Add some feedback to the puzzle's channel when a puzzle is solved

[turbot] / turbot / events.py

diff --git a/turbot/events.py b/turbot/events.py
index c876b15217e2e252d4683782c1a1599f0af661ef..7a8654e837fad7d6a1cbf447c1fa158fdb907197 100644 (file)
--- a/turbot/events.py
+++ b/turbot/events.py
@@ -3,6 +3,7 @@ from turbot.blocks import (
 )
 import turbot.sheets
 import turbot.slack
+from turbot.slack import slack_send_message
 
 TURBOT_USER_ID = 'U01B9QM4P9R'
 
@@ -21,6 +22,7 @@ def puzzle_block(puzzle):
     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 = ''
 
@@ -38,10 +40,14 @@ def puzzle_block(puzzle):
     if sheet_url:
         links.append("<{}|Sheet>".format(sheet_url))
 
-    puzzle_text = "{}{} <{}|{}> ({})".format(
+    state_str = ''
+    if state:
+        state_str = "\n{}".format(state)
+
+    puzzle_text = "{}{} <{}|{}> ({}){}".format(
         status_emoji, solution_str,
         channel_url(channel_id), name,
-        ', '.join(links)
+        ', '.join(links), state_str
     )
 
     return section_block(text_block(puzzle_text))
@@ -137,9 +143,9 @@ def hunt_channel_created(turb, channel_name, channel_id):
     hunts_table.put_item(Item=item)
 
     # Also, let the channel users know what we are up to
-    turb.slack_client.chat_postMessage(
-        channel=channel_id,
-        text="Welcome to the channel for the {} hunt! ".format(item['name'])
+    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.")
 
     # Create a sheet for the channel
@@ -150,9 +156,8 @@ def hunt_channel_created(turb, channel_name, channel_id):
     hunts_table.put_item(Item=item)
 
     # Message the channel with the URL of the sheet
-    turb.slack_client.chat_postMessage(channel=channel_id,
-                                       text="Sheet created for this hunt: {}"
-                                       .format(sheet['url']))
+    slack_send_message(turb.slack_client, channel_id,
+                       "Sheet created for this hunt: {}".format(sheet['url']))
 
     # Create a database table for this hunt's puzzles
     table = turb.db.create_table(
@@ -177,9 +182,9 @@ def hunt_channel_created(turb, channel_name, channel_id):
     hunts_table.put_item(Item=item)
 
     # Message the hunt channel that the database is ready
-    turb.slack_client.chat_postMessage(
-        channel=channel_id,
-        text="Thank you for waiting. This hunt is now ready to begin! "
+    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.")
 
     return lambda_success
@@ -267,9 +272,9 @@ def puzzle_channel_created(turb, puzzle_channel_name, puzzle_channel_id):
         # Filter out Turbot's own ID to avoid inviting itself
         members = [m for m in members if m != TURBOT_USER_ID]
 
-        turb.slack_client.chat_postMessage(
-            channel=puzzle_channel_id,
-            text="Inviting all members from the hunt channel:  {}"
+        slack_send_message(
+            turb.slack_client, puzzle_channel_id,
+            "Inviting all members from the hunt channel:  {}"
             .format(hunt_id))
 
         # Invite those members to the puzzle channel (in chunks of 500)