]> git.cworth.org Git - turbot/blobdiff - turbot/interaction.py
Add a handler for multi_static_select input
[turbot] / turbot / interaction.py
index 8fdebaeb631b34fd0692a00805590c0b87c7857d..0c1d8d92de33ded79f33e58914e580b1f430ec69 100644 (file)
@@ -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,7 @@ 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 = {}
@@ -50,6 +52,13 @@ def submission_error(field, error):
         })
     }
 
+def multi_static_select(turb, payload):
+    """Handler for the action of user entering a multi-select value"""
+
+    return lambda_ok
+
+actions['multi_static_select'] = {"*": multi_static_select}
+
 def new_hunt(turb, payload):
     """Handler for the action of user pressing the new_hunt button"""
 
@@ -107,14 +116,14 @@ def new_hunt_submission(turb, payload, metadata):
         turb.table = turb.db.create_table(
             TableName='turbot',
             KeySchema=[
-                {'AttributeName': 'PK', 'KeyType': 'HASH'},
+                {'AttributeName': 'hunt_id', 'KeyType': 'HASH'},
                 {'AttributeName': 'SK', 'KeyType': 'RANGE'},
             ],
             AttributeDefinitions=[
-                {'AttributeName': 'PK', 'AttributeType': 'S'},
+                {'AttributeName': 'hunt_id', 'AttributeType': 'S'},
                 {'AttributeName': 'SK', 'AttributeType': 'S'},
                 {'AttributeName': 'channel_id', 'AttributeType': 'S'},
-                {'AttributeName': 'hunt_id', 'AttributeType': 'S'},
+                {'AttributeName': 'is_hunt', 'AttributeType': 'S'},
             ],
             ProvisionedThroughput={
                 'ReadCapacityUnits': 5,
@@ -135,9 +144,9 @@ def new_hunt_submission(turb, payload, metadata):
                     }
                 },
                 {
-                    'IndexName': 'hunt_id_index',
+                    'IndexName': 'is_hunt_index',
                     'KeySchema': [
-                        {'AttributeName': 'hunt_id', 'KeyType': 'HASH'}
+                        {'AttributeName': 'is_hunt', 'KeyType': 'HASH'}
                     ],
                     'Projection': {
                         'ProjectionType': 'ALL'
@@ -149,8 +158,9 @@ def new_hunt_submission(turb, payload, metadata):
                 }
             ]
         )
-        return submission_error("hunt_id",
-                                "Still bootstrapping turbot 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:
@@ -165,17 +175,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)
-    turb.table.put_item(
-        Item={
-            "PK": "hunt-{}".format(hunt_id),
-            "SK": "hunt-{}".format(hunt_id),
-            "hunt_id": hunt_id,
-            "channel_id": channel_id,
-            "active": False,
-            "name": name,
-            "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)
@@ -246,55 +256,50 @@ def get_table_item(turb, table_name, key, value):
     else:
         return (None, 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)
+def db_entry_for_channel(turb, channel_id):
+    """Given a channel ID return the database item for this channel
 
-    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.
+    If this channel is a registered hunt or puzzle channel, return the
+    corresponding row from the database for this channel. Otherwise,
+    return None.
 
-    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)
+    Note: If you need to specifically ensure that the channel is a
+    puzzle or a hunt, please call puzzle_for_channel or
+    hunt_for_channel respectively.
+    """
 
-    return get_table_item(turb, hunt_id, 'channel_id', channel_id)
+    response = turb.table.query(
+        IndexName = "channel_id_index",
+        KeyConditionExpression=Key("channel_id").eq(channel_id)
+    )
 
-def channel_is_hunt(turb, channel_id):
+    if response['Count'] == 0:
+        return None
 
-    """Given a channel ID/name return the database item for the hunt
+    return response['Items'][0]
 
-    Returns a dict (filled with database entries) if there is a hunt
-    for this channel, otherwise returns None."""
 
-    return get_table_item(turb, "channel_id_index", 'channel_id', channel_id)
+def puzzle_for_channel(turb, channel_id):
 
-def find_hunt_for_hunt_id(turb, hunt_id):
-    """Given a hunt ID find the database for for that hunt
+    """Given a channel ID return the puzzle from the database for this channel
 
-    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.).
+    If the given channel_id is a puzzle's channel, this function
+    returns a dict filled with the attributes from the puzzle's entry
+    in the database.
 
+    Otherwise, this function returns None.
     """
-    turbot_table = turb.db.Table("turbot")
 
-    response = turbot_table.get_item(Key={'PK': 'hunt-{}'.format(hunt_id)})
+    entry = db_entry_for_channel(turb, channel_id)
 
-    if 'Item' in response:
-        return response['Item']
+    if entry and entry['SK'].startswith('puzzle-'):
+        return entry
     else:
         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
+def hunt_for_channel(turb, channel_id):
+
+    """Given a channel ID return the hunt from the database 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.
@@ -302,19 +307,21 @@ def find_hunt_for_channel(turb, channel_id, channel_name):
     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)
+    entry = db_entry_for_channel(turb, channel_id)
 
-    if hunt:
-        return hunt
+    # We're done if this channel doesn't exist in the database at all
+    if not entry:
+        return None
 
-    # 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]
+    # Also done if this channel is a hunt channel
+    if entry['SK'].startswith('hunt-'):
+        return entry
 
-    return find_hunt_for_hunt_id(turb, hunt_id)
+    # Otherwise, (the channel is in the database, but is not a hunt),
+    # we expect this to be a puzzle channel instead
+    return find_hunt_for_hunt_id(turb, entry['hunt_id'])
 
 def puzzle(turb, body, args):
     """Implementation of the /puzzle command
@@ -323,12 +330,9 @@ 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]
 
-    hunt = find_hunt_for_channel(turb,
-                                 channel_id,
-                                 channel_name)
+    hunt = hunt_for_channel(turb, channel_id)
 
     if not hunt:
         return bot_reply("Sorry, this channel doesn't appear to "
@@ -387,21 +391,21 @@ def puzzle_submission(turb, payload, metadata):
             "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',
-            "hunt_id": hunt_id,
-            "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
 
@@ -443,16 +447,16 @@ def state(turb, body, args):
     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)
+    puzzle = puzzle_for_channel(turb, channel_id)
 
     if not puzzle:
-        return bot_reply("Sorry, this is not a puzzle channel.")
+        return bot_reply(
+            "Sorry, the /state command only works in a puzzle channel")
 
     # Set the state field in the database
     puzzle['state'] = args
-    table.put_item(Item=puzzle)
+    turb.table.put_item(Item=puzzle)
 
     set_channel_topic(turb, puzzle)
 
@@ -466,10 +470,9 @@ def solved(turb, body, args):
     The args string should be a confirmed solution."""
 
     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)
+    puzzle = puzzle_for_channel(turb, channel_id)
 
     if not puzzle:
         return bot_reply("Sorry, this is not a puzzle channel.")
@@ -477,7 +480,7 @@ def solved(turb, body, args):
     # Set the status and solution fields in the database
     puzzle['status'] = 'solved'
     puzzle['solution'].append(args)
-    table.put_item(Item=puzzle)
+    turb.table.put_item(Item=puzzle)
 
     # Report the solution to the puzzle's channel
     slack_send_message(