X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Fevents.py;h=cae4ccfbb86b98bc07a4264b209b2e62974c73c6;hb=0d1df2ea1359a09a59fc897323d2d0080fe1f86a;hp=2f096b276ccae2e97faef2238f442de47c356b66;hpb=f0f7704495e3a7340cf09e561ecebd885875674f;p=turbot diff --git a/turbot/events.py b/turbot/events.py index 2f096b2..cae4ccf 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'] @@ -120,7 +21,7 @@ def hunt_link_block(turb, hunt): hunt_link = "*<{}|{}>*".format(channel_url(channel_id), name) - return section_block(text_block(hunt_link)), + 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 @@ -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, puzzle_status='all') else: available_hunt_blocks.append(hunt_link_block(turb, hunt)) @@ -202,40 +103,40 @@ def hunt_channel_created(turb, channel_name, channel_id): .format(channel_id) + "Letting Slack retry this event") return lambda_error - item = response['Items'][0] + hunt = response['Items'][0] - if 'sheet_url' in item: + if 'sheet_url' in hunt: print("Info: channel_id {} already has sheet_url {}. Exiting." - .format(channel_id, item['sheet_url'])) + .format(channel_id, hunt['sheet_url'])) return lambda_success # Before launching into sheet creation, indicate that we're doing this # in the database. This way, if we take too long to create the sheet # and Slack retries the event, that next event will see this 'pending' # string and cleanly return (eliminating all future retries). - item['sheet_url'] = 'pending' - turb.table.put_item(Item=item) + hunt['sheet_url'] = 'pending' + turb.table.put_item(Item=hunt) # Also, let the channel users know what we are up to slack_send_message( turb.slack_client, channel_id, - "Welcome to the channel for the {} hunt! ".format(item['name']) + "Welcome to the channel for the {} hunt! ".format(hunt['name']) + "Please wait a minute or two while I create some backend resources.") # Create a sheet for the hunt - sheet = sheets_create(turb, item['name']) + sheet = sheets_create(turb, hunt['name']) # Update the database with the URL of the sheet - item['sheet_url'] = sheet['url'] - turb.table.put_item(Item=item) + hunt['sheet_url'] = sheet['url'] + turb.table.put_item(Item=hunt) # Message the channel with the URL of the sheet slack_send_message(turb.slack_client, channel_id, "Sheet created for this hunt: {}".format(sheet['url'])) # Mark the hunt as active in the database - item['active'] = True - turb.table.put_item(Item=item) + hunt['active'] = True + turb.table.put_item(Item=hunt) # Message the hunt channel that the database is ready slack_send_message(