Remove the concept of talk slugs (#238)

matrix-org · Dec 17, 2024 · ffc1a02 · ffc1a02
1 parent b30a57a
commit ffc1a02
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 18 deletions.
diff --git 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
+dry_run_enabled: false
diff --git 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
@@ -18,7 +18,6 @@ exports[`parsing pentabarf XML: overview: auditoriums 1`] = `
         "prerecorded": true,
         "pretalxCode": undefined,
         "qa_startTime": null,
-        "slug": "testcon_opening_remarks",
         "speakers": [
           {
             "email": "",
@@ -63,7 +62,6 @@ exports[`parsing pentabarf XML: overview: conference 1`] = `
           "prerecorded": true,
           "pretalxCode": undefined,
           "qa_startTime": null,
-          "slug": "testcon_opening_remarks",
           "speakers": [
             {
               "email": "",
@@ -124,7 +122,6 @@ exports[`parsing pentabarf XML: overview: talks 1`] = `
     "prerecorded": true,
     "pretalxCode": undefined,
     "qa_startTime": null,
-    "slug": "testcon_opening_remarks",
     "speakers": [
       {
         "email": "",
@@ -159,7 +156,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": "",
@@ -189,7 +185,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": "",
@@ -219,7 +214,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": "",
@@ -249,7 +243,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
@@ -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
@@ -107,4 +106,4 @@ export class JsonScheduleLoader {
             isPhysical: false,
         };
     }
-}
+}
diff --git 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,
                         speakers: [],

diff --git a/src/backends/pretalx/PretalxParser.ts b/src/backends/pretalx/PretalxParser.ts
@@ -193,7 +193,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);
@@ -208,4 +207,4 @@ export async function parseFromJSON(rawJson: string, prefixConfig: IPrefixConfig
         auditoriums,
         talks,
     }
-}
+}
diff --git 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;
     /**

diff --git 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(),
     });