diff --git a/config/default.yaml b/config/default.yaml index c491a1b..64a2bd7 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -42,10 +42,10 @@ livestream: # The template for livestreams in talk rooms # Available variables: - # slug - The shorthand version of the talk name (eg: "matrix-p2p") + # id - The talk's ID # audId - The auditorium ID the talk is held in (eg: "D.collab") # jitsi - The Jitsi conference name in lowercase. - talkUrl: "https://stream.example.org/conference-talks/hls/{slug}.m3u8" + talkUrl: "https://stream.example.org/conference-talks/hls/talk-{id}.m3u8" # The template for livestreams in random rooms. # Available variables: @@ -255,4 +255,4 @@ metrics: address: 127.0.0.1 # if set to `true` will prevent the conf-bot from sending live invites to email/matrix_ids -dry_run_enabled: false \ No newline at end of file +dry_run_enabled: false diff --git a/src/Conference.ts b/src/Conference.ts index 385602b..6f033de 100644 --- a/src/Conference.ts +++ b/src/Conference.ts @@ -635,7 +635,8 @@ export class Conference { // Calculate all the aliases the room should have, then update the list of bot-assigned aliases to match const wantedBaseNames = [ - (await auditorium.getSlug()) + '-' + talk.slug, + // Talk slugs no longer exist. But if we ever use this feature again, we probably want to reinstate them. + // (await auditorium.getSlug()) + '-' + talk.slug, 'talk-' + talk.id, ]; const wantedPrefixedNames = wantedBaseNames.flatMap(baseName => applyAllAliasPrefixes(baseName, this.config.conference.prefixes.aliases)); diff --git a/src/__tests__/backends/penta/__snapshots__/PentabarfParser.test.ts.snap b/src/__tests__/backends/penta/__snapshots__/PentabarfParser.test.ts.snap index 97faf45..a9c8fad 100644 --- a/src/__tests__/backends/penta/__snapshots__/PentabarfParser.test.ts.snap +++ b/src/__tests__/backends/penta/__snapshots__/PentabarfParser.test.ts.snap @@ -18,7 +18,6 @@ exports[`parsing pentabarf XML: overview: auditoriums 1`] = ` "prerecorded": true, "pretalxCode": undefined, "qa_startTime": null, - "slug": "testcon_opening_remarks", "speakers": [ { "email": "", @@ -64,7 +63,6 @@ exports[`parsing pentabarf XML: overview: conference 1`] = ` "prerecorded": true, "pretalxCode": undefined, "qa_startTime": null, - "slug": "testcon_opening_remarks", "speakers": [ { "email": "", @@ -126,7 +124,6 @@ exports[`parsing pentabarf XML: overview: talks 1`] = ` "prerecorded": true, "pretalxCode": undefined, "qa_startTime": null, - "slug": "testcon_opening_remarks", "speakers": [ { "email": "", @@ -162,7 +159,6 @@ exports[`tracks that set a online qa value correctly apply to talks: talks 1`] = "prerecorded": true, "pretalxCode": undefined, "qa_startTime": 0, - "slug": "testcon_opening_remarks", "speakers": [ { "email": "", @@ -193,7 +189,6 @@ exports[`tracks that set a online qa value correctly apply to talks: talks 1`] = "prerecorded": true, "pretalxCode": undefined, "qa_startTime": 0, - "slug": "testcon_opening_remarks", "speakers": [ { "email": "", @@ -224,7 +219,6 @@ exports[`tracks that set a online qa value correctly apply to talks: talks 1`] = "prerecorded": true, "pretalxCode": undefined, "qa_startTime": null, - "slug": "testcon_opening_remarks", "speakers": [ { "email": "", @@ -255,7 +249,6 @@ exports[`tracks that set a online qa value correctly apply to talks: talks 1`] = "prerecorded": true, "pretalxCode": undefined, "qa_startTime": 0, - "slug": "testcon_opening_remarks", "speakers": [ { "email": "", diff --git a/src/backends/json/JsonScheduleLoader.ts b/src/backends/json/JsonScheduleLoader.ts index 13a5c81..770e859 100644 --- a/src/backends/json/JsonScheduleLoader.ts +++ b/src/backends/json/JsonScheduleLoader.ts @@ -68,7 +68,6 @@ export class JsonScheduleLoader { id: talk.id.toString(), // TODO We have numbers on the rhs and a string on the lhs. title: talk.title, subtitle: talk.description, // TODO is this valid? - slug: slugify(talk.title), auditoriumId, prerecorded: true, // TODO @@ -108,4 +107,4 @@ export class JsonScheduleLoader { isPhysical: false, }; } -} \ No newline at end of file +} diff --git a/src/backends/penta/PentabarfParser.ts b/src/backends/penta/PentabarfParser.ts index 195306a..768aa27 100644 --- a/src/backends/penta/PentabarfParser.ts +++ b/src/backends/penta/PentabarfParser.ts @@ -246,7 +246,6 @@ export class PentabarfParser { dateTs: dateTs, startTime: startTime.valueOf(), endTime: endTime.valueOf(), - slug: pEvent.slug, title: pEvent.title, subtitle: pEvent.subtitle, track: pEvent.track, diff --git a/src/backends/pretalx/PretalxParser.ts b/src/backends/pretalx/PretalxParser.ts index e00be2f..3c937e9 100644 --- a/src/backends/pretalx/PretalxParser.ts +++ b/src/backends/pretalx/PretalxParser.ts @@ -195,7 +195,6 @@ export async function parseFromJSON(rawJson: string, prefixConfig: IPrefixConfig })), //event.persons, // TODO: Unsure? auditoriumId: roomName, - slug: event.slug, }; talks.set(eventCode, talk); auditorium?.talks.set(eventCode, talk); @@ -210,4 +209,4 @@ export async function parseFromJSON(rawJson: string, prefixConfig: IPrefixConfig auditoriums, talks, } -} \ No newline at end of file +} diff --git a/src/models/schedule.ts b/src/models/schedule.ts index dec3090..701e213 100644 --- a/src/models/schedule.ts +++ b/src/models/schedule.ts @@ -52,7 +52,6 @@ export interface ITalk { */ qa_startTime: number | null; livestream_endTime: number; - slug: string; title: string; subtitle: string; track: string; diff --git a/src/web.ts b/src/web.ts index f9dd5f7..3dc8577 100644 --- a/src/web.ts +++ b/src/web.ts @@ -81,7 +81,7 @@ export async function renderTalkWidget(req: Request, res: Response, conference: const streamUrl = template(talkUrl, { audId: audId.toLowerCase(), - slug: (await talk.getDefinition()).slug.toLowerCase(), + id: await talk.getId(), jitsi: base32.stringify(Buffer.from(talk.roomId), { pad: false }).toLowerCase(), });