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
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.).
"""
# 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
"Puzzle mark solved by {}: `{}`".format(user_name, args))
# Also report the solution to the hunt channel
- (hunt, _) = get_table_item(turb, "hunts", "hunt_id", puzzle['hunt_id'])
+ hunt = find_hunt_for_hunt_id(turb, puzzle['hunt_id'])
slack_send_message(
turb.slack_client, hunt['channel_id'],
"Puzzle '<{}|{}>' has been solved!".format(