diff --git a/apps/schedule/feeds.py b/apps/schedule/feeds.py index 3144c8e7b..b6bea9923 100644 --- a/apps/schedule/feeds.py +++ b/apps/schedule/feeds.py @@ -6,7 +6,7 @@ from models import event_year from models.user import User -from models.cfp import Proposal +from models.cfp import Proposal, HUMAN_CFP_TYPES from ..common import feature_flag, feature_enabled, json_response from .schedule_xml import export_frab @@ -21,7 +21,14 @@ def _format_event_description(event): - description = event["description"] if event["description"] else "" + description = "" + + if event["content_note"]: + description += "\nCONTENT NOTE: %s" % event["content_note"] + + if event["description"]: + description += "\n\n" + event["description"] + if event["type"] in ["workshop", "youthworkshop"]: description += "\n\nAttending this workshop will cost: " + event["cost"] description += "\nSuitable age range: " + event["age_range"] @@ -35,10 +42,12 @@ def _format_event_description(event): if event["map_link"]: venue_str = f'{venue_str} ({event["map_link"]})' footer_block.append(f'Venue: {venue_str}') + if event["type"] in ("talk", "lightningtalk", "performance") and event["video_privacy"] == "none": + footer_block.append(f'This {HUMAN_CFP_TYPES[event["type"]]} will not be recorded.') if footer_block: description += '\n\n' + '\n'.join(footer_block) - return description + return description.lstrip('\n') @schedule.route("/schedule/.json")