X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Finteraction.py;h=cbb8befe2bcb3eb4ebf3df0d7f3165fcf1f5e128;hb=42dde0b52a225b0cad1366b106a5fd14f679861b;hp=05bbbb88d3c09f5eade01318604df40d330484e1;hpb=1ef1c6f234ba7fb1f88900a664369efb1fc61efb;p=turbot diff --git a/turbot/interaction.py b/turbot/interaction.py index 05bbbb8..cbb8bef 100644 --- a/turbot/interaction.py +++ b/turbot/interaction.py @@ -10,13 +10,17 @@ from turbot.hunt import ( from turbot.puzzle import ( find_puzzle_for_url, find_puzzle_for_sort_key, + find_puzzle_for_puzzle_id, puzzle_update_channel_and_sheet, + puzzle_channel_name, puzzle_id_from_name, puzzle_blocks, puzzle_sort_key, puzzle_copy ) from turbot.round import round_quoted_puzzles_titles_answers +from turbot.help import turbot_help +from turbot.have_you_tried import have_you_tried import turbot.rot import turbot.sheets import turbot.slack @@ -86,16 +90,42 @@ def edit(turb, body, args): """Implementation of the `/edit` command - This can be used as `/edit hunt` or `/edit puzzle`, (and if issued as - just `/edit` will default to editing the current puzzle. + This can be used as `/edit` (with no arguments) in either a hunt + or a puzzle channel to edit that hunt or puzzle. It can also be + called explicitly as `/edit hunt` to edit a hunt even from a + puzzle channel. - These are simply shortcuts for `/hunt edit` and `/puzzle edit`. + In any case, the operation is identical to `/hunt edit` or + `/puzzle edit`. """ + # If we have an explicit argument, do what it says to do if args == "hunt": return edit_hunt_command(turb, body) - return edit_puzzle_command(turb, body) + if args == "puzzle": + return edit_puzzle_command(turb, body) + + # Any other argument string is an error + if args: + return bot_reply("Error: Unexpected argument: {}\n".format(args) + + "Usage: `/edit puzzle`, `/edit hunt`, or " + + "`/edit` (to choose based on channel)" + ) + + # No explicit argument, so select what to edit based on the current channel + channel_id = body['channel_id'][0] + trigger_id = body['trigger_id'][0] + + puzzle = puzzle_for_channel(turb, channel_id) + if puzzle: + return edit_puzzle(turb, puzzle, trigger_id) + + hunt = hunt_for_channel(turb, channel_id) + if hunt: + return edit_hunt(turb, hunt, trigger_id) + + return bot_reply("Sorry, `/edit` only works in a hunt or puzzle channel.") commands["/edit"] = edit @@ -120,7 +150,6 @@ def edit_puzzle_button(turb, payload): """Handler for the action of user pressing an edit_puzzle button""" action_id = payload['actions'][0]['action_id'] - response_url = payload['response_url'] trigger_id = payload['trigger_id'] (hunt_id, sort_key) = action_id.split('-', 1) @@ -128,9 +157,6 @@ def edit_puzzle_button(turb, payload): puzzle = find_puzzle_for_sort_key(turb, hunt_id, sort_key) if not puzzle: - requests.post(response_url, - json = {"text": "Error: Puzzle not found!"}, - headers = {"Content-type": "application/json"}) return bot_reply("Error: Puzzle not found.") return edit_puzzle(turb, puzzle, trigger_id) @@ -241,10 +267,11 @@ 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'] puzzle_state = state['state']['state']['value'] if puzzle_state: @@ -361,15 +388,11 @@ def edit_hunt_button(turb, payload): """Handler for the action of user pressing an edit_hunt button""" hunt_id = payload['actions'][0]['action_id'] - response_url = payload['response_url'] trigger_id = payload['trigger_id'] - hunt = find_hunt_for_hunt_id(hunt_id) + hunt = find_hunt_for_hunt_id(turb, hunt_id) if not hunt: - requests.post(response_url, - json = {"text": "Error: Hunt not found!"}, - headers = {"Content-type": "application/json"}) return bot_reply("Error: Hunt not found.") return edit_hunt(turb, hunt, trigger_id) @@ -512,7 +535,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 @@ -552,7 +575,8 @@ def new_hunt_submission(turb, payload, metadata): {'AttributeName': 'SK', 'AttributeType': 'S'}, {'AttributeName': 'channel_id', 'AttributeType': 'S'}, {'AttributeName': 'is_hunt', 'AttributeType': 'S'}, - {'AttributeName': 'url', 'AttributeType': 'S'} + {'AttributeName': 'url', 'AttributeType': 'S'}, + {'AttributeName': 'puzzle_id', 'AttributeType': 'S'} ], ProvisionedThroughput={ 'ReadCapacityUnits': 5, @@ -596,6 +620,16 @@ def new_hunt_submission(turb, payload, metadata): 'Projection': { 'ProjectionType': 'ALL' } + }, + { + 'IndexName': 'puzzle_id_index', + 'KeySchema': [ + {'AttributeName': 'hunt_id', 'KeyType': 'HASH'}, + {'AttributeName': 'puzzle_id', 'KeyType': 'RANGE'}, + ], + 'Projection': { + 'ProjectionType': 'ALL' + } } ] ) @@ -895,13 +929,20 @@ def new_puzzle(turb, body): return bot_reply("Sorry, this channel doesn't appear to " + "be a hunt or puzzle channel") + # We used puzzle (if available) to select the initial round(s) + puzzle = puzzle_for_channel(turb, channel_id) + initial_rounds = None + if puzzle: + initial_rounds=puzzle.get("rounds", None) + round_options = hunt_rounds(turb, hunt['hunt_id']) if len(round_options): round_options_block = [ multi_select_block("Round(s)", "rounds", "Existing round(s) this puzzle belongs to", - round_options) + round_options, + initial_options=initial_rounds) ] else: round_options_block = [] @@ -947,12 +988,18 @@ def new_puzzle_submission(turb, payload, metadata): hunt_id = meta['hunt_id'] state = payload['view']['state']['values'] - name = state['name']['name']['value'] + + # And start loading data into a puzzle dict + puzzle = {} + puzzle['hunt_id'] = hunt_id + puzzle['name'] = state['name']['name']['value'] url = state['url']['url']['value'] + if url: + puzzle['url'] = url if state['meta']['meta']['selected_options']: - puzzle_type = 'meta' + puzzle['type'] = 'meta' else: - puzzle_type = 'plain' + puzzle['type'] = 'plain' if 'rounds' in state: rounds = [option['value'] for option in state['rounds']['rounds']['selected_options']] @@ -960,8 +1007,17 @@ def new_puzzle_submission(turb, payload, metadata): rounds = [] new_rounds = state['new_rounds']['new_rounds']['value'] + # Create a Slack-channel-safe puzzle_id + puzzle['puzzle_id'] = puzzle_id_from_name(puzzle['name']) + # Before doing anything, reject this puzzle if a puzzle already - # exists with the same URL. + # exists with the same puzzle_id or url + existing = find_puzzle_for_puzzle_id(turb, hunt_id, puzzle['puzzle_id']) + if existing: + return submission_error( + "name", + "Error: This name collides with an existing puzzle.") + if url: existing = find_puzzle_for_url(turb, hunt_id, url) if existing: @@ -969,23 +1025,6 @@ def new_puzzle_submission(turb, payload, metadata): "url", "Error: A puzzle with this URL already exists.") - # Create a Slack-channel-safe puzzle_id - puzzle_id = puzzle_id_from_name(name) - - # Create a channel for the puzzle - hunt_dash_channel = "{}-{}".format(hunt_id, puzzle_id) - - try: - response = turb.slack_client.conversations_create( - name=hunt_dash_channel) - except SlackApiError as e: - return submission_error( - "name", - "Error creating Slack channel {}: {}" - .format(hunt_dash_channel, e.response['error'])) - - channel_id = response['channel']['id'] - # Add any new rounds to the database if new_rounds: for round in new_rounds.split(','): @@ -1002,21 +1041,26 @@ def new_puzzle_submission(turb, payload, metadata): } ) - # Construct a puzzle dict - puzzle = { - "hunt_id": hunt_id, - "puzzle_id": puzzle_id, - "channel_id": channel_id, - "solution": [], - "status": 'unsolved', - "name": name, - "type": puzzle_type - } - if url: - puzzle['url'] = url if rounds: puzzle['rounds'] = rounds + puzzle['solution'] = [] + puzzle['status'] = 'unsolved' + + # Create a channel for the puzzle + channel_name = puzzle_channel_name(puzzle) + + try: + response = turb.slack_client.conversations_create( + name=channel_name) + except SlackApiError as e: + return submission_error( + "name", + "Error creating Slack channel {}: {}" + .format(channel_name, e.response['error'])) + + puzzle['channel_id'] = response['channel']['id'] + # Finally, compute the appropriate sort key puzzle["SK"] = puzzle_sort_key(puzzle) @@ -1226,10 +1270,13 @@ def hunt(turb, body, args): blocks = hunt_blocks(turb, hunt, puzzle_status=status, search_terms=terms) - requests.post(response_url, - json = { 'blocks': blocks }, - headers = {'Content-type': 'application/json'} - ) + for block in blocks: + if len(block) > 100: + block = block[:100] + requests.post(response_url, + json = { 'blocks': block }, + headers = {'Content-type': 'application/json'} + ) return lambda_ok @@ -1300,11 +1347,58 @@ def round(turb, body, args): limit_to_rounds=puzzle.get('rounds', []) ) - requests.post(response_url, - json = { 'blocks': blocks }, - headers = {'Content-type': 'application/json'} - ) + for block in blocks: + if len(block) > 100: + block = block[:100] + requests.post(response_url, + json = { 'blocks': block }, + headers = {'Content-type': 'application/json'} + ) return lambda_ok commands["/round"] = round + +def help_command(turb, body, args): + """Implementation of the /help command + + Displays help on how to use Turbot. + """ + + channel_id = body['channel_id'][0] + response_url = body['response_url'][0] + user_id = body['user_id'][0] + + # Process "/help me" first. It calls out to have_you_tried rather + # than going through our help system. + # + # Also, it reports in the current channel, (where all other help + # output is reported privately to the invoking user). + if args == "me": + to_try = "In response to <@{}> asking `/help me`:\n\n{}\n".format( + user_id, have_you_tried()) + + # We'll try first to reply directly to the channel (for the benefit + # of anyone else in the same channel that might be stuck too. + # + # But if this doesn't work, (direct message or private channel), + # then we can instead reply with an ephemeral message by using + # the response_url. + try: + turb.slack_client.chat_postMessage( + channel=channel_id, text=to_try) + except SlackApiError: + requests.post(response_url, + json = {"text": to_try}, + headers = {"Content-type": "application/json"}) + return lambda_ok + + help_string = turbot_help(args) + + requests.post(response_url, + json = {"text": help_string}, + headers = {"Content-type": "application/json"}) + + return lambda_ok + +commands["/help"] = help_command