X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Finteraction.py;h=546e59a70a25728b1dcdee92d60f6d5730687fda;hb=4a390d5c89977ae8ff8baae26001d6f047e50903;hp=34aa31305427661b83825ec8849b8a8859507b8e;hpb=59f80efe50f26c1f2e288cc85be2b24a9590a930;p=turbot

diff --git a/turbot/interaction.py b/turbot/interaction.py
index 34aa313..546e59a 100644
--- a/turbot/interaction.py
+++ b/turbot/interaction.py
@@ -17,6 +17,8 @@ from turbot.puzzle import (
     puzzle_copy
 )
 from turbot.round import round_quoted_puzzles_titles_answers
+from turbot.help import turbot_help
+from turbot.have_you_tried import have_you_tried
 import turbot.rot
 import turbot.sheets
 import turbot.slack
@@ -86,12 +88,42 @@ def edit(turb, body, args):
 
     """Implementation of the `/edit` command
 
-    To edit the puzzle for the current channel.
+    This can be used as `/edit` (with no arguments) in either a hunt
+    or a puzzle channel to edit that hunt or puzzle. It can also be
+    called explicitly as `/edit hunt` to edit a hunt even from a
+    puzzle channel.
 
-    This is simply a shortcut for `/puzzle edit`.
+    In any case, the operation is identical to `/hunt edit` or
+    `/puzzle edit`.
     """
 
-    return edit_puzzle_command(turb, body)
+    # If we have an explicit argument, do what it says to do
+    if args == "hunt":
+        return edit_hunt_command(turb, body)
+
+    if args == "puzzle":
+        return edit_puzzle_command(turb, body)
+
+    # Any other argument string is an error
+    if args:
+        return bot_reply("Error: Unexpected argument: {}\n".format(args) +
+                         "Usage: `/edit puzzle`, `/edit hunt`, or " +
+                         "`/edit` (to choose based on channel)"
+                         )
+
+    # No explicit argument, so select what to edit based on the current channel
+    channel_id = body['channel_id'][0]
+    trigger_id = body['trigger_id'][0]
+
+    puzzle = puzzle_for_channel(turb, channel_id)
+    if puzzle:
+        return edit_puzzle(turb, puzzle, trigger_id)
+
+    hunt = hunt_for_channel(turb, channel_id)
+    if hunt:
+        return edit_hunt(turb, hunt, trigger_id)
+
+    return bot_reply("Sorry, `/edit` only works in a hunt or puzzle channel.")
 
 commands["/edit"] = edit
 
@@ -116,7 +148,6 @@ def edit_puzzle_button(turb, payload):
     """Handler for the action of user pressing an edit_puzzle button"""
 
     action_id = payload['actions'][0]['action_id']
-    response_url = payload['response_url']
     trigger_id = payload['trigger_id']
 
     (hunt_id, sort_key) = action_id.split('-', 1)
@@ -124,9 +155,6 @@ def edit_puzzle_button(turb, payload):
     puzzle = find_puzzle_for_sort_key(turb, hunt_id, sort_key)
 
     if not puzzle:
-        requests.post(response_url,
-                      json = {"text": "Error: Puzzle not found!"},
-                      headers = {"Content-type": "application/json"})
         return bot_reply("Error: Puzzle not found.")
 
     return edit_puzzle(turb, puzzle, trigger_id)
@@ -357,15 +385,11 @@ def edit_hunt_button(turb, payload):
     """Handler for the action of user pressing an edit_hunt button"""
 
     hunt_id = payload['actions'][0]['action_id']
-    response_url = payload['response_url']
     trigger_id = payload['trigger_id']
 
-    hunt = find_hunt_for_hunt_id(hunt_id)
+    hunt = find_hunt_for_hunt_id(turb, hunt_id)
 
     if not hunt:
-        requests.post(response_url,
-                      json = {"text": "Error: Hunt not found!"},
-                      headers = {"Content-type": "application/json"})
         return bot_reply("Error: Hunt not found.")
 
     return edit_hunt(turb, hunt, trigger_id)
@@ -1304,3 +1328,47 @@ def round(turb, body, args):
     return lambda_ok
 
 commands["/round"] = round
+
+def help_command(turb, body, args):
+    """Implementation of the /help command
+
+    Displays help on how to use Turbot.
+    """
+
+    channel_id = body['channel_id'][0]
+    response_url = body['response_url'][0]
+    user_id = body['user_id'][0]
+
+    # Process "/help me" first. It calls out to have_you_tried rather
+    # than going through our help system.
+    #
+    # Also, it reports in the current channel, (where all other help
+    # output is reported privately to the invoking user).
+    if args == "me":
+        to_try = "In response to <@{}> asking `/help me`:\n\n{}\n".format(
+            user_id, have_you_tried())
+
+        # We'll try first to reply directly to the channel (for the benefit
+        # of anyone else in the same channel that might be stuck too.
+        #
+        # But if this doesn't work, (direct message or private channel),
+        # then we can instead reply with an ephemeral message by using
+        # the response_url.
+        try:
+            turb.slack_client.chat_postMessage(
+                channel=channel_id, text=to_try)
+        except SlackApiError:
+            requests.post(response_url,
+                          json = {"text": to_try},
+                          headers = {"Content-type": "application/json"})
+        return lambda_ok
+
+    help_string = turbot_help(args)
+
+    requests.post(response_url,
+                  json = {"text": help_string},
+                  headers = {"Content-type": "application/json"})
+
+    return lambda_ok
+
+commands["/help"] = help_command