X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=turbot%2Fpuzzle.py;h=b7afc8a0beb57eb5daea281cc6e36673d873c8d2;hb=c7213abc1b0c3fcb276284dbd9ba23bb44b5f67a;hp=f0456c6cba4c29d05cf4dcc23ed96953fea5c940;hpb=716d0fe0c535e7501bd506603f825790f288bf8f;p=turbot diff --git a/turbot/puzzle.py b/turbot/puzzle.py index f0456c6..b7afc8a 100644 --- a/turbot/puzzle.py +++ b/turbot/puzzle.py @@ -46,7 +46,7 @@ def find_puzzle_for_url(turb, hunt_id, url): return response['Items'][0] -def puzzle_blocks(puzzle): +def puzzle_blocks(puzzle, include_rounds=False): """Generate Slack blocks for a puzzle The puzzle argument should be a dictionary as returned from the @@ -83,10 +83,19 @@ def puzzle_blocks(puzzle): if state: state_str = "\n{}".format(state) - puzzle_text = "{}{} <{}|{}> ({}){}".format( + rounds_str = '' + if include_rounds and 'rounds' in puzzle: + rounds = puzzle['rounds'] + rounds_str = " in round{}: {}".format( + "s" if len(rounds) > 1 else "", + ", ".join(rounds) + ) + + puzzle_text = "{}{} <{}|{}> ({}){}{}".format( status_emoji, solution_str, channel_url(channel_id), name, - ', '.join(links), state_str + ', '.join(links), rounds_str, + state_str ) # Combining hunt ID and puzzle ID together here is safe because