]> git.cworth.org Git - turbot/blobdiff - turbot/interaction.py
Don't allow capital letters in a hunt or puzzle ID
[turbot] / turbot / interaction.py
index f634cbcdadf6120af0787f194883a573eb2cbdf8..d745a7a3e1428f3e7b75d7dc6e8192123f7fc9ba 100644 (file)
@@ -8,14 +8,12 @@ import re
 import requests
 from botocore.exceptions import ClientError
 
-TURBOT_USER_ID = 'U01B9QM4P9R'
-
 actions = {}
 commands = {}
 submission_handlers = {}
 
-# Hunt and Puzzle IDs are restricted to letters, numbers, and underscores
-valid_id_re = r'^[_a-zA-Z0-9]+$'
+# Hunt/Puzzle IDs are restricted to lowercase letters, numbers, and underscores
+valid_id_re = r'^[_a-z0-9]+$'
 
 def bot_reply(message):
     """Construct a return value suitable for a bot reply
@@ -86,6 +84,7 @@ def new_hunt_submission(turb, payload, metadata):
     function above."""
 
     state = payload['view']['state']['values']
+    user_id = payload['user']['id']
     name = state['name']['name']['value']
     hunt_id = state['hunt_id']['hunt_id']['value']
     url = state['url']['url']['value']
@@ -93,7 +92,7 @@ def new_hunt_submission(turb, payload, metadata):
     # Validate that the hunt_id contains no invalid characters
     if not re.match(valid_id_re, hunt_id):
         return submission_error("hunt_id",
-                                "Hunt ID can only contain letters, "
+                                "Hunt ID can only contain lowercase letters, "
                                 + "numbers, and underscores")
 
     # Check to see if the hunts table exists
@@ -131,60 +130,24 @@ def new_hunt_submission(turb, payload, metadata):
                                 "Error creating Slack channel: {}"
                                 .format(e.response['error']))
 
-    if not response['ok']:
-        return submission_error("name",
-                                "Error occurred creating Slack channel "
-                                + "(see CloudWatch log")
-
-    user_id = payload['user']['id']
-    channel_id = response['channel']['id']
-
-    # Create a sheet for the channel
-    sheet = turbot.sheets.sheets_create(turb, hunt_id)
-
     channel_id = response['channel']['id']
 
     # 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": True,
+            "active": False,
             "name": name,
             "hunt_id": hunt_id,
-            "url": url,
-            "sheet_url": sheet['url']
+            "url": url
         }
     )
 
     # Invite the initiating user to the channel
     turb.slack_client.conversations_invite(channel=channel_id, users=user_id)
 
-    # Message the channel with the URL of the sheet
-    turb.slack_client.chat_postMessage(channel=channel_id,
-                                       text="Sheet created for this hunt: {}"
-                                       .format(sheet['url']))
-
-    # Create a database table for this hunt's puzzles
-    table = turb.db.create_table(
-        TableName=hunt_id,
-        AttributeDefinitions=[
-            {'AttributeName': 'channel_id', 'AttributeType': 'S'}
-        ],
-        KeySchema=[
-            {'AttributeName': 'channel_id', 'KeyType': 'HASH'}
-        ],
-        ProvisionedThroughput={
-            'ReadCapacityUnits': 5,
-            'WriteCapacityUnits': 4
-        }
-    )
-
-    # Message the hunt channel that the database is ready
-    turb.slack_client.chat_postMessage(
-        channel=channel_id,
-        text="Welcome to your new hunt! "
-        + "Use `/puzzle` to create puzzles for the hunt.")
-
     return {
         'statusCode': 200,
     }
@@ -242,6 +205,78 @@ def rot(turb, body, args):
 
 commands["/rot"] = rot
 
+def get_table_item(turb, table_name, key, value):
+    """Get an item from the database 'table_name' with 'key' as 'value'
+
+    Returns a tuple of (item, table) if found and (None, None) otherwise."""
+
+    table = turb.db.Table(table_name)
+
+    response = table.get_item(Key={key: value})
+
+    if 'Item' in response:
+        return (response['Item'], table)
+    else:
+        return None
+
+def channel_is_puzzle(turb, channel_id, channel_name):
+    """Given a channel ID/name return the database item for the puzzle
+
+    If this channel is a puzzle, this function returns a tuple:
+
+        (puzzle, table)
+
+    Where puzzle is dict filled with database entries, and table is a
+    database table that can be used to update the puzzle in the
+    database.
+
+    Otherwise, this function returns (None, None)."""
+
+    hunt_id = channel_name.split('-')[0]
+
+    # Not a puzzle channel if there is no hyphen in the name
+    if hunt_id == channel_name:
+        return (None, None)
+
+    return get_table_item(turb, hunt_id, 'channel_id', channel_id)
+
+def channel_is_hunt(turb, channel_id):
+
+    """Given a channel ID/name return the database item for the hunt
+
+    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)
+
+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)."""
+
+    (hunt, hunts_table) = channel_is_hunt(turb, channel_id)
+
+    if hunt:
+        return (hunt['hunt_id'], hunt['name'])
+
+    # 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)
+
 def puzzle(turb, body, args):
     """Implementation of the /puzzle command
 
@@ -249,23 +284,21 @@ def puzzle(turb, body, args):
     a modal dialog for user input instead)."""
 
     channel_id = body['channel_id'][0]
