Introduce 'livestreamId' on auditoria

matrix-org · Jan 21, 2025 · 2856d16 · 2856d16
1 parent 9ab3fae
commit 2856d16
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 3 deletions.
diff --git a/config/default.yaml b/config/default.yaml
@@ -38,6 +38,7 @@ livestream:
   #  id  - The room ID/name (eg: "D.collab")
   #  sId - The room ID/name, but lowercase and only alphanumeric characters
   #        are included (eg: "dcollab")
+  #  livestreamId - The livestream ID acquired from the conference schedule source.
   auditoriumUrl: "https://stream.example.org/conference/hls/{id}.m3u8"
 
   # The template for livestreams in talk rooms

diff --git a/src/backends/json/FosdemJsonScheduleLoader.ts b/src/backends/json/FosdemJsonScheduleLoader.ts
@@ -117,6 +117,7 @@ export class FosdemJsonScheduleLoader {
             talks: new Map(),
             // Hardcoded: FOSDEM is always physical now.
             isPhysical: true,
+            livestreamId: '',
         };
     }
 }
diff --git a/src/backends/json/JsonScheduleLoader.ts b/src/backends/json/JsonScheduleLoader.ts
@@ -104,6 +104,7 @@ export class JsonScheduleLoader {
             talks,
             // TODO Support physical auditoriums in the JSON schedule backend
             isPhysical: false,
+            livestreamId: '',
         };
     }
 }
diff --git a/src/backends/penta/PentabarfParser.ts b/src/backends/penta/PentabarfParser.ts
@@ -211,7 +211,8 @@ export class PentabarfParser {
                     name: metadata.name,
                     kind: metadata.kind,
                     talks: new Map(),
-                    isPhysical: isPhysical
+                    isPhysical: isPhysical,
+                    livestreamId: '',
                 };
                 const existingAuditorium = this.auditoriums.find(r => r.id === auditorium.id);
                 if (existingAuditorium) {

diff --git a/src/backends/pretalx/PretalxParser.ts b/src/backends/pretalx/PretalxParser.ts
@@ -142,6 +142,7 @@ export async function parseFromJSON(rawJson: string, prefixConfig: IPrefixConfig
                 talks: new Map(),
                 isPhysical: isPhysical,
                 qaEnabled: qaEnabled,
+                livestreamId: '',
             };
             auditoriums.set(room.name, auditorium);
         }

diff --git a/src/models/schedule.ts b/src/models/schedule.ts
@@ -79,6 +79,11 @@ export interface IAuditorium {
      * If true, this auditorium is just a virtual representation of a real-world physical auditorium.
      */
     isPhysical: boolean;
+    /**
+     * Identifier useful for the video livestream URL.
+     * If not required by the conference backend, should be an empty string.
+     */
+    livestreamId: string;
 }
 
 export interface IConference {

diff --git a/src/web.ts b/src/web.ts
@@ -32,7 +32,8 @@ export function renderAuditoriumWidget(req: Request, res: Response, conference:
         return res.sendStatus(404);
     }
 
-    if (!conference.getAuditorium(audId)) {
+    let aud = conference.getAuditorium(audId);
+    if (!aud) {
         return res.sendStatus(404);
     }
 
@@ -45,7 +46,8 @@ export function renderAuditoriumWidget(req: Request, res: Response, conference:
 
     const streamUrl = template(auditoriumUrl, {
         id: audId.toLowerCase(),
-        sId: sid
+        sId: sid,
+        livestreamId: aud.getDefinition().livestreamId,
     });
 
     return res.render('auditorium.liquid', {