From 082af50c2bccc27659a90b19f589802af57f670f Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Thu, 19 Feb 2026 08:35:18 +1300
Subject: [PATCH] Improved CC

---
 .../src/lib/api/youtubejs/subscriptions.ts    |  4 +-
 .../components/player/ClosedCaptions.svelte   | 51 ++++++++++---------
 .../thumbnail/VideoThumbnail.svelte           |  4 +-
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/materialious/src/lib/api/youtubejs/subscriptions.ts b/materialious/src/lib/api/youtubejs/subscriptions.ts
index 97407631..7853634e 100644
--- a/materialious/src/lib/api/youtubejs/subscriptions.ts
+++ b/materialious/src/lib/api/youtubejs/subscriptions.ts
@@ -80,8 +80,8 @@ export async function parseChannelRSS(channelId: string): Promise<void> {
 		const publishedAt = new Date(
 			entry.getElementsByTagName('published')[0]?.textContent || new Date()
 		);
-		const published = publishedAt.getTime();
-		const publishedText = relativeTimestamp(published, false);
+		const published = publishedAt.getTime() / 1000;
+		const publishedText = relativeTimestamp(published * 1000, false);
 		channelName =
 			entry.getElementsByTagName('author')[0]?.getElementsByTagName('name')[0]?.textContent ||
 			'Unknown Author';
diff --git a/materialious/src/lib/components/player/ClosedCaptions.svelte b/materialious/src/lib/components/player/ClosedCaptions.svelte
index 00d2fd8c..37e8c00c 100644
--- a/materialious/src/lib/components/player/ClosedCaptions.svelte
+++ b/materialious/src/lib/components/player/ClosedCaptions.svelte
@@ -2,7 +2,7 @@
 	let trackVisible: boolean = $state(false);
 	let captionsCues: VTTCue[] = $state([]);
 
-	const captionTracks: Record<string, string> = {};
+	let captionTracks: Record<string, string> = {};
 
 	export function setTextTrackVisibility(visible: boolean) {
 		trackVisible = visible;
@@ -25,7 +25,6 @@
 
 <script lang="ts">
 	import type { VideoPlay } from '$lib/api/model';
-	import { findElementForTime } from '$lib/misc';
 	import { onDestroy, onMount } from 'svelte';
 	import { addToast } from '../Toast.svelte';
 	import { parseText, renderVTTCueString, type VTTCue } from 'media-captions';
@@ -44,8 +43,6 @@
 	let captionElement: HTMLElement | undefined = $state();
 	let captionContainerHeight: number = $state(0);
 
-	let currentCaption: VTTCue | null = $state(null);
-
 	function updateCaptionHeight() {
 		if (captionElement) {
 			captionContainerHeight = captionElement.offsetHeight;
@@ -54,13 +51,6 @@
 
 	$effect(() => {
 		updateCaptionHeight();
-
-		currentCaption = findElementForTime(
-			captionsCues,
-			currentTime,
-			(cue: VTTCue) => cue.startTime,
-			(cue: VTTCue) => cue.endTime
-		);
 	});
 
 	onMount(async () => {
@@ -79,27 +69,34 @@
 
 	onDestroy(() => {
 		window.removeEventListener('resize', updateCaptionHeight);
+
+		captionTracks = {};
+		captionsCues = [];
+		trackVisible = false;
 	});
 </script>
 
 {#if trackVisible && captionsCues.length > 0}
-	{#if currentCaption}
-		<div
-			class="caption-container"
-			bind:this={captionElement}
-			style:top={`calc(${showControls ? 'var(--video-player-height) * 0.85' : 'var(--video-player-height) * 0.98'} - ${captionContainerHeight}px)`}
-		>
-			{#if currentCaption}
-				<p>
-					<!-- eslint-disable-next-line svelte/no-at-html-tags -->
-					{@html renderVTTCueString(currentCaption, currentTime)}
-				</p>
-			{/if}
-		</div>
-	{/if}
+	<div
+		class="caption-container"
+		bind:this={captionElement}
+		style:top={`calc(${showControls ? 'var(--video-player-height) * var(--top-percentage-controls-shown)' : 'var(--video-player-height) * var(--top-percentage-controls-hidden)'} - ${captionContainerHeight}px)`}
+	>
+		{#each captionsCues as cue (cue)}
+			<p class:hide={currentTime <= cue.startTime || currentTime >= cue.endTime}>
+				<!-- eslint-disable-next-line svelte/no-at-html-tags -->
+				{@html renderVTTCueString(cue, currentTime)}
+			</p>
+		{/each}
+	</div>
 {/if}
 
 <style>
+	:root {
+		--top-percentage-controls-shown: 0.85;
+		--top-percentage-controls-hidden: 0.98;
+	}
+
 	.caption-container {
 		position: absolute;
 		z-index: 5;
@@ -118,6 +115,10 @@
 	}
 
 	@media screen and (max-width: 1000px) {
+		:root {
+			--top-percentage-controls-shown: 0;
+		}
+
 		.caption-container {
 			width: 100%;
 		}
diff --git a/materialious/src/lib/components/thumbnail/VideoThumbnail.svelte b/materialious/src/lib/components/thumbnail/VideoThumbnail.svelte
index 068dbe5c..f832fb99 100644
--- a/materialious/src/lib/components/thumbnail/VideoThumbnail.svelte
+++ b/materialious/src/lib/components/thumbnail/VideoThumbnail.svelte
@@ -251,8 +251,8 @@
 					<div class="max">
 						{video.viewCountText ?? cleanNumber(video.viewCount ?? 0)}
 						•
-						{isYTBackend() && video.published !== 0
-							? relativeTimestamp(video.published, false)
+						{video.published && video.published !== 0
+							? relativeTimestamp(video.published * 1000, false)
 							: video.publishedText}
 					</div>
 				{/if}