+    channel_name = body['channel_name'][0]
     trigger_id = body['trigger_id'][0]
 
-    hunts_table = turb.db.Table("hunts")
-    response = hunts_table.get_item(Key={'channel_id': channel_id})
+    (hunt_id, hunt_name) = find_hunt_for_channel(turb,
+                                                 channel_id,
+                                                 channel_name)
 
-    if 'Item' in response:
-        hunt_name = response['Item']['name']
-        hunt_id = response['Item']['hunt_id']
-    else:
+    if not hunt_id:
         return bot_reply("Sorry, this channel doesn't appear to "
-                         + "be a hunt channel")
+                         + "be a hunt or puzzle channel")
 
     view = {
         "type": "modal",
         "private_metadata": json.dumps({
             "hunt_id": hunt_id,
-            "hunt_channel_id": channel_id
         }),
         "title": {"type": "plain_text", "text": "New Puzzle"},
         "submit": { "type": "plain_text", "text": "Create" },
@@ -298,12 +331,8 @@ def puzzle_submission(turb, payload, metadata):
     This is the modal view presented to the user by the puzzle function
     above."""
 
-    print("In puzzle_submission\npayload is: {}\nmetadata is {}"
-          .format(payload, metadata))
-
     meta = json.loads(metadata)
     hunt_id = meta['hunt_id']
-    hunt_channel_id = meta['hunt_channel_id']
 
     state = payload['view']['state']['values']
     name = state['name']['name']['value']
@@ -313,7 +342,7 @@ def puzzle_submission(turb, payload, metadata):
     # 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 letters, "
+                                "Puzzle ID can only contain lowercase letters, "
                                 + "numbers, and underscores")
 
     # Create a channel for the puzzle
@@ -329,12 +358,8 @@ def puzzle_submission(turb, payload, metadata):
 
     puzzle_channel_id = response['channel']['id']
 
-    # Create a sheet for the puzzle
-    sheet = turbot.sheets.sheets_create_for_puzzle(turb, hunt_dash_channel)
-
     # Insert the newly-created puzzle into the database
     table = turb.db.Table(hunt_id)
-
     table.put_item(
         Item={
             "channel_id": puzzle_channel_id,
@@ -343,32 +368,52 @@ def puzzle_submission(turb, payload, metadata):
             "name": name,
             "puzzle_id": puzzle_id,
             "url": url,
-            "sheet_url": sheet['url']
         }
     )
 
-    # Find all members of the hunt channel
-    members = turbot.slack.slack_channel_members(turb.slack_client,
-                                                 hunt_channel_id)
+    return {
+        'statusCode': 200
+    }
 
-    # Filter out Turbot's own ID to avoid inviting itself
-    members = [m for m in members if m != TURBOT_USER_ID]
+# XXX: This duplicates functionality eith events.py:set_channel_description
+def set_channel_topic(turb, puzzle):
+    channel_id = puzzle['channel_id']
+    description = puzzle['name']
+    url = puzzle.get('url', None)
+    sheet_url = puzzle.get('sheet_url', None)
+    state = puzzle.get('state', None)
 
-    turb.slack_client.chat_postMessage(channel=puzzle_channel_id,
-                                       text="Inviting members: {}".format(str(members)))
+    links = []
+    if url:
+        links.append("<{}|Puzzle>".format(url))
+    if sheet_url:
+        links.append("<{}|Sheet>".format(sheet_url))
 
-    # Invite those members to the puzzle channel (in chunks of 500)
-    cursor = 0
-    while cursor < len(members):
-        turb.slack_client.conversations_invite(
-            channel=puzzle_channel_id,
-            users=members[cursor:cursor + 500])
-        cursor += 500
+    if len(links):
+        description += "({})".format(', '.join(links))
 
-    # Message the channel with the URL of the puzzle's sheet
-    turb.slack_client.chat_postMessage(channel=puzzle_channel_id,
-                                       text="Sheet created for this puzzle: {}"
-                                       .format(sheet['url']))
-    return {
-        'statusCode': 200
-    }
+    if state:
+        description += " {}".format(state)
+
+    turb.slack_client.conversations_setTopic(channel=channel_id,
+                                             topic=description)
+
+def state(turb, body, args):
+    """Implementation of the /state command
+
+    The args string should be a brief sentence describing where things
+    stand or what's needed."""
+
+    channel_id = body['channel_id'][0]
+    channel_name = body['channel_name'][0]
+
+    (puzzle, table) = channel_is_puzzle(turb, channel_id, channel_name)
+
+    if not puzzle:
+        return bot_reply("Sorry, this is not a puzzle channel.")
+
+    # Set the state field in the database
+    puzzle['state'] = args
+    table.put_item(Item=puzzle)
+
+    set_channel_topic(turb, puzzle)