Don't shove the local variable hunts_table into the turb object

[turbot] / turbot / actions.py

diff --git a/turbot/actions.py b/turbot/actions.py
index 860ea462f1d3b8040e736e6151da820088a8032b..00708b0e66f59c78d48b53836c9354708fbe34ba 100644 (file)
--- a/turbot/actions.py
+++ b/turbot/actions.py
@@ -1,5 +1,7 @@
 from turbot.blocks import input_block
 import turbot.sheets
+import json
+import re
 
 def new_hunt(turb, payload):
     """Handler for the action of user pressing the new_hunt button"""
@@ -11,8 +13,11 @@ def new_hunt(turb, payload):
         "submit": { "type": "plain_text", "text": "Create" },
         "blocks": [
             input_block("Hunt name", "name", "Name of the hunt"),
-            input_block("Hunt ID", "slug", "Short hunt prefix (no spaces)"),
-            input_block("Hunt URL", "url", "External URL of hunt")
+            input_block("Hunt ID", "hunt_id",
+                        "Used as puzzle channel prefix "
+                        + "(no spaces nor punctuation)"),
+            input_block("Hunt URL", "url", "External URL of hunt",
+                        optional=True)
         ],
     }
 
@@ -34,11 +39,28 @@ def new_hunt_submission(turb, payload):
 
     state = payload['view']['state']['values']
     name = state['name']['name']['value']
-    slug = state['slug']['slug']['value']
+    hunt_id = state['hunt_id']['hunt_id']['value']
     url = state['url']['url']['value']
 
+    # Validate that the hunt_id contains no invalid characters
+    if not re.match(r'[_a-zA-Z0-9]+$', hunt_id):
+        print("Hunt ID field is invalid. Attmpting to return a clean error.")
+        return {
+            'statusCode': 200,
+            'headers': {
+                "Content-Type": "application/json"
+            },
+            'body': json.dumps({
+                "response_action": "errors",
+                "errors": {
+                    "hunt_id": "Hunt ID can only contain letters, "
+                    + "numbers, and underscores"
+                }
+            })
+        }
+
     # Create a channel for the hunt
-    response = turb.slack_client.conversations_create(name=slug)
+    response = turb.slack_client.conversations_create(name=hunt_id)
 
     if not response['ok']:
         print("Error creating channel for hunt {}: {}"
@@ -51,23 +73,29 @@ def new_hunt_submission(turb, payload):
     channel_id = response['channel']['id']
 
     # Create a sheet for the channel
-    turbot.sheets.sheets_create(turb, slug)
+    sheet = turbot.sheets.sheets_create(turb, hunt_id)
 
     # Insert the newly-created hunt into the database
-    turb.hunts_table = turb.db.Table("hunts")
-    turb.hunts_table.put_item(
+    hunts_table = turb.db.Table("hunts")
+    hunts_table.put_item(
         Item={
             'channel_id': channel_id,
             "active": True,
             "name": name,
-            "slug": slug,
-            "url": url
+            "hunt_id": hunt_id,
+            "url": url,
+            "sheet_url": sheet['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']))
+
     return {
         'statusCode': 200,
     }
@@ -93,7 +121,3 @@ actions = {
         "new_hunt": new_hunt
     }
 }
-
-submission_handlers = {
-    "new_hunt": new_hunt_submission
-}