X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Finteraction.py;h=94e8310ebd5ee03838cbf3a7f2b4496846a5bbe8;hb=8ffca056fb60e37779fb9807ff64cb0b183e6d2f;hp=180de8b923c175676ef2b0993a38256e966158b1;hpb=d55e2ff3c94a7c92a89b93510a63c5c15378723a;p=turbot diff --git a/turbot/interaction.py b/turbot/interaction.py index 180de8b..94e8310 100644 --- a/turbot/interaction.py +++ b/turbot/interaction.py @@ -244,35 +244,49 @@ def channel_is_hunt(turb, channel_id): return get_table_item(turb, "hunts", 'channel_id', channel_id) +def find_hunt_for_hunt_id(turb, hunt_id): + """Given a hunt ID find the database for for that hunt + + Returns None if hunt ID is not found, otherwise a + dictionary with all fields from the hunt's row in the table, + (channel_id, active, hunt_id, name, url, sheet_url, etc.). + + """ + hunts_table = turb.db.Table("hunts") + + response = hunts_table.scan( + FilterExpression='hunt_id = :hunt_id', + ExpressionAttributeValues={':hunt_id': hunt_id} + ) + + if 'Items' in response and len(response['Items']): + item = response['Items'][0] + return item + + return None + def find_hunt_for_channel(turb, channel_id, channel_name): """Given a channel ID/name find the id/name of the hunt for this channel This works whether the original channel is a primary hunt channel, or if it is one of the channels of a puzzle belonging to the hunt. - Returns a tuple of (hunt_name, hunt_id) or (None, None).""" + Returns None if channel does not belong to a hunt, otherwise a + dictionary with all fields from the hunt's row in the table, + (channel_id, active, hunt_id, name, url, sheet_url, etc.). + + """ (hunt, _) = channel_is_hunt(turb, channel_id) if hunt: - return (hunt['hunt_id'], hunt['name']) + return hunt # So we're not a hunt channel, let's look to see if we are a # puzzle channel with a hunt-id prefix. hunt_id = channel_name.split('-')[0] - hunts_table = turb.db.Table("hunts") - - response = hunts_table.scan( - FilterExpression='hunt_id = :hunt_id', - ExpressionAttributeValues={':hunt_id': hunt_id} - ) - - if 'Items' in response and len(response['Items']): - item = response['Items'][0] - return (item['hunt_id'], item['name']) - - return (None, None) + return find_hunt_for_hunt_id(turb, hunt_id) def puzzle(turb, body, args): """Implementation of the /puzzle command @@ -284,27 +298,24 @@ def puzzle(turb, body, args): channel_name = body['channel_name'][0] trigger_id = body['trigger_id'][0] - (hunt_id, hunt_name) = find_hunt_for_channel(turb, - channel_id, - channel_name) + hunt = find_hunt_for_channel(turb, + channel_id, + channel_name) - if not hunt_id: + if not hunt: return bot_reply("Sorry, this channel doesn't appear to " + "be a hunt or puzzle channel") view = { "type": "modal", "private_metadata": json.dumps({ - "hunt_id": hunt_id, + "hunt_id": hunt['hunt_id'], }), "title": {"type": "plain_text", "text": "New Puzzle"}, "submit": { "type": "plain_text", "text": "Create" }, "blocks": [ - section_block(text_block("*For {}*".format(hunt_name))), + section_block(text_block("*For {}*".format(hunt['name']))), input_block("Puzzle name", "name", "Name of the puzzle"), - input_block("Puzzle ID", "puzzle_id", - "Used as part of channel name " - + "(no spaces nor punctuation)"), input_block("Puzzle URL", "url", "External URL of puzzle", optional=True) ] @@ -331,14 +342,10 @@ def puzzle_submission(turb, payload, metadata): state = payload['view']['state']['values'] name = state['name']['name']['value'] - puzzle_id = state['puzzle_id']['puzzle_id']['value'] url = state['url']['url']['value'] - # Validate that the puzzle_id contains no invalid characters - if not re.match(valid_id_re, puzzle_id): - return submission_error("puzzle_id", - "Puzzle ID can only contain lowercase letters," - + " numbers, and underscores") + # Create a Slack-channel-safe puzzle_id + puzzle_id = re.sub(r'[^a-zA-Z0-9_]', '', name).lower() # Create a channel for the puzzle hunt_dash_channel = "{}-{}".format(hunt_id, puzzle_id) @@ -347,9 +354,10 @@ def puzzle_submission(turb, payload, metadata): response = turb.slack_client.conversations_create( name=hunt_dash_channel) except SlackApiError as e: - return submission_error("puzzle_id", - "Error creating Slack channel: {}" - .format(e.response['error'])) + return submission_error( + "name", + "Error creating Slack channel {}: {}" + .format(hunt_dash_channel, e.response['error'])) puzzle_channel_id = response['channel']['id'] @@ -360,6 +368,7 @@ def puzzle_submission(turb, payload, metadata): "channel_id": puzzle_channel_id, "solution": [], "status": 'unsolved', + "hunt_id": hunt_id, "name": name, "puzzle_id": puzzle_id, "url": url, @@ -380,7 +389,7 @@ def set_channel_topic(turb, puzzle): description = '' if status == 'solved': - description += "Solved: `{}` ".format('`, `'.join(puzzle['solution'])) + description += "SOLVED: `{}` ".format('`, `'.join(puzzle['solution'])) description += name @@ -447,9 +456,29 @@ def solved(turb, body, args): turb.slack_client, channel_id, "Puzzle mark solved by {}: `{}`".format(user_name, args)) + # Also report the solution to the hunt channel + hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id']) + slack_send_message( + turb.slack_client, hunt['channel_id'], + "Puzzle '<{}|{}>' has been solved!".format( + puzzle['channel_url'], + puzzle['name']) + ) + # And update the puzzle's description set_channel_topic(turb, puzzle) + # And rename the sheet to prefix with "SOLVED: " + turbot.sheets.renameSheet(turb, puzzle['sheet_url'], 'SOLVED: ' + puzzle['name']) + + # Finally, rename the Slack channel to add the suffix '-solved' + channel_name = "{}-{}-solved".format( + puzzle['hunt_id'], + puzzle['puzzle_id']) + turb.slack_client.conversations_rename( + channel=puzzle['channel_id'], + name=channel_name) + return lambda_ok commands["/solved"] = solved