X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Finteraction.py;h=25307c22a26aec26084da1b623ebaee2acec069f;hb=1af32409a8d60e9580a0873bd8b2fa3c676c37ee;hp=d7e8da6ff905bd086046ce499e82e47be319192a;hpb=b7be5feac00a7e3ff5ceadbf7c5ab1bc5e3259d8;p=turbot

diff --git a/turbot/interaction.py b/turbot/interaction.py
index d7e8da6..25307c2 100644
--- a/turbot/interaction.py
+++ b/turbot/interaction.py
@@ -5,7 +5,8 @@ from turbot.blocks import (
 from turbot.hunt import (
     find_hunt_for_hunt_id,
     hunt_blocks,
-    hunt_puzzles_for_hunt_id
+    hunt_puzzles_for_hunt_id,
+    hunt_update_topic
 )
 from turbot.puzzle import (
     find_puzzle_for_url,
@@ -216,6 +217,10 @@ def edit_puzzle(turb, puzzle, trigger_id):
                         "New round(s) this puzzle belongs to " +
                         "(comma separated)",
                         optional=True),
+            input_block("Tag(s)", "tags",
+                        "Tags for this puzzle (comma separated)",
+                        initial_value=", ".join(puzzle.get("tags", [])),
+                        optional=True),
             input_block("State", "state",
                         "State of this puzzle (partial progress, next steps)",
                         initial_value=puzzle.get("state", None),
@@ -273,6 +278,7 @@ def edit_puzzle_submission(turb, payload, metadata):
         if rounds:
             puzzle['rounds'] = rounds
     new_rounds = state['new_rounds']['new_rounds']['value']
+    tags = state['tags']['tags']['value']
     puzzle_state = state['state']['state']['value']
     if puzzle_state:
         puzzle['state'] = puzzle_state
@@ -315,6 +321,24 @@ def edit_puzzle_submission(turb, payload, metadata):
                 }
             )
 
+    # Process any tags
+    puzzle['tags'] = []
+    if tags:
+        for tag in tags.split(','):
+            # Drop any leading/trailing spaces from the tag
+            tag = tag.strip().upper()
+            # Ignore any empty string
+            if not len(tag):
+                continue
+            # Reject a tag that is not alphabetic or underscore A-Z_
+            if not re.match(r'^[A-Z0-9_]*$', tag):
+                return submission_error(
+                    "tags",
+                    "Error: Tags can only contain letters, numbers, "
+                    + "and the underscore character."
+                )
+            puzzle['tags'].append(tag)
+
     # Get old puzzle from the database (to determine what's changed)
     old_puzzle = find_puzzle_for_sort_key(turb,
                                           puzzle['hunt_id'],
@@ -349,9 +373,20 @@ def edit_puzzle_submission(turb, payload, metadata):
         turb.slack_client, puzzle['channel_id'],
         edit_message, blocks=blocks)
 
+    # Advertize any tag additions to the hunt
+    hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id'])
+
+    new_tags = set(puzzle['tags']) - set(old_puzzle['tags'])
+    if new_tags:
+        message = "Puzzle <{}|{}> has been tagged: {}".format(
+            puzzle['channel_url'],
+            puzzle['name'],
+            ", ".join(['`{}`'.format(t) for t in new_tags])
+        )
+        slack_send_message(turb.slack_client, hunt['channel_id'], message)
+
     # Also inform the hunt if the puzzle's solved status changed
     if puzzle['status'] != old_puzzle['status']:
-        hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id'])
         if puzzle['status'] == 'solved':
             message = "Puzzle <{}|{}> has been solved!".format(
                 puzzle['channel_url'],
@@ -425,6 +460,10 @@ def edit_hunt(turb, hunt, trigger_id):
             input_block("Hunt URL", "url", "External URL of hunt",
                         initial_value=hunt.get("url", None),
                         optional=True),
+            input_block("State", "state",
+                        "State of the hunt (goals, upcoming meetings, etc.)",
+                        initial_value=hunt.get("state", None),
+                        optional=True),
             checkbox_block("Is this hunt active?", "Active", "active",
                            checked=(hunt.get('active', False)))
         ]
@@ -463,6 +502,9 @@ def edit_hunt_submission(turb, payload, metadata):
     if url:
         hunt['url'] = url
 
+    hunt_state = state['state']['state']['value']
+    if hunt_state:
+        hunt['state'] = hunt_state
     if state['active']['active']['selected_options']:
         hunt['active'] = True
     else:
@@ -488,6 +530,9 @@ def edit_hunt_submission(turb, payload, metadata):
         turb.slack_client, hunt['channel_id'],
         edit_message, blocks=blocks)
 
+    # Update channel topic and description
+    hunt_update_topic(turb, hunt)
+
     return lambda_ok
 
 def new_hunt_command(turb, body):
@@ -965,7 +1010,10 @@ def new_puzzle(turb, body):
             input_block("New round(s)", "new_rounds",
                         "New round(s) this puzzle belongs to " +
                         "(comma separated)",
-                        optional=True)
+                        optional=True),
+            input_block("Tag(s)", "tags",
+                        "Tags for this puzzle (comma separated)",
+                        optional=True),
         ]
     }
 
@@ -1007,6 +1055,7 @@ def new_puzzle_submission(turb, payload, metadata):
     else:
         rounds = []
     new_rounds = state['new_rounds']['new_rounds']['value']
+    tags = state['tags']['tags']['value']
 
     # Create a Slack-channel-safe puzzle_id
     puzzle['puzzle_id'] = puzzle_id_from_name(puzzle['name'])
@@ -1042,6 +1091,24 @@ def new_puzzle_submission(turb, payload, metadata):
                 }
             )
 
+    # Process any tags
+    puzzle['tags'] = []
+    if tags:
+        for tag in tags.split(','):
+            # Drop any leading/trailing spaces from the tag
+            tag = tag.strip().upper()
+            # Ignore any empty string
+            if not len(tag):
+                continue
+            # Reject a tag that is not alphabetic or underscore A-Z_
+            if not re.match(r'^[A-Z0-9_]*$', tag):
+                return submission_error(
+                    "tags",
+                    "Error: Tags can only contain letters, numbers, "
+                    + "and the underscore character."
+                )
+            puzzle['tags'].append(tag)
+
     if rounds:
         puzzle['rounds'] = rounds
 
@@ -1159,6 +1226,17 @@ def tag(turb, body, args):
 
     puzzle_update_channel_and_sheet(turb, puzzle, old_puzzle=old_puzzle)
 
+    # Advertize any tag additions to the hunt
+    new_tags = set(puzzle['tags']) - set(old_puzzle['tags'])
+    if new_tags:
+        hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id'])
+        message = "Puzzle <{}|{}> has been tagged: {}".format(
+            puzzle['channel_url'],
+            puzzle['name'],
+            ", ".join(['`{}`'.format(t) for t in new_tags])
+        )
+        slack_send_message(turb.slack_client, hunt['channel_id'], message)
+
     return lambda_ok
 
 commands["/tag"] = tag