X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Fevents.py;h=bf4154ffafce8124388c80442ec0fbe630821e06;hb=0076b5c890b0a6cfb61dac56f94e71566c669bc2;hp=70f18a602676652139ed26b33a2c9d3126ebbafa;hpb=731e18499429313acaaf15cacc758f5c6bd7e8e1;p=turbot

diff --git a/turbot/events.py b/turbot/events.py
index 70f18a6..bf4154f 100644
--- 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,106 +14,6 @@ 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:"
-
-    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 round_blocks(round, puzzles):
-
-    round_text = "*Round: {}*".format(round)
-
-    blocks = [
-        section_block(text_block(round_text)),
-    ]
-
-    for puzzle in puzzles:
-        if 'rounds' not in puzzle:
-            continue
-        if round not in puzzle['rounds']:
-            continue
-        blocks.append(puzzle_block(puzzle))
-
-    return blocks
-
-def hunt_details_blocks(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']
-
-    # Compute the set of rounds across all puzzles
-    rounds = set()
-    for puzzle in puzzles:
-        if 'rounds' not in puzzle:
-            continue
-        for round in puzzle['rounds']:
-            rounds.add(round)
-
-    hunt_text = "*<{}|{}>*".format(channel_url(channel_id), name)
-
-    blocks = [
-        section_block(text_block(hunt_text)),
-    ]
-
-    # Construct blocks for each round
-    for round in rounds:
-        blocks += round_blocks(round, puzzles)
-
-    # Also blocks for any puzzles not in any round
-    stray_puzzles = [puzzle for puzzle in puzzles if 'rounds' not in puzzle]
-    if len(stray_puzzles):
-        stray_text = "*Puzzles with no asigned round*"
-        blocks.append(section_block(text_block(stray_text)))
-        for puzzle in stray_puzzles:
-            blocks.append(puzzle_block(puzzle))
-
-    blocks.append(divider_block())
-
-    return blocks
-
 def hunt_link_block(turb, hunt):
 
     name = hunt['name']
@@ -144,7 +45,7 @@ def home(turb, user_id):
             continue
         if user_id in slack_channel_members(turb.slack_client,
                                             hunt['channel_id']):
-            my_hunt_blocks += hunt_details_blocks(turb, hunt)
+            my_hunt_blocks += hunt_blocks(turb, hunt)
         else:
             available_hunt_blocks.append(hunt_link_block(turb, hunt))