X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=turbot%2Fevents.py;h=e3d37460d4f46b0efeca4b98359bb2479524e582;hb=1ae7779203646ce8464e4349f7e78e6abd172848;hp=4099ac5a25c11f30f45f7994ed2328a8846cce45;hpb=d47444e021aab4d3a89fd0e1b75c0a49867290b7;p=turbot

diff --git a/turbot/events.py b/turbot/events.py
index 4099ac5..e3d3746 100644
--- a/turbot/events.py
+++ b/turbot/events.py
@@ -14,6 +14,12 @@ from boto3.dynamodb.conditions import Key
 
 TURBOT_USER_ID = 'U01B9QM4P9R'
 
+# This is a list of user IDs that should not be auto-invited to new channels
+AUTO_INVITE_DENY_LIST = (
+    'U01B9QM4P9R',  # Turbot itself
+    'U01HQABASLW',  # Lavi
+)
+
 events = {}
 
 lambda_success = {'statusCode': 200}
@@ -223,17 +229,25 @@ def puzzle_channel_created(turb, channel_name, channel_id):
     # Find all members of the hunt channel
     members = slack_channel_members(turb.slack_client, hunt['channel_id'])
 
-    # Filter out Turbot's own ID to avoid inviting itself
+    # Filter out Turbot's own ID as well as that of any user who
     # has opted out of being auto-invited
-    members = [m for m in members if m != TURBOT_USER_ID]
+    members = [m for m in members if m not in AUTO_INVITE_DENY_LIST]
 
+    ### With the code below disabling auto-invitation, be honest about that.
     slack_send_message(
         turb.slack_client, channel_id,
-        "Inviting all members from the hunt channel: "
+        "Not inviting all members from the hunt channel: "
         + "<#{}>".format(hunt['channel_id']))
 
     # Invite those members to the puzzle channel (in chunks of 500)
     cursor = 0
+
+    ### This line of code disables the auto-invitation of hunt members
+    ### to channels, (which I'm throwing in at the request of Avram
+    ### who is mostly-solo solving puzzles after Mystery Hunt 2022 is
+    ### over).
+    cursor = len(members)
+
     while cursor < len(members):
         turb.slack_client.conversations_invite(
             channel=channel_id,