Add both round and "-m" (for META), if appropriate, into channel name

For better grouping of related puzzles in the channel list

diff --git a/turbot/puzzle.py b/turbot/puzzle.py
index f2816acb5b42b5903c3587060bc03680e706d670..e1e1bc2c6ed683fa8fe92962e4c476d59c433acf 100644 (file)
--- a/turbot/puzzle.py
+++ b/turbot/puzzle.py
@@ -242,11 +242,21 @@ def puzzle_channel_topic(puzzle):
 def puzzle_channel_name(puzzle):
     """Compute the channel name for a puzzle"""
 
+    round = ''
+    if 'rounds' in puzzle:
+        round = '-' + puzzle_id_from_name(puzzle['rounds'][0])
+
+    meta = ''
+    if puzzle['type'] == 'meta':
+        meta = '-m'
+
     # Note: We don't use puzzle['puzzle_id'] here because we're keeping
     # that as a persistent identifier in the database. Instead we
     # create a new ID-like identifier from the current name.
-    channel_name = "{}-{}".format(
+    channel_name = "{}{}{}-{}".format(
         puzzle['hunt_id'],
+        round,
+        meta,
         puzzle_id_from_name(puzzle['name'])
     )