Add some links to the puzzle sheet when originally creating it

[turbot] / turbot / events.py

diff --git a/turbot/events.py b/turbot/events.py
index c0549828b069d7cf0e8f5e9c0dc527325617ad39..0a1eb099e8d3744782bd665be10f11ac03849799 100644 (file)
--- a/turbot/events.py
+++ b/turbot/events.py
@@ -3,7 +3,7 @@ from turbot.blocks import (
 )
 import turbot.sheets
 import turbot.slack
-import itertools
+from turbot.slack import slack_send_message
 
 TURBOT_USER_ID = 'U01B9QM4P9R'
 
@@ -12,18 +12,43 @@ 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:"
 
-    puzzle_text = "{} {}: <#{}>".format(status_emoji, name, channel_id)
+    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))
 
@@ -35,7 +60,7 @@ def hunt_block(turb, hunt):
     response = turb.db.Table(hunt_id).scan()
     puzzles = response['Items']
 
-    hunt_text = "*{}*: <#{}>".format(name, channel_id)
+    hunt_text = "*<{}|{}>*".format(channel_url(channel_id), name)
 
     return [
         section_block(text_block(hunt_text)),
@@ -118,22 +143,21 @@ 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
-    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']
     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(
@@ -158,13 +182,33 @@ 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
 
+def set_channel_description(turb, puzzle):
+    channel_id = puzzle['channel_id']
+    description = puzzle['name']
+    url = puzzle.get('url', None)
+    sheet_url = puzzle.get('sheet_url', None)
+
+    links = []
+    if url:
+        links.append("<{}|Puzzle>".format(url))
+    if sheet_url:
+        links.append("<{}|Sheet>".format(sheet_url))
+
+    if len(links):
+        description += "({})".format(', '.join(links))
+
+    turb.slack_client.conversations_setPurpose(channel=channel_id,
+                                               purpose=description)
+    turb.slack_client.conversations_setTopic(channel=channel_id,
+                                             topic=description)
+
 def puzzle_channel_created(turb, puzzle_channel_name, puzzle_channel_id):
     """Creates sheet and invites user for a newly-created puzzle channel"""
 
@@ -199,20 +243,20 @@ 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']
     puzzle_table.put_item(Item=item)
 
-    # Message the channel with the URL of the puzzle's sheet
-    turb.slack_client.chat_postMessage(channel=puzzle_channel_id,
-                                       text="Sheet created for this puzzle: {}"
-                                       .format(sheet['url']))
+    # Get the new sheet_url into the channel description
+    set_channel_description(turb, item)
 
+    # Finally, 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',
@@ -230,9 +274,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)