X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot%2Finteraction.py;h=f50a83495fee11761a27bcd3f1051ced3b493d35;hb=4778050b2bde391905712345b88f77616f4cc378;hp=1f5d11f4b4218b9a92680088d87521d69c6cd74b;hpb=0878d40471403513b6da016d7412d07a5d903e9b;p=turbot

diff --git a/turbot/interaction.py b/turbot/interaction.py
index 1f5d11f..f50a834 100644
--- a/turbot/interaction.py
+++ b/turbot/interaction.py
@@ -686,7 +686,7 @@ def puzzle(turb, body, args):
 
     # 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
@@ -927,8 +927,8 @@ def tag(turb, body, args):
     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':
@@ -967,7 +967,7 @@ def solved(turb, body, args):
     The args string should be a confirmed solution."""
 
     channel_id = body['channel_id'][0]
-    user_name = body['user_name'][0]
+    user_id = body['user_id'][0]
 
     old_puzzle = puzzle_for_channel(turb, channel_id)
 
@@ -991,7 +991,7 @@ def solved(turb, body, args):
     # Report the solution to the puzzle's channel
     slack_send_message(
         turb.slack_client, channel_id,
-        "Puzzle mark solved by {}: `{}`".format(user_name, args))
+        "Puzzle mark solved by <@{}>: `{}`".format(user_id, args))
 
     # Also report the solution to the hunt channel
     hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id'])