X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Finteraction.py;h=8bff8bc3cbc656571ca0a953a5002d9f7659ec3d;hb=29c36d3057c5602c5a4b6fb0e48f454db01ddd9d;hp=c0aff61dbc7412bbfb895f6cbec2336432bbc0a1;hpb=5a1bf7d220db5d91db52dce48bdf29485eae105b;p=turbot diff --git a/turbot/interaction.py b/turbot/interaction.py index c0aff61..8bff8bc 100644 --- a/turbot/interaction.py +++ b/turbot/interaction.py @@ -2,14 +2,20 @@ from slack.errors import SlackApiError from turbot.blocks import ( input_block, section_block, text_block, multi_select_block, checkbox_block ) -from turbot.hunt import find_hunt_for_hunt_id, hunt_blocks +from turbot.hunt import ( + find_hunt_for_hunt_id, + hunt_blocks, + hunt_puzzles_for_hunt_id +) from turbot.puzzle import ( find_puzzle_for_url, - find_puzzle_for_puzzle_id, + find_puzzle_for_sort_key, puzzle_update_channel_and_sheet, puzzle_id_from_name, - puzzle_blocks + puzzle_blocks, + puzzle_sort_key ) +from turbot.round import round_quoted_puzzles_titles_answers import turbot.rot import turbot.sheets import turbot.slack @@ -100,9 +106,9 @@ def edit_puzzle_button(turb, payload): response_url = payload['response_url'] trigger_id = payload['trigger_id'] - (hunt_id, puzzle_id) = action_id.split('-', 1) + (hunt_id, sort_key) = action_id.split('-', 1) - puzzle = find_puzzle_for_puzzle_id(turb, hunt_id, puzzle_id) + puzzle = find_puzzle_for_sort_key(turb, hunt_id, sort_key) if not puzzle: requests.post(response_url, @@ -265,9 +271,27 @@ def edit_puzzle_submission(turb, payload, metadata): ) # Get old puzzle from the database (to determine what's changed) - old_puzzle = find_puzzle_for_puzzle_id(turb, - puzzle['hunt_id'], - puzzle['puzzle_id']) + old_puzzle = find_puzzle_for_sort_key(turb, + puzzle['hunt_id'], + puzzle['SK']) + + # If we are changing puzzle type (meta -> plain or plain -> meta) + # the the sort key has to change, so compute the new one and delete + # the old item from the database. + # + # XXX: We should really be using a transaction here to combine the + # delete_item and the put_item into a single transaction, but + # the boto interface is annoying in that transactions are only on + # the "Client" object which has a totally different interface than + # the "Table" object I've been using so I haven't figured out how + # to do that yet. + + if puzzle['type'] != old_puzzle.get('type', 'plain'): + puzzle['SK'] = puzzle_sort_key(puzzle) + turb.table.delete_item(Key={ + 'hunt_id': old_puzzle['hunt_id'], + 'SK': old_puzzle['SK'] + }) # Update the puzzle in the database turb.table.put_item(Item=puzzle) @@ -645,6 +669,24 @@ def puzzle(turb, body, args): blocks = puzzle_blocks(puzzle, include_rounds=True) + # For a meta puzzle, also display the titles and solutions for all + # puzzles in the same round. + if puzzle['type'] == 'meta': + puzzles = hunt_puzzles_for_hunt_id(turb, puzzle['hunt_id']) + + # Drop this puzzle itself from the report + puzzles = [p for p in puzzles if p['puzzle_id'] != puzzle['puzzle_id']] + + for round in puzzle.get('rounds', [None]): + answers = round_quoted_puzzles_titles_answers(round, puzzles) + blocks += [ + section_block(text_block( + "*Feeder solutions from round {}*".format( + round if round else "" + ))), + section_block(text_block(answers)) + ] + requests.post(response_url, json = {'blocks': blocks}, headers = {'Content-type': 'application/json'} @@ -779,7 +821,6 @@ def new_puzzle_submission(turb, payload, metadata): # Construct a puzzle dict puzzle = { "hunt_id": hunt_id, - "SK": "puzzle-{}".format(puzzle_id), "puzzle_id": puzzle_id, "channel_id": channel_id, "solution": [], @@ -792,6 +833,9 @@ def new_puzzle_submission(turb, payload, metadata): if rounds: puzzle['rounds'] = rounds + # Finally, compute the appropriate sort key + puzzle["SK"] = puzzle_sort_key(puzzle) + # Insert the newly-created puzzle into the database turb.table.put_item(Item=puzzle)