return edit_puzzle(turb, puzzle, trigger_id)
- return lambda_ok
-
def edit_puzzle_button(turb, payload):
"""Handler for the action of user pressing an edit_puzzle button"""
return lambda_ok
-def new_hunt(turb, payload):
+def new_hunt_command(turb, body):
+ """Implementation of the '/hunt new' command
+
+ As dispatched from the hunt() function.
+ """
+
+ trigger_id = body['trigger_id'][0]
+
+ return new_hunt(turb, trigger_id)
+
+def new_hunt_button(turb, payload):
"""Handler for the action of user pressing the new_hunt button"""
+ trigger_id = payload['trigger_id']
+
+ return new_hunt(turb, trigger_id)
+
+def new_hunt(turb, trigger_id):
+ """Common code for implementing a new hunt dialog
+
+ This implementation is common whether the operations was invoked
+ by a button (new_hunt_button) or a command (new_hunt_command).
+ """
+
view = {
"type": "modal",
"private_metadata": json.dumps({}),
],
}
- result = turb.slack_client.views_open(trigger_id=payload['trigger_id'],
+ result = turb.slack_client.views_open(trigger_id=trigger_id,
view=view)
if (result['ok']):
submission_handlers[result['view']['id']] = new_hunt_submission
# For a meta puzzle, also display the titles and solutions for all
# puzzles in the same round.
- if puzzle['type'] == 'meta':
+ if puzzle.get('type', 'plain') == 'meta':
puzzles = hunt_puzzles_for_hunt_id(turb, puzzle['hunt_id'])
# Drop this puzzle itself from the report
tag = tag.upper()
# Reject a tag that is not alphabetic or underscore A-Z_
- if not re.match(r'^[A-Z_]*$', tag):
- return bot_reply("Sorry, tags can only contain letters "
+ if not re.match(r'^[A-Z0-9_]*$', tag):
+ return bot_reply("Sorry, tags can only contain letters, numbers, "
+ "and the underscore character.")
if action == 'remove':
channel_id = body['channel_id'][0]
response_url = body['response_url'][0]
+ # First, farm off "/hunt new" as a separate command
+ if args == "new":
+ return new_hunt_command(turb, body)
+
terms = None
if args:
# The first word can be a puzzle status and all remaining word