Convert the solution data structure back to a list, (but still avoid dupes.)

[turbot] / turbot / interaction.py

diff --git a/turbot/interaction.py b/turbot/interaction.py
index d87d27ac1a6827a9da4f6392245e96328440de6e..86f438c372b5358c8641d3497809d4d1b5b6ba3f 100644 (file)
--- a/turbot/interaction.py
+++ b/turbot/interaction.py
@@ -187,7 +187,7 @@ def edit_puzzle(turb, puzzle, trigger_id):
         solved = True
 
     solution_str = None
-    solution_list = puzzle.get("solution", [])
+    solution_list = puzzle.get("solution", ())
     if solution_list:
         solution_str = ", ".join(solution_list)
 
@@ -267,10 +267,11 @@ def edit_puzzle_submission(turb, payload, metadata):
         puzzle['type'] = 'meta'
     else:
         puzzle['type'] = 'plain'
-    rounds = [option['value'] for option in
-              state['rounds']['rounds']['selected_options']]
-    if rounds:
-        puzzle['rounds'] = rounds
+    if 'rounds' in state:
+        rounds = [option['value'] for option in
+                  state['rounds']['rounds']['selected_options']]
+        if rounds:
+            puzzle['rounds'] = rounds
     new_rounds = state['new_rounds']['new_rounds']['value']
     puzzle_state = state['state']['state']['value']
     if puzzle_state:
@@ -279,12 +280,13 @@ def edit_puzzle_submission(turb, payload, metadata):
         puzzle['status'] = 'solved'
     else:
         puzzle['status'] = 'unsolved'
-    puzzle['solution'] = []
+    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']:
@@ -534,7 +536,7 @@ def new_hunt(turb, trigger_id):
 
     return lambda_ok
 
-actions['button']['new_hunt'] = new_hunt
+actions['button']['new_hunt'] = new_hunt_button
 
 def new_hunt_submission(turb, payload, metadata):
     """Handler for the user submitting the new hunt modal
@@ -1043,7 +1045,7 @@ def new_puzzle_submission(turb, payload, metadata):
     if rounds:
         puzzle['rounds'] = rounds
 
-    puzzle['solution'] = []
+    puzzle['solution'] = ()
     puzzle['status'] = 'unsolved'
 
     # Create a channel for the puzzle
@@ -1183,7 +1185,10 @@ def solved(turb, body, args):
 
     # Set the status and solution fields in the database
     puzzle['status'] = 'solved'
-    puzzle['solution'].append(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)
@@ -1269,10 +1274,13 @@ def hunt(turb, body, args):
 
     blocks = hunt_blocks(turb, hunt, puzzle_status=status, search_terms=terms)
 
-    requests.post(response_url,
-                  json = { 'blocks': blocks },
-                  headers = {'Content-type': 'application/json'}
-                  )
+    for block in blocks:
+        if len(block) > 100:
+            block = block[:100]
+        requests.post(response_url,
+                      json = { 'blocks': block },
+                      headers = {'Content-type': 'application/json'}
+                      )
 
     return lambda_ok
 
@@ -1343,10 +1351,13 @@ def round(turb, body, args):
                          limit_to_rounds=puzzle.get('rounds', [])
                          )
 
-    requests.post(response_url,
-                  json = { 'blocks': blocks },
-                  headers = {'Content-type': 'application/json'}
-                  )
+    for block in blocks:
+        if len(block) > 100:
+            block = block[:100]
+        requests.post(response_url,
+                      json = { 'blocks': block },
+                      headers = {'Content-type': 'application/json'}
+                      )
 
     return lambda_ok