Limit Turbot home display to hunts a user belongs to

[turbot] / turbot / events.py

diff --git a/turbot/events.py b/turbot/events.py
index feb0514a7a841c5a36ec8ca248ce1b814924f4e8..1b15f0cdd32b918c141ab13466b74a0de208c8d8 100644 (file)
--- a/turbot/events.py
+++ b/turbot/events.py
@@ -3,7 +3,7 @@ from turbot.blocks import (
 )
 import turbot.sheets
 import turbot.slack
-from turbot.slack import slack_send_message
+from turbot.slack import slack_send_message, slack_channel_members
 
 TURBOT_USER_ID = 'U01B9QM4P9R'
 
@@ -83,13 +83,17 @@ def home(turb, user_id):
 
     hunt_blocks = []
     for hunt in hunts:
-        if hunt['active']:
-            hunt_blocks += hunt_block(turb, hunt)
+        if not hunt['active']:
+            continue
+        if user_id not in slack_channel_members(turb.slack_client,
+                                                hunt['channel_id']):
+            continue
+        hunt_blocks += hunt_block(turb, hunt)
 
     return {
         "type": "home",
         "blocks": [
-            section_block(text_block("*Active hunts*")),
+            section_block(text_block("*Hunts you belong to*")),
             divider_block(),
             * hunt_blocks,
             actions_block(button_block("New hunt", "new_hunt"))
@@ -148,8 +152,8 @@ def hunt_channel_created(turb, channel_name, 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']
@@ -243,10 +247,11 @@ 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, item['name'])
+    sheet = turbot.sheets.sheets_create_for_puzzle(turb, item)
 
     # Update the database with the URL of the sheet
     item['sheet_url'] = sheet['url']