X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Finteraction.py;h=b6fa7d7e12efc8cfd5c4809d3ea5ee91ef98413b;hb=ef8d8f359be149adbbdbeda88ec4b6bbbebf928e;hp=20b2d7db820df0fd7b7a3242cc2e215e769cf26e;hpb=6f0c85d45a8e9d0f4d8105e356e82a0efa3691f1;p=turbot diff --git a/turbot/interaction.py b/turbot/interaction.py index 20b2d7d..b6fa7d7 100644 --- a/turbot/interaction.py +++ b/turbot/interaction.py @@ -1,5 +1,6 @@ from slack.errors import SlackApiError from turbot.blocks import input_block, section_block, text_block +from turbot.hunt import find_hunt_for_hunt_id import turbot.rot import turbot.sheets import turbot.slack @@ -7,6 +8,8 @@ import json import re import requests from botocore.exceptions import ClientError +from boto3.dynamodb.conditions import Key +from turbot.slack import slack_send_message actions = {} commands = {} @@ -94,32 +97,63 @@ def new_hunt_submission(turb, payload, metadata): "Hunt ID can only contain lowercase letters, " + "numbers, and underscores") - # Check to see if the hunts table exists - hunts_table = turb.db.Table("hunts") - + # Check to see if the turbot table exists try: - exists = hunts_table.table_status in ("CREATING", "UPDATING", - "ACTIVE") + exists = turb.table.table_status in ("CREATING", "UPDATING", + "ACTIVE") except ClientError: exists = False - # Create the hunts table if necessary. + # Create the turbot table if necessary. if not exists: - hunts_table = turb.db.create_table( - TableName='hunts', + turb.table = turb.db.create_table( + TableName='turbot', KeySchema=[ - {'AttributeName': 'channel_id', 'KeyType': 'HASH'}, + {'AttributeName': 'hunt_id', 'KeyType': 'HASH'}, + {'AttributeName': 'SK', 'KeyType': 'RANGE'}, ], AttributeDefinitions=[ + {'AttributeName': 'hunt_id', 'AttributeType': 'S'}, + {'AttributeName': 'SK', 'AttributeType': 'S'}, {'AttributeName': 'channel_id', 'AttributeType': 'S'}, + {'AttributeName': 'is_hunt', 'AttributeType': 'S'}, ], ProvisionedThroughput={ 'ReadCapacityUnits': 5, 'WriteCapacityUnits': 5 - } + }, + GlobalSecondaryIndexes=[ + { + 'IndexName': 'channel_id_index', + 'KeySchema': [ + {'AttributeName': 'channel_id', 'KeyType': 'HASH'} + ], + 'Projection': { + 'ProjectionType': 'ALL' + }, + 'ProvisionedThroughput': { + 'ReadCapacityUnits': 5, + 'WriteCapacityUnits': 5 + } + }, + { + 'IndexName': 'is_hunt_index', + 'KeySchema': [ + {'AttributeName': 'is_hunt', 'KeyType': 'HASH'} + ], + 'Projection': { + 'ProjectionType': 'ALL' + }, + 'ProvisionedThroughput': { + 'ReadCapacityUnits': 5, + 'WriteCapacityUnits': 5 + } + } + ] ) - return submission_error("hunt_id", - "Still bootstrapping hunts table. Try again.") + return submission_error( + "hunt_id", + "Still bootstrapping turbot table. Try again in a minute, please.") # Create a channel for the hunt try: @@ -134,15 +168,17 @@ def new_hunt_submission(turb, payload, metadata): # Insert the newly-created hunt into the database # (leaving it as non-active for now until the channel-created handler # finishes fixing it up with a sheet and a companion table) - hunts_table.put_item( - Item={ - 'channel_id': channel_id, - "active": False, - "name": name, - "hunt_id": hunt_id, - "url": url - } - ) + item={ + "hunt_id": hunt_id, + "SK": "hunt-{}".format(hunt_id), + "is_hunt": hunt_id, + "channel_id": channel_id, + "active": False, + "name": name, + } + if url: + item['url'] = url + turb.table.put_item(Item=item) # Invite the initiating user to the channel turb.slack_client.conversations_invite(channel=channel_id, users=user_id) @@ -211,7 +247,7 @@ def get_table_item(turb, table_name, key, value): if 'Item' in response: return (response['Item'], table) else: - return None + return (None, None) def channel_is_puzzle(turb, channel_id, channel_name): """Given a channel ID/name return the database item for the puzzle @@ -241,7 +277,15 @@ def channel_is_hunt(turb, channel_id): Returns a dict (filled with database entries) if there is a hunt for this channel, otherwise returns None.""" - return get_table_item(turb, "hunts", 'channel_id', channel_id) + response = turb.table.query( + IndexName = "channel_id_index", + KeyConditionExpression=Key("channel_id").eq(channel_id) + ) + + if 'Items' not in response: + return None + + return response['Items'][0] 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 @@ -249,27 +293,22 @@ def find_hunt_for_channel(turb, channel_id, channel_name): 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, hunts_table) = channel_is_hunt(turb, channel_id) + """ + + 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] - response = hunts_table.scan( - FilterExpression='hunt_id = :hunt_id', - ExpressionAttributeValues={':hunt_id': hunt_id} - ) - - if 'Items' in response: - 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 @@ -281,27 +320,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) ] @@ -328,14 +364,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) @@ -344,34 +376,44 @@ 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'] + channel_id = response['channel']['id'] # Insert the newly-created puzzle into the database - table = turb.db.Table(hunt_id) - table.put_item( - Item={ - "channel_id": puzzle_channel_id, - "solution": [], - "status": 'unsolved', - "name": name, - "puzzle_id": puzzle_id, - "url": url, - } - ) + item={ + "hunt_id": hunt_id, + "SK": "puzzle-{}".format(puzzle_id), + "puzzle_id": puzzle_id, + "channel_id": channel_id, + "solution": [], + "status": 'unsolved', + "name": name, + } + if url: + item['url'] = url + turb.table.put_item(Item=item) return lambda_ok # XXX: This duplicates functionality eith events.py:set_channel_description def set_channel_topic(turb, puzzle): channel_id = puzzle['channel_id'] - description = puzzle['name'] + name = puzzle['name'] url = puzzle.get('url', None) sheet_url = puzzle.get('sheet_url', None) state = puzzle.get('state', None) + status = puzzle['status'] + + description = '' + + if status == 'solved': + description += "SOLVED: `{}` ".format('`, `'.join(puzzle['solution'])) + + description += name links = [] if url: @@ -419,6 +461,7 @@ def solved(turb, body, args): channel_id = body['channel_id'][0] channel_name = body['channel_name'][0] + user_name = body['user_name'][0] (puzzle, table) = channel_is_puzzle(turb, channel_id, channel_name) @@ -430,6 +473,35 @@ def solved(turb, body, args): puzzle['solution'].append(args) table.put_item(Item=puzzle) + # Report the solution to the puzzle's channel + slack_send_message( + 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