Rename puzzle creation command from "/puzzle" to "/puzzle new"

[turbot] / turbot / events.py

diff --git a/turbot/events.py b/turbot/events.py
index 03c97e18cfd17960176d50ae80674503fb15d563..b8fd429cbd6009e2aca5a605127b22c66486c863 100644 (file)
--- a/turbot/events.py
+++ b/turbot/events.py
@@ -1,9 +1,10 @@
 from turbot.blocks import (
     section_block, text_block, button_block, actions_block, divider_block
 )
+from turbot.hunt import hunt_blocks, find_hunt_for_hunt_id
 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 turbot.channel import channel_url
 from boto3.dynamodb.conditions import Key
 
 TURBOT_USER_ID = 'U01B9QM4P9R'
@@ -13,66 +14,14 @@ events = {}
 lambda_success = {'statusCode': 200}
 lambda_error = {'statusCode': 400}
 
-def channel_url(channel_id):
-    return "https://halibutthatbass.slack.com/archives/{}".format(channel_id)
+def hunt_link_block(turb, hunt):
 
-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:"
-
-    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))
-
-def hunt_block(turb, hunt):
     name = hunt['name']
-    hunt_id = hunt['hunt_id']
     channel_id = hunt['channel_id']
 
-    response = turb.table.query(
-        KeyConditionExpression=(
-            Key('hunt_id').eq(hunt_id) &
-            Key('SK').begins_with('puzzle-')
-        )
-    )
-    puzzles = response['Items']
+    hunt_link = "*<{}|{}>*".format(channel_url(channel_id), name)
 
-    hunt_text = "*<{}|{}>*".format(channel_url(channel_id), name)
-
-    return [
-        section_block(text_block(hunt_text)),
-        *[puzzle_block(puzzle) for puzzle in puzzles],
-        divider_block()
-    ]
+    return section_block(text_block(hunt_link))
 
 def home(turb, user_id):
     """Returns a view to be published as the turbot home tab for user_id
@@ -89,30 +38,40 @@ def home(turb, user_id):
     except Exception:
         hunts = []
 
-    hunt_blocks = []
+    my_hunt_blocks = []
+    available_hunt_blocks = []
     for hunt in hunts:
         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)
-
-    if len(hunt_blocks):
-        hunt_blocks = [
-            section_block(text_block("*Hunts you belong to*")),
+        if user_id in slack_channel_members(turb.slack_client,
+                                            hunt['channel_id']):
+            my_hunt_blocks += hunt_blocks(turb, hunt, puzzle_status='all')
+        else:
+            available_hunt_blocks.append(hunt_link_block(turb, hunt))
+
+    if len(my_hunt_blocks):
+        my_hunt_blocks = [
+            section_block(text_block("*Hunts you belong to:*")),
             divider_block(),
-            * hunt_blocks
+            * my_hunt_blocks
         ]
     else:
-        hunt_blocks = [
+        my_hunt_blocks = [
             section_block(text_block("You do not belong to any hunts"))
         ]
 
+    if len(available_hunt_blocks):
+        available_hunt_blocks = [
+            section_block(text_block("*Hunts you can join:*")),
+            divider_block(),
+            * available_hunt_blocks
+        ]
+
     return {
         "type": "home",
         "blocks": [
-            * hunt_blocks,
+            * my_hunt_blocks,
+            * available_hunt_blocks,
             actions_block(button_block("New hunt", "new_hunt"))
         ]
     }