From 313f8d9dbdfa6958eeaf8ed7cf1636d862a6b08d Mon Sep 17 00:00:00 2001
From: reivilibre <oliverw@matrix.org>
Date: Fri, 2 Feb 2024 08:35:37 +0000
Subject: [PATCH 1/2] Fix null !== undefined mistake in #220 and improve
 rendering slightly (#222)

* Fix null !== undefined mistake

* Move 'has room'/'no room' indicator to less important space
---
 src/commands/ScheduleCommand.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/commands/ScheduleCommand.ts b/src/commands/ScheduleCommand.ts
index 7d4898f..d9c126f 100644
--- a/src/commands/ScheduleCommand.ts
+++ b/src/commands/ScheduleCommand.ts
@@ -33,7 +33,7 @@ export class ScheduleCommand implements ICommand {
             const upcoming = sortTasks(this.scheduler.inspect());
             let html = "Upcoming tasks:<ul>";
             for (const task of upcoming) {
-                const hasTalkRoom = this.conference.getTalk(task.talk.id) !== null;
+                const hasTalkRoom = this.conference.getTalk(task.talk.id) !== undefined;
                 const taskStart = moment(getStartTime(task));
                 const formattedTimestamp = taskStart.format("YYYY-MM-DD HH:mm:ss [UTC]ZZ");
 
@@ -44,8 +44,8 @@ export class ScheduleCommand implements ICommand {
                     html = "…<ul>";
                 }
 
-                const hasRoomIndicator = hasTalkRoom ? '(has talk room)' : '(no talk room)';
-                html += `<li>${formattedTimestamp}: <b>${task.type} on ${task.talk.title} ${hasRoomIndicator}</b> (<code>${task.id}</code>) ${taskStart.fromNow()}</li>`;
+                const hasRoomIndicator = hasTalkRoom ? 'has talk room' : 'no talk room';
+                html += `<li>${formattedTimestamp}: <b>${task.type} on ${task.talk.title}</b> (<code>${task.id}</code>, ${hasRoomIndicator}) ${taskStart.fromNow()}</li>`;
             }
             html += "</ul>";
             await this.client.sendHtmlNotice(roomId, html);

From a880e8155c41249057dd506c0a7fff8247cac24f Mon Sep 17 00:00:00 2001
From: reivilibre <oliverw@matrix.org>
Date: Fri, 2 Feb 2024 08:37:10 +0000
Subject: [PATCH 2/2] Fix `talk_start_5m` error spam when physical rooms are in
 use (#224)

---
 src/Scheduler.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Scheduler.ts b/src/Scheduler.ts
index 40de5c7..eca3122 100644
--- a/src/Scheduler.ts
+++ b/src/Scheduler.ts
@@ -415,7 +415,9 @@ export class Scheduler {
                 const resolved = (await resolveIdentifiers(this.client, userIds)).filter(p => p.mxid).map(p => p.mxid!);
                 await this.checkins.expectCheckinFrom(resolved);
             }
-        } else if (task.type === ScheduledTaskType.TalkStart5M && confTalk !== undefined) {
+        } else if (task.type === ScheduledTaskType.TalkStart5M) {
+            if (confTalk === undefined) return;
+
             if (!task.talk.prerecorded) {
                 await this.client.sendHtmlText(confTalk.roomId, `<h3>Your talk starts in about 5 minutes</h3><p><b>Your talk is not pre-recorded.</b> Your talk's full duration will be Q&A.</p>`);
             } else {