From 5d4cdb7b83cebb9a74178984e47bfa9faca57801 Mon Sep 17 00:00:00 2001
From: Hornwitser <code@hornwitser.no>
Date: Sun, 21 Sep 2025 22:15:11 +0200
Subject: [PATCH 1/4] Fix session-expired event causing events to stop

If a session-expired event is hit that does not match the current
session then it should be ignored and event processing continue without
it.  This was incorrectly implemented and instead event processing
would stop when any session-expired event was hit, not just the ones
matching the current session.

Fix logic to properly ignore session-expired events when it doesn't
match the current session.
---
 server/streams.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/streams.ts b/server/streams.ts
index aca024a..dd312da 100644
--- a/server/streams.ts
+++ b/server/streams.ts
@@ -192,8 +192,9 @@ function sendEventToStream(stream: EventStream, event: ApiEvent) {
 	if (event.type === "session-expired") {
 		if (stream.sessionId === event.sessionId) {
 			stream.close("session expired");
+			return false;
 		}
-		return false;
+		return true;
 	}
 
 	// Account events are specially handled and only sent to the user they belong to.

From 7314b26c77114ceb365d5ea4eacb04442d10d1b7 Mon Sep 17 00:00:00 2001
From: Hornwitser <code@hornwitser.no>
Date: Sun, 21 Sep 2025 22:27:28 +0200
Subject: [PATCH 2/4] Fix tab visuals in Firefox

The rendering of the tabs would not include the spacer in Firefox for
if the width was not set for some reason.
---
 components/Tabs.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/Tabs.vue b/components/Tabs.vue
index 0d2ee34..37bf429 100644
--- a/components/Tabs.vue
+++ b/components/Tabs.vue
@@ -55,7 +55,6 @@ nav {
 }
 .tab {
 	display: flex;
-	flex-wrap: wrap;
 }
 .tab.active {
 	padding-block-start: 1px;
@@ -65,6 +64,7 @@ nav {
 }
 .tab .spacer {
 	flex: 1 0 0.75rem;
+	width: 0.75rem;
 }
 .tab .flap,
 .tab .spacer {

From a32a49b281e7d08f76154e7ec29d46acd2e518f3 Mon Sep 17 00:00:00 2001
From: Hornwitser <code@hornwitser.no>
Date: Sun, 21 Sep 2025 23:15:10 +0200
Subject: [PATCH 3/4] Add UI for setting cancelled status

Add indications in event cards, event slot cards and the timetable for
an event or event slot being cancelled by striking it through and
dimming the text colour.  And a checkbox in the event and event slot
list to edit the cancelled status.  And a diff entry for the cancelled
status on events and event slots.
---
 components/CardEvent.vue               | 20 +++++++++++++++++---
 components/CardEventSlot.vue           | 13 +++++++++++--
 components/DiffScheduleEvent.vue       |  6 ++++++
 components/DiffScheduleEventSlot.vue   |  6 ++++++
 components/TableScheduleEventSlots.vue |  9 +++++++++
 components/TableScheduleEvents.vue     |  9 +++++++++
 components/Timetable.vue               | 11 ++++++++++-
 7 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/components/CardEvent.vue b/components/CardEvent.vue
index cec96b9..0d90894 100644
--- a/components/CardEvent.vue
+++ b/components/CardEvent.vue
@@ -3,7 +3,10 @@
 	SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<section class="event">
+	<section
+		class="event"
+		:class="{ cancelled: event.cancelled }"
+	>
 		<h3>{{ event.name }}</h3>
 		<p v-if=event.host>
 			Host: {{ event.host }}
@@ -36,7 +39,12 @@
 
 		<h4>Timeslots</h4>
 		<ul>
-			<li v-for="slot in event.slots.values()" :key="slot.id">
+			<li
+				v-for="slot in event.slots.values()"
+				:key="slot.id"
+				class="slot"
+				:class="{ cancelled: slot.cancelled }"
+			>
 				{{ formatTime(slot.start) }} - {{ formatTime(slot.end) }}
 				<button
 					v-if="accountStore.valid && event.slots.size > 1"
@@ -91,6 +99,10 @@ async function toggle(type: "event" | "slot", id: number, slotIds?: number[]) {
 	padding: 0.5rem;
 	border-radius: 0.5rem;
 }
+.event.cancelled>*, .slot.cancelled {
+	text-decoration: line-through;
+	color: grey;
+}
 .event h3 {
 	margin: 0;
 }
@@ -98,7 +110,9 @@ async function toggle(type: "event" | "slot", id: number, slotIds?: number[]) {
 	margin-block-start: 0.5rem;
 }
 
-.notice {
+.event .notice {
+	text-decoration: none;
+	color: CanvasText;
 	display: flex;
 	width: fit-content;
 	gap: 0.5rem;
diff --git a/components/CardEventSlot.vue b/components/CardEventSlot.vue
index 87c9f20..baecbb5 100644
--- a/components/CardEventSlot.vue
+++ b/components/CardEventSlot.vue
@@ -3,7 +3,10 @@
 	SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<section class="eventSlot">
+	<section
+		class="eventSlot"
+		:class="{ cancelled: slot.cancelled || event?.cancelled }"
+	>
 		<hgroup>
 			<h3>{{ event?.name }}</h3>
 			<p>
@@ -75,6 +78,10 @@ function formatTime(time: DateTime) {
 	padding: 0.5rem;
 	border-radius: 0.5rem;
 }
+.eventSlot.cancelled>* {
+	text-decoration: line-through;
+	color: grey;
+}
 .eventSlot h3 {
 	margin: 0;
 }
@@ -82,7 +89,9 @@ function formatTime(time: DateTime) {
 	margin-block-start: 0.5rem;
 }
 
-.notice {
+.eventSlot .notice {
+	text-decoration: none;
+	color: CanvasText;
 	display: flex;
 	width: fit-content;
 	gap: 0.5rem;
diff --git a/components/DiffScheduleEvent.vue b/components/DiffScheduleEvent.vue
index 6cf081e..959f133 100644
--- a/components/DiffScheduleEvent.vue
+++ b/components/DiffScheduleEvent.vue
@@ -29,6 +29,12 @@
 			:after='event.crew ? "No" : "Yes"'
 			:state
 		/>
+		<DiffFieldString
+			title="Cancelled"
+			:before='event.serverCancelled ? "Yes" : "No"'
+			:after='event.cancelled ? "Yes" : "No"'
+			:state
+		/>
 		<DiffFieldString
 			title="Notice"
 			:before="event.serverNotice"
diff --git a/components/DiffScheduleEventSlot.vue b/components/DiffScheduleEventSlot.vue
index f50b92a..d42df5b 100644
--- a/components/DiffScheduleEventSlot.vue
+++ b/components/DiffScheduleEventSlot.vue
@@ -24,6 +24,12 @@
 			:entities="schedule.locations"
 			:state
 		/>
+		<DiffFieldString
+			title="Cancelled"
+			:before='slot.serverCancelled ? "Yes" : "No"'
+			:after='slot.cancelled ? "Yes" : "No"'
+			:state
+		/>
 		<DiffFieldSetEntityId
 			title="Assigned"
 			:before="slot.serverAssigned"
diff --git a/components/TableScheduleEventSlots.vue b/components/TableScheduleEventSlots.vue
index 9699f79..f692100 100644
--- a/components/TableScheduleEventSlots.vue
+++ b/components/TableScheduleEventSlots.vue
@@ -12,6 +12,7 @@
 					<th>duration</th>
 					<th>event</th>
 					<th>location</th>
+					<th title="cancelled">c</th>
 					<th>assigned</th>
 					<th v-if="edit"></th>
 				</tr>
@@ -50,6 +51,7 @@
 								/>
 							</td>
 							<td></td>
+							<td></td>
 							<td>
 								Add at
 								<button
@@ -97,6 +99,11 @@
 									v-model="es.slot.locationIds"
 								/>
 							</td>
+							<td>
+								<input
+									type="checkbox"
+									v-model="es.slot.cancelled">
+							</td>
 							<td>
 								<SelectMultiEntity
 									:entities="usersStore.users"
@@ -149,6 +156,7 @@
 							/>
 						</td>
 						<td></td>
+						<td></td>
 						<td colspan="2">
 							<button
 								type="button"
@@ -177,6 +185,7 @@
 							<td>{{ es.end.diff(es.start).toFormat('hh:mm') }}</td>
 							<td>{{ es.event?.name }}</td>
 							<td></td>
+							<td>{{ es.slot.cancelled ? "x" : undefined }}</td>
 							<td><AssignedCrew :modelValue="es.slot.assigned" :edit="false" /></td>
 						</template>
 					</tr>
diff --git a/components/TableScheduleEvents.vue b/components/TableScheduleEvents.vue
index caf3e48..21bfda8 100644
--- a/components/TableScheduleEvents.vue
+++ b/components/TableScheduleEvents.vue
@@ -14,6 +14,7 @@
 					<th>notice</th>
 					<th>description</th>
 					<th>p</th>
+					<th title="cancelled">c</th>
 					<th>s</th>
 					<th v-if="edit"></th>
 				</tr>
@@ -69,6 +70,13 @@
 								@change="event.crew = !event.crew"
 							>
 						</td>
+						<td>
+							<input
+								type="checkbox"
+								:disabled="!canEdit(event)"
+								v-model="event.cancelled"
+							>
+						</td>
 						<td>{{ event.slots.size ? event.slots.size : "" }}</td>
 						<td>
 							<button
@@ -123,6 +131,7 @@
 							>
 						</td>
 						<td></td>
+						<td></td>
 						<td>
 							<button
 								v-if="eventExists(newEventName)"
diff --git a/components/Timetable.vue b/components/Timetable.vue
index 86e4af9..c73ae80 100644
--- a/components/Timetable.vue
+++ b/components/Timetable.vue
@@ -102,7 +102,11 @@
 							v-for="cell, index in row"
 							:key="index"
 							:colSpan="cell.span"
-							:class='{"event": cell.slot, "crew": cell.event?.crew }'
+							:class="{
+								event: cell.slot,
+								crew: cell.event?.crew,
+								cancelled: cell.event?.cancelled || cell.slot?.cancelled,
+							}"
 							:title="cell.event?.name"
 						>
 							{{ cell.event?.notice ? "⚠️" : undefined }}
@@ -791,4 +795,9 @@ tr.hours>th + th.dayShift div {
 .event.crew {
 	background-color: color-mix(in oklab, var(--background), rgb(127, 127, 127) 60%);
 }
+
+.event.cancelled {
+	color: color-mix(in oklab, CanvasText, rgb(127, 127, 127) 80%);
+	text-decoration: line-through;
+}
 </style>

From 1826529bc8146d73417675c7e26ed9827a2c990c Mon Sep 17 00:00:00 2001
From: Hornwitser <code@hornwitser.no>
Date: Sun, 21 Sep 2025 23:20:48 +0200
Subject: [PATCH 4/4] Mark /api/events endpoint as uncachable

The content of the events stream is generated live in response to
changes done in the system as they occur.  It therefore can't be
meaningfully cached or stored in any way.  Mark the response as
uncacheable to prevent potential problems with caches.
---
 server/api/events.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/api/events.ts b/server/api/events.ts
index 4415550..ca3d1a3 100644
--- a/server/api/events.ts
+++ b/server/api/events.ts
@@ -43,6 +43,7 @@ export default defineEventHandler(async (event) => {
 	// Workaround to properly handle stream errors. See https://github.com/unjs/h3/issues/986
 	setHeader(event, "Access-Control-Allow-Origin", "*");
 	setHeader(event, "Content-Type", "text/event-stream");
+	setHeader(event, "Cache-Control", "no-store");
 	pipeline(stream as unknown as NodeJS.ReadableStream, event.node.res, (err) => { /* ignore */ });
 	event._handled = true;
 });