X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=turbot%2Finteraction.py;h=a929ac553fef804c6312dcb10dc107f58fd386d3;hb=90ad4737548756053a1e986295fb5c98d0caa23a;hp=bef4f42ee7ad52200fa9b10d63abf59dd4d6f802;hpb=13a4f1596e72f847571c2bb42fd29064a36a658b;p=turbot

diff --git a/turbot/interaction.py b/turbot/interaction.py
index bef4f42..a929ac5 100644
--- a/turbot/interaction.py
+++ b/turbot/interaction.py
@@ -244,6 +244,27 @@ def channel_is_hunt(turb, channel_id):
 
     return get_table_item(turb, "hunts", 'channel_id', channel_id)
 
+def find_hunt_for_hunt_id(turb, hunt_id):
+    """Given a hunt ID find the database for for that hunt
+
+    Returns None if hunt ID is not found, otherwise a
+    dictionary with all fields from the hunt's row in the table,
+    (channel_id, active, hunt_id, name, url, sheet_url, etc.).
+
+    """
+    hunts_table = turb.db.Table("hunts")
+
+    response = hunts_table.scan(
+        FilterExpression='hunt_id = :hunt_id',
+        ExpressionAttributeValues={':hunt_id': hunt_id}
+    )
+
+    if 'Items' in response and len(response['Items']):
+        item = response['Items'][0]
+        return item
+
+    return None
+
 def find_hunt_for_channel(turb, channel_id, channel_name):
     """Given a channel ID/name find the id/name of the hunt for this channel
 
@@ -252,7 +273,7 @@ def find_hunt_for_channel(turb, channel_id, channel_name):
 
     Returns None if channel does not belong to a hunt, otherwise a
     dictionary with all fields from the hunt's row in the table,
-    (channel_id, active_, hun_id, name, url, sheet_url, etc.).
+    (channel_id, active, hunt_id, name, url, sheet_url, etc.).
 
     """
 
@@ -265,18 +286,7 @@ def find_hunt_for_channel(turb, channel_id, channel_name):
     # puzzle channel with a hunt-id prefix.
     hunt_id = channel_name.split('-')[0]
 
-    hunts_table = turb.db.Table("hunts")
-
-    response = hunts_table.scan(
-        FilterExpression='hunt_id = :hunt_id',
-        ExpressionAttributeValues={':hunt_id': hunt_id}
-    )
-
-    if 'Items' in response and len(response['Items']):
-        item = response['Items'][0]
-        return item
-
-    return None
+    return find_hunt_for_hunt_id(turb, hunt_id)
 
 def puzzle(turb, body, args):
     """Implementation of the /puzzle command
@@ -356,9 +366,9 @@ def puzzle_submission(turb, payload, metadata):
     table.put_item(
         Item={
             "channel_id": puzzle_channel_id,
-            "orig_channel_name": hunt_dash_channel,
             "solution": [],
             "status": 'unsolved',
+            "hunt_id": hunt_id,
             "name": name,
             "puzzle_id": puzzle_id,
             "url": url,
@@ -367,13 +377,6 @@ def puzzle_submission(turb, payload, metadata):
 
     return lambda_ok
 
-def rename_channel_to_solved(turb, puzzle):
-    orig_channel_name = puzzle['orig_channel_name']
-    channel_id = puzzle['channel_id']
-    newName = orig_channel_name + '-solved'
-    turb.slack_client.conversations_rename(channel=channel_id,
-                                           name=newName)
-
 # XXX: This duplicates functionality eith events.py:set_channel_description
 def set_channel_topic(turb, puzzle):
     channel_id = puzzle['channel_id']
@@ -453,6 +456,15 @@ def solved(turb, body, args):
         turb.slack_client, channel_id,
         "Puzzle mark solved by {}: `{}`".format(user_name, args))
 
+    # Also report the solution to the hunt channel
+    hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id'])
+    slack_send_message(
+        turb.slack_client, hunt['channel_id'],
+        "Puzzle <{}|{}> has been solved!".format(
+            puzzle['channel_url'],
+            puzzle['name'])
+    )
+
     # And update the puzzle's description
     set_channel_topic(turb, puzzle)
 
@@ -460,7 +472,12 @@ def solved(turb, body, args):
     turbot.sheets.renameSheet(turb, puzzle['sheet_url'], 'SOLVED: ' + puzzle['name'])
 
     # Finally, rename the Slack channel to add the suffix '-solved'
-    rename_channel_to_solved(turb, puzzle)
+    channel_name = "{}-{}-solved".format(
+        puzzle['hunt_id'],
+        puzzle['puzzle_id'])
+    turb.slack_client.conversations_rename(
+        channel=puzzle['channel_id'],
+        name=channel_name)
 
     return lambda_ok