X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Finteraction.py;h=21e741e8c19ac84776e8c36330c295876315d553;hb=0015251c4f6f377a3a538b2a09c4ca7fb3d026b5;hp=580aad52b15e2b03e002fb835917c615d86c2ec8;hpb=e2585ffb4c53bb9c842cbcc3dba77a705c069371;p=turbot diff --git a/turbot/interaction.py b/turbot/interaction.py index 580aad5..21e741e 100644 --- a/turbot/interaction.py +++ b/turbot/interaction.py @@ -216,6 +216,10 @@ def edit_puzzle(turb, puzzle, trigger_id): "New round(s) this puzzle belongs to " + "(comma separated)", optional=True), + input_block("Tag(s)", "tags", + "Tags for this puzzle (comma separated)", + initial_value=", ".join(puzzle.get("tags", [])), + optional=True), input_block("State", "state", "State of this puzzle (partial progress, next steps)", initial_value=puzzle.get("state", None), @@ -267,11 +271,13 @@ def edit_puzzle_submission(turb, payload, metadata): puzzle['type'] = 'meta' else: puzzle['type'] = 'plain' - rounds = [option['value'] for option in - state['rounds']['rounds']['selected_options']] - if rounds: - puzzle['rounds'] = rounds + if 'rounds' in state: + rounds = [option['value'] for option in + state['rounds']['rounds']['selected_options']] + if rounds: + puzzle['rounds'] = rounds new_rounds = state['new_rounds']['new_rounds']['value'] + tags = state['tags']['tags']['value'] puzzle_state = state['state']['state']['value'] if puzzle_state: puzzle['state'] = puzzle_state @@ -282,9 +288,10 @@ def edit_puzzle_submission(turb, payload, metadata): puzzle['solution'] = [] solution = state['solution']['solution']['value'] if solution: - puzzle['solution'] = [ + # Construct a list from a set to avoid any duplicates + puzzle['solution'] = list({ sol.strip() for sol in solution.split(',') - ] + }) # Verify that there's a solution if the puzzle is mark solved if puzzle['status'] == 'solved' and not puzzle['solution']: @@ -313,13 +320,31 @@ def edit_puzzle_submission(turb, payload, metadata): } ) + # Process any tags + puzzle['tags'] = [] + if tags: + for tag in tags.split(','): + # Drop any leading/trailing spaces from the tag + tag = tag.strip().upper() + # Ignore any empty string + if not len(tag): + continue + # Reject a tag that is not alphabetic or underscore A-Z_ + if not re.match(r'^[A-Z0-9_]*$', tag): + return submission_error( + "tags", + "Error: Tags can only contain letters, numbers, " + + "and the underscore character." + ) + puzzle['tags'].append(tag) + # Get old puzzle from the database (to determine what's changed) 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 + # then 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 @@ -347,9 +372,20 @@ def edit_puzzle_submission(turb, payload, metadata): turb.slack_client, puzzle['channel_id'], edit_message, blocks=blocks) + # Advertize any tag additions to the hunt + hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id']) + + new_tags = set(puzzle['tags']) - set(old_puzzle['tags']) + if new_tags: + message = "Puzzle <{}|{}> has been tagged: {}".format( + puzzle['channel_url'], + puzzle['name'], + ", ".join(['`{}`'.format(t) for t in new_tags]) + ) + slack_send_message(turb.slack_client, hunt['channel_id'], message) + # Also inform the hunt if the puzzle's solved status changed if puzzle['status'] != old_puzzle['status']: - hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id']) if puzzle['status'] == 'solved': message = "Puzzle <{}|{}> has been solved!".format( puzzle['channel_url'], @@ -534,7 +570,7 @@ def new_hunt(turb, trigger_id): return lambda_ok -actions['button']['new_hunt'] = new_hunt +actions['button']['new_hunt'] = new_hunt_button def new_hunt_submission(turb, payload, metadata): """Handler for the user submitting the new hunt modal @@ -963,7 +999,10 @@ def new_puzzle(turb, body): input_block("New round(s)", "new_rounds", "New round(s) this puzzle belongs to " + "(comma separated)", - optional=True) + optional=True), + input_block("Tag(s)", "tags", + "Tags for this puzzle (comma separated)", + optional=True), ] } @@ -1005,6 +1044,7 @@ def new_puzzle_submission(turb, payload, metadata): else: rounds = [] new_rounds = state['new_rounds']['new_rounds']['value'] + tags = state['tags']['tags']['value'] # Create a Slack-channel-safe puzzle_id puzzle['puzzle_id'] = puzzle_id_from_name(puzzle['name']) @@ -1040,6 +1080,24 @@ def new_puzzle_submission(turb, payload, metadata): } ) + # Process any tags + puzzle['tags'] = [] + if tags: + for tag in tags.split(','): + # Drop any leading/trailing spaces from the tag + tag = tag.strip().upper() + # Ignore any empty string + if not len(tag): + continue + # Reject a tag that is not alphabetic or underscore A-Z_ + if not re.match(r'^[A-Z0-9_]*$', tag): + return submission_error( + "tags", + "Error: Tags can only contain letters, numbers, " + + "and the underscore character." + ) + puzzle['tags'].append(tag) + if rounds: puzzle['rounds'] = rounds @@ -1157,6 +1215,17 @@ def tag(turb, body, args): puzzle_update_channel_and_sheet(turb, puzzle, old_puzzle=old_puzzle) + # Advertize any tag additions to the hunt + new_tags = set(puzzle['tags']) - set(old_puzzle['tags']) + if new_tags: + hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id']) + message = "Puzzle <{}|{}> has been tagged: {}".format( + puzzle['channel_url'], + puzzle['name'], + ", ".join(['`{}`'.format(t) for t in new_tags]) + ) + slack_send_message(turb.slack_client, hunt['channel_id'], message) + return lambda_ok commands["/tag"] = tag @@ -1183,7 +1252,10 @@ def solved(turb, body, args): # Set the status and solution fields in the database puzzle['status'] = 'solved' - puzzle['solution'].append(args) + + # Don't append a duplicate solution + if args not in puzzle['solution']: + puzzle['solution'].append(args) if 'state' in puzzle: del puzzle['state'] turb.table.put_item(Item=puzzle) @@ -1191,7 +1263,7 @@ def solved(turb, body, args): # Report the solution to the puzzle's channel slack_send_message( turb.slack_client, channel_id, - "Puzzle mark solved by <@{}>: `{}`".format(user_id, args)) + "Puzzle marked solved by <@{}>: `{}`".format(user_id, args)) # Also report the solution to the hunt channel hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id']) @@ -1209,6 +1281,50 @@ def solved(turb, body, args): commands["/solved"] = solved +def delete(turb, body, args): + """Implementation of the /delete command + + The argument to this command is the ID of a hunt. + + The command will report an error if the specified hunt is active. + + If the hunt is inactive, this command will archive all channels + from the hunt. + """ + + if not args: + return bot_reply("Error, no hunt provided. Usage: `/delete HUNT_ID`") + + hunt_id = args + hunt = find_hunt_for_hunt_id(turb, hunt_id) + + if not hunt: + return bot_reply("Error, no hunt named \"{}\" exists.".format(hunt_id)) + + if hunt['active']: + return bot_reply( + "Error, refusing to delete active hunt \"{}\".".format(hunt_id) + ) + + if hunt['hunt_id'] != hunt_id: + return bot_reply( + "Error, expected hunt ID of \"{}\" but found \"{}\".".format( + hunt_id, hunt['hunt_id'] + ) + ) + + puzzles = hunt_puzzles_for_hunt_id(turb, hunt_id) + + for puzzle in puzzles: + channel_id = puzzle['channel_id'] + turb.slack_client.conversations_archive(channel=channel_id) + + turb.slack_client.conversations_archive(channel=hunt['channel_id']) + + return lambda_ok + +commands["/delete"] = delete + def hunt(turb, body, args): """Implementation of the /hunt command