solved = True
solution_str = None
- solution_set = puzzle.get("solution", set())
- if solution_set:
- solution_str = ", ".join(solution_set)
+ solution_list = puzzle.get("solution", [])
+ if solution_list:
+ solution_str = ", ".join(solution_list)
view = {
"type": "modal",
puzzle['status'] = 'solved'
else:
puzzle['status'] = 'unsolved'
- puzzle['solution'] = set()
+ puzzle['solution'] = []
solution = state['solution']['solution']['value']
if solution:
- puzzle['solution'] = {
+ # Construct a list from a set to avoid any duplicates
+ puzzle['solution'] = list({
sol.strip() for sol in solution.split(',')
- }
+ })
# Verify that there's a solution if the puzzle is mark solved
if puzzle['status'] == 'solved' and not puzzle['solution']:
puzzle['SK'])
# If we are changing puzzle type (meta -> plain or plain -> meta)
- # the the sort key has to change, so compute the new one and delete
+ # then the sort key has to change, so compute the new one and delete
# the old item from the database.
#
# XXX: We should really be using a transaction here to combine the
if rounds:
puzzle['rounds'] = rounds
- puzzle['solution'] = set()
+ puzzle['solution'] = []
puzzle['status'] = 'unsolved'
# Create a channel for the puzzle
# Set the status and solution fields in the database
puzzle['status'] = 'solved'
- puzzle['solution'].add(args)
+
+ # Don't append a duplicate solution
+ if args not in puzzle['solution']:
+ puzzle['solution'].append(args)
if 'state' in puzzle:
del puzzle['state']
turb.table.put_item(Item=puzzle)
# Report the solution to the puzzle's channel
slack_send_message(
turb.slack_client, channel_id,
- "Puzzle mark solved by <@{}>: `{}`".format(user_id, args))
+ "Puzzle marked solved by <@{}>: `{}`".format(user_id, args))
# Also report the solution to the hunt channel
hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id'])