From ef8d8f359be149adbbdbeda88ec4b6bbbebf928e Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Thu, 31 Dec 2020 13:53:27 -0800
Subject: [PATCH] Remove code (previously disabled) to invite users to new
 puzzle channel

Instead, add a message to the hunt channel with a link to the new
puzzle channel whenever a new puzzle is created.
---
 turbot/events.py      | 42 ++++++++++--------------------------------
 turbot/hunt.py        | 18 ++++++++++++++++++
 turbot/interaction.py | 18 +-----------------
 3 files changed, 29 insertions(+), 49 deletions(-)
 create mode 100644 turbot/hunt.py

diff --git a/turbot/events.py b/turbot/events.py
index 80fbaa0..03c97e1 100644
--- a/turbot/events.py
+++ b/turbot/events.py
@@ -1,9 +1,9 @@
 from turbot.blocks import (
     section_block, text_block, button_block, actions_block, divider_block
 )
-import turbot.slack
 from turbot.sheets import sheets_create, sheets_create_for_puzzle
 from turbot.slack import slack_send_message, slack_channel_members
+from turbot.hunt import find_hunt_for_hunt_id
 from boto3.dynamodb.conditions import Key
 
 TURBOT_USER_ID = 'U01B9QM4P9R'
@@ -246,37 +246,6 @@ def puzzle_channel_created(turb, channel_name, channel_id):
     # Get the new sheet_url into the channel description
     set_channel_description(turb, puzzle)
 
-    # 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',
-    #        ExpressionAttributeValues={':hunt_id': hunt_id}
-    #    )
-    #
-    #    if 'Items' in response:
-    if False:
-        hunt_channel_id = response['Items'][0]['channel_id']
-
-        # Find all members of the hunt channel
-        members = turbot.slack.slack_channel_members(turb.slack_client,
-                                                     hunt_channel_id)
-
-        # Filter out Turbot's own ID to avoid inviting itself
-        members = [m for m in members if m != TURBOT_USER_ID]
-
-        slack_send_message(
-            turb.slack_client, channel_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
-        while cursor < len(members):
-            turb.slack_client.conversations_invite(
-                channel=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 = (
@@ -326,6 +295,15 @@ def puzzle_channel_created(turb, channel_name, channel_id):
             section_block(text_block(solved_msg))
         ])
 
+    # Finally, finally, notify the hunt channel about the new puzzle
+    hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id'])
+    slack_send_message(
+        turb.slack_client, hunt['channel_id'],
+        "New puzzle available: <{}|{}>".format(
+            puzzle['channel_url'],
+            puzzle['name'])
+    )
+
     return lambda_success
 
 def channel_created(turb, event):
diff --git a/turbot/hunt.py b/turbot/hunt.py
new file mode 100644
index 0000000..87e47fa
--- /dev/null
+++ b/turbot/hunt.py
@@ -0,0 +1,18 @@
+def find_hunt_for_hunt_id(turb, hunt_id):
+    """Given a hunt ID find the database item for that hunt
+
+    Returns None if hunt ID is not found, otherwise a
+    dictionary with all fields from the hunt's row in the table,
+    (channel_id, active, hunt_id, name, url, sheet_url, etc.).
+    """
+
+    response = turb.table.get_item(
+        Key={
+            'hunt_id': hunt_id,
+            'SK': 'hunt-{}'.format(hunt_id)
+        })
+
+    if 'Item' in response:
+        return response['Item']
+    else:
+        return None
diff --git a/turbot/interaction.py b/turbot/interaction.py
index 31d5549..b6fa7d7 100644
--- a/turbot/interaction.py
+++ b/turbot/interaction.py
@@ -1,5 +1,6 @@
 from slack.errors import SlackApiError
 from turbot.blocks import input_block, section_block, text_block
+from turbot.hunt import find_hunt_for_hunt_id
 import turbot.rot
 import turbot.sheets
 import turbot.slack
@@ -286,23 +287,6 @@ def channel_is_hunt(turb, channel_id):
 
     return response['Items'][0]
 
-def find_hunt_for_hunt_id(turb, hunt_id):
-    """Given a hunt ID find the database for for that hunt
-
-    Returns None if hunt ID is not found, otherwise a
-    dictionary with all fields from the hunt's row in the table,
-    (channel_id, active, hunt_id, name, url, sheet_url, etc.).
-
-    """
-    turbot_table = turb.db.Table("turbot")
-
-    response = turbot_table.get_item(Key={'hunt_id': hunt_id})
-
-    if 'Item' in response:
-        return response['Item']
-    else:
-        return None
-
 def find_hunt_for_channel(turb, channel_id, channel_name):
     """Given a channel ID/name find the id/name of the hunt for this channel
 
-- 
2.43.0