From ef06feecaefc7b4a7345eb875868dc40e519a52a Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Mon, 13 May 2024 14:11:53 +1200
Subject: [PATCH 01/11] Fix player resuming on page change

---
 materialious/src/lib/Player.svelte | 15 ---------------
 update_versions.py                 |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/materialious/src/lib/Player.svelte b/materialious/src/lib/Player.svelte
index 918609f2..766db85b 100644
--- a/materialious/src/lib/Player.svelte
+++ b/materialious/src/lib/Player.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
 	import 'vidstack/bundle';
 
-	import { App } from '@capacitor/app';
 	import { SponsorBlock, type Category } from 'sponsorblock-api';
 	import { onDestroy, onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
@@ -13,7 +12,6 @@
 		instanceStore,
 		miniPlayerSrcStore,
 		playerAlwaysLoopStore,
-		playerAndroidBackgroundPlayStore,
 		playerAutoPlayStore,
 		playerDashStore,
 		playerProxyVideosStore,
@@ -250,19 +248,6 @@
 		player.destroy();
 		playerPosSet = false;
 	});
-
-	// Background play for Android.
-	App.addListener('appStateChange', (state) => {
-		// Very much backwards logic, but for whatever reason
-		// Calling play() within a conditional breaks background play.
-		// Maybe a race condition.
-
-		player.play();
-
-		if (!get(playerAndroidBackgroundPlayStore)) {
-			player.pause();
-		}
-	});
 </script>
 
 {#if audioMode}
diff --git a/update_versions.py b/update_versions.py
index f07e908a..ac261db8 100644
--- a/update_versions.py
+++ b/update_versions.py
@@ -5,7 +5,7 @@ import json
 import os
 import re
 
-LATEST_VERSION = "1.0.8"
+LATEST_VERSION = "1.0.9"
 WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")
 
 ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")

From ee5a245315b248ef9866c3c503b7de9d4f38bdb4 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Mon, 13 May 2024 14:17:33 +1200
Subject: [PATCH 02/11] Show likes if RYD is disabled

---
 materialious/src/routes/watch/[slug]/+page.svelte | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/materialious/src/routes/watch/[slug]/+page.svelte b/materialious/src/routes/watch/[slug]/+page.svelte
index 35f5c689..407d9d9f 100644
--- a/materialious/src/routes/watch/[slug]/+page.svelte
+++ b/materialious/src/routes/watch/[slug]/+page.svelte
@@ -461,6 +461,11 @@
 								<span>{cleanNumber(returnYTDislikes.dislikes)}</span>
 							</button>
 						</nav>
+					{:else}
+						<button style="cursor: default;" class="border">
+							<i class="small">thumb_up</i>
+							<span>{cleanNumber(data.video.likeCount)}</span>
+						</button>
 					{/if}
 				{/await}
 

From 96a1b64a4d272f92563b07af9cea15b108a29a21 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Mon, 13 May 2024 14:19:12 +1200
Subject: [PATCH 03/11] Dont allow empty search

---
 materialious/src/lib/Search.svelte | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/materialious/src/lib/Search.svelte b/materialious/src/lib/Search.svelte
index e50b8262..f6f4104e 100644
--- a/materialious/src/lib/Search.svelte
+++ b/materialious/src/lib/Search.svelte
@@ -32,6 +32,8 @@
 	}
 
 	function handleSubmit() {
+		if (search.trim() === '') return;
+
 		selectedSuggestionIndex = -1;
 		goto(`/search/${encodeURIComponent(search)}`);
 		dispatch('searchSubmitted');

From 78f5fc47fd84c685644d58c4847c98ace7b3fa1a Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Mon, 13 May 2024 14:22:51 +1200
Subject: [PATCH 04/11] Added ability to hide replies after expanded

---
 materialious/src/lib/Comment.svelte       | 7 ++++++-
 materialious/src/lib/i18n/locales/en.json | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/materialious/src/lib/Comment.svelte b/materialious/src/lib/Comment.svelte
index 53ec8c79..8ca4a2bb 100644
--- a/materialious/src/lib/Comment.svelte
+++ b/materialious/src/lib/Comment.svelte
@@ -7,7 +7,7 @@
 	export let comment: Comment;
 	export let videoId: string;
 
-	let replies: Comments;
+	let replies: Comments | undefined = undefined;
 
 	async function loadReplies(continuation: string) {
 		try {
@@ -75,6 +75,11 @@
 				<i class="primary-text">expand_more</i>
 				<span class="primary-text">{comment.replies.replyCount} {$_('replies')}</span>
 			</button>
+		{:else if replies}
+			<button on:click={() => (replies = undefined)} class="transparent replies">
+				<i class="primary-text">expand_less</i>
+				<span class="primary-text">{$_('hideReplies')}</span>
+			</button>
 		{/if}
 	</div>
 </div>
diff --git a/materialious/src/lib/i18n/locales/en.json b/materialious/src/lib/i18n/locales/en.json
index 84151168..052f780e 100644
--- a/materialious/src/lib/i18n/locales/en.json
+++ b/materialious/src/lib/i18n/locales/en.json
@@ -12,6 +12,7 @@
 	"deleteAllHistory": "Delete all history",
 	"skipping": "Skipping",
 	"replies": "replies",
+	"hideReplies": "Hide replies",
 	"hideVideo": "Hide video",
 	"syncParty": {
 		"userJoined": "User joined your watch party.",

From 3fe156e87e99de929dbc4e3eb52269d260ffa961 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Mon, 13 May 2024 14:27:44 +1200
Subject: [PATCH 05/11] Fixed thumbnail scaling

---
 materialious/src/lib/Thumbnail.svelte | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/materialious/src/lib/Thumbnail.svelte b/materialious/src/lib/Thumbnail.svelte
index 3cea88e4..3f2cc3e4 100644
--- a/materialious/src/lib/Thumbnail.svelte
+++ b/materialious/src/lib/Thumbnail.svelte
@@ -238,12 +238,7 @@
 						</video>
 					</div>
 				{:else}
-					<img
-						class="responsive"
-						style="max-width: 100%;min-height: 160px;"
-						src={img.src}
-						alt="Thumbnail for video"
-					/>
+					<img class="responsive" src={img.src} alt="Thumbnail for video" />
 				{/if}
 			{:else}
 				<p>{$_('thumbnail.failedToLoadImage')}</p>
@@ -339,6 +334,10 @@
 		max-height: 160px;
 	}
 
+	.thumbnail img {
+		object-fit: contain;
+	}
+
 	@media screen and (max-width: 650px) {
 		.thumbnail {
 			max-height: 100%;

From 1db7e37dbbcd66ea652e867e74ec597289c3eb18 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Mon, 13 May 2024 14:31:39 +1200
Subject: [PATCH 06/11] Header home link

---
 materialious/src/routes/+layout.svelte | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/materialious/src/routes/+layout.svelte b/materialious/src/routes/+layout.svelte
index 086f5394..352e4045 100644
--- a/materialious/src/routes/+layout.svelte
+++ b/materialious/src/routes/+layout.svelte
@@ -191,8 +191,10 @@
 		><i>menu</i></button
 	>
 
-	<Logo classes="m l" />
-	<h6 class="l">Materialious</h6>
+	<nav on:click={() => goto('/')} style="cursor: pointer;" class="m l">
+		<Logo />
+		<h6 class="l">Materialious</h6>
+	</nav>
 
 	<div class="max m l"></div>
 
@@ -271,7 +273,7 @@
 
 <dialog class="left small" id="menu-expanded">
 	<header class="fixed">
-		<nav>
+		<nav on:click={() => goto('/')} style="cursor: pointer;">
 			<button class="transparent circle large" data-ui="#menu-expanded"><i>menu</i></button>
 			<div style="width: 20%;">
 				<Logo />

From 116ce3cb82f5356bf90161b7761bf7de3a075d8a Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Mon, 13 May 2024 14:33:40 +1200
Subject: [PATCH 07/11] Minor fix to sub management

---
 materialious/src/routes/subscriptions/manage/+page.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/materialious/src/routes/subscriptions/manage/+page.svelte b/materialious/src/routes/subscriptions/manage/+page.svelte
index 7e650e48..380c1ac0 100644
--- a/materialious/src/routes/subscriptions/manage/+page.svelte
+++ b/materialious/src/routes/subscriptions/manage/+page.svelte
@@ -48,11 +48,12 @@
 {#each subscriptions as sub}
 	<article>
 		<nav>
-			<a href={`/channel/${sub.authorId}`} style="flex: 1;"
+			<a href={`/channel/${sub.authorId}`}
 				><h6>
 					{sub.author}
 				</h6></a
 			>
+			<div class="max"></div>
 			<button on:click={async () => unsubscribe(sub.authorId)} class="border">Unsubscribe</button>
 		</nav>
 	</article>

From cbbf4e8fc6622fc517ef808f06ef8e0fba74adc0 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Mon, 13 May 2024 14:59:31 +1200
Subject: [PATCH 08/11] Updated store location

---
 materialious/src/lib/Api/index.ts             |  2 +-
 materialious/src/lib/MiniPlayer.svelte        |  2 +-
 materialious/src/lib/Player.svelte            |  8 +++----
 materialious/src/lib/Search.svelte            |  2 +-
 materialious/src/lib/Settings.svelte          |  4 ++--
 materialious/src/lib/SyncParty.svelte         |  2 +-
 materialious/src/lib/Thumbnail.svelte         | 12 +++++-----
 materialious/src/lib/VideoList.svelte         |  2 +-
 materialious/src/lib/externalSettings.ts      |  4 ++--
 materialious/src/lib/misc.ts                  |  2 +-
 materialious/src/{ => lib}/store.ts           |  0
 .../routes/(no-layout)/embed/[slug]/+page.ts  | 23 +++++++++++++++++++
 .../(no-layout)/embed/[slug]/+page@.svelte    | 11 +++++++++
 materialious/src/routes/+error.svelte         |  2 +-
 materialious/src/routes/+layout.svelte        | 16 ++++++-------
 materialious/src/routes/+page.svelte          |  2 +-
 .../routes/subscriptions/manage/+page.svelte  |  2 +-
 materialious/src/routes/watch/[slug]/+page.ts |  6 ++---
 18 files changed, 68 insertions(+), 34 deletions(-)
 rename materialious/src/{ => lib}/store.ts (100%)
 create mode 100644 materialious/src/routes/(no-layout)/embed/[slug]/+page.ts
 create mode 100644 materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte

diff --git a/materialious/src/lib/Api/index.ts b/materialious/src/lib/Api/index.ts
index 8dbfd5d3..943c961b 100644
--- a/materialious/src/lib/Api/index.ts
+++ b/materialious/src/lib/Api/index.ts
@@ -6,7 +6,7 @@ import {
 	instanceStore,
 	returnYTDislikesInstanceStore,
 	synciousInstanceStore
-} from '../../store';
+} from '../store';
 import type {
 	Channel,
 	ChannelContentPlaylists,
diff --git a/materialious/src/lib/MiniPlayer.svelte b/materialious/src/lib/MiniPlayer.svelte
index 62eba32f..d60adcfd 100644
--- a/materialious/src/lib/MiniPlayer.svelte
+++ b/materialious/src/lib/MiniPlayer.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
 	import { get } from 'svelte/store';
-	import { miniPlayerSrcStore, playerProxyVideosStore } from '../store';
 	import { proxyVideoUrl } from './misc';
+	import { miniPlayerSrcStore, playerProxyVideosStore } from './store';
 
 	let currentTime: number = 0;
 
diff --git a/materialious/src/lib/Player.svelte b/materialious/src/lib/Player.svelte
index 766db85b..3c53c262 100644
--- a/materialious/src/lib/Player.svelte
+++ b/materialious/src/lib/Player.svelte
@@ -7,6 +7,9 @@
 	import { get } from 'svelte/store';
 	import type { MediaTimeUpdateEvent, PlayerSrc, VideoSrc } from 'vidstack';
 	import type { MediaPlayerElement } from 'vidstack/elements';
+	import { deleteVideoProgress, getVideoProgress, saveVideoProgress } from './Api';
+	import type { VideoPlay } from './Api/model';
+	import { getBestThumbnail, proxyVideoUrl, videoLength, type PhasedDescription } from './misc';
 	import {
 		authStore,
 		instanceStore,
@@ -19,10 +22,7 @@
 		sponsorBlockCategoriesStore,
 		sponsorBlockUrlStore,
 		synciousStore
-	} from '../store';
-	import { deleteVideoProgress, getVideoProgress, saveVideoProgress } from './Api';
-	import type { VideoPlay } from './Api/model';
-	import { getBestThumbnail, proxyVideoUrl, videoLength, type PhasedDescription } from './misc';
+	} from './store';
 	import { getDynamicTheme } from './theme';
 
 	export let data: { video: VideoPlay; content: PhasedDescription; playlistId: string | null };
diff --git a/materialious/src/lib/Search.svelte b/materialious/src/lib/Search.svelte
index f6f4104e..0b3485a8 100644
--- a/materialious/src/lib/Search.svelte
+++ b/materialious/src/lib/Search.svelte
@@ -3,8 +3,8 @@
 	import Mousetrap from 'mousetrap';
 	import { createEventDispatcher, onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
-	import { interfaceSearchSuggestionsStore } from '../store';
 	import { getSearchSuggestions } from './Api';
+	import { interfaceSearchSuggestionsStore } from './store';
 
 	const dispatch = createEventDispatcher();
 
diff --git a/materialious/src/lib/Settings.svelte b/materialious/src/lib/Settings.svelte
index e8b9363e..86d7d20d 100644
--- a/materialious/src/lib/Settings.svelte
+++ b/materialious/src/lib/Settings.svelte
@@ -3,6 +3,7 @@
 	import { Capacitor } from '@capacitor/core';
 	import { _ } from 'svelte-i18n';
 	import { get } from 'svelte/store';
+	import { ensureNoTrailingSlash } from './misc';
 	import {
 		authStore,
 		darkModeStore,
@@ -30,8 +31,7 @@
 		synciousInstanceStore,
 		synciousStore,
 		themeColorStore
-	} from '../store';
-	import { ensureNoTrailingSlash } from './misc';
+	} from './store';
 
 	let sponsorCategoriesList: string[] = [];
 	sponsorBlockCategoriesStore.subscribe((value) => (sponsorCategoriesList = value));
diff --git a/materialious/src/lib/SyncParty.svelte b/materialious/src/lib/SyncParty.svelte
index 7db3f1bb..0e791d16 100644
--- a/materialious/src/lib/SyncParty.svelte
+++ b/materialious/src/lib/SyncParty.svelte
@@ -7,7 +7,7 @@
 	import { onDestroy, onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
 	import { get } from 'svelte/store';
-	import { syncPartyConnectionsStore, syncPartyPeerStore } from '../store';
+	import { syncPartyConnectionsStore, syncPartyPeerStore } from './store';
 
 	function changeVideoEvent(conn: DataConnection) {
 		conn.on('data', (data) => {
diff --git a/materialious/src/lib/Thumbnail.svelte b/materialious/src/lib/Thumbnail.svelte
index 3f2cc3e4..9a1a5dc1 100644
--- a/materialious/src/lib/Thumbnail.svelte
+++ b/materialious/src/lib/Thumbnail.svelte
@@ -2,6 +2,11 @@
 	import { createEventDispatcher, onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
 	import { get } from 'svelte/store';
+	import { getDeArrow, getThumbnail, getVideo, getVideoProgress } from './Api';
+	import type { Notification, PlaylistPageVideo, Video, VideoBase, VideoPlay } from './Api/model';
+	import ShareVideo from './ShareVideo.svelte';
+	import { cleanNumber, getBestThumbnail, proxyVideoUrl, videoLength } from './misc';
+	import type { PlayerEvents } from './player';
 	import {
 		authStore,
 		deArrowEnabledStore,
@@ -11,12 +16,7 @@
 		syncPartyConnectionsStore,
 		syncPartyPeerStore,
 		synciousStore
-	} from '../store';
-	import { getDeArrow, getThumbnail, getVideo, getVideoProgress } from './Api';
-	import type { Notification, PlaylistPageVideo, Video, VideoBase, VideoPlay } from './Api/model';
-	import ShareVideo from './ShareVideo.svelte';
-	import { cleanNumber, getBestThumbnail, proxyVideoUrl, videoLength } from './misc';
-	import type { PlayerEvents } from './player';
+	} from './store';
 
 	const dispatch = createEventDispatcher();
 
diff --git a/materialious/src/lib/VideoList.svelte b/materialious/src/lib/VideoList.svelte
index f84bd895..497c96fd 100644
--- a/materialious/src/lib/VideoList.svelte
+++ b/materialious/src/lib/VideoList.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
 	import { _ } from 'svelte-i18n';
 	import { get } from 'svelte/store';
-	import { authStore } from '../store';
 	import { removePlaylistVideo } from './Api';
 	import type { Notification, PlaylistPageVideo, Video, VideoBase } from './Api/model';
 	import Thumbnail from './Thumbnail.svelte';
+	import { authStore } from './store';
 
 	export let videos: VideoBase[] | Video[] | Notification[] | PlaylistPageVideo[] = [];
 	export let oneItemPerRow: boolean = false;
diff --git a/materialious/src/lib/externalSettings.ts b/materialious/src/lib/externalSettings.ts
index 20a693db..18907f83 100644
--- a/materialious/src/lib/externalSettings.ts
+++ b/materialious/src/lib/externalSettings.ts
@@ -1,5 +1,4 @@
 import { page } from '$app/stores';
-import { get } from 'svelte/store';
 import {
 	darkModeStore,
 	deArrowEnabledStore,
@@ -24,7 +23,8 @@ import {
 	synciousInstanceStore,
 	synciousStore,
 	themeColorStore
-} from '../store';
+} from '$lib/store';
+import { get } from 'svelte/store';
 
 const persistedStores = [
 	{
diff --git a/materialious/src/lib/misc.ts b/materialious/src/lib/misc.ts
index a9a1cbdc..bdc4cc2e 100644
--- a/materialious/src/lib/misc.ts
+++ b/materialious/src/lib/misc.ts
@@ -3,8 +3,8 @@ import { page } from '$app/stores';
 import humanNumber from 'human-number';
 import type Peer from 'peerjs';
 import { get } from 'svelte/store';
-import { instanceStore } from '../store';
 import type { Image } from './Api/model';
+import { instanceStore } from './store';
 
 export function truncate(value: string, maxLength: number = 50): string {
 	return value.length > maxLength ? `${value.substring(0, maxLength)}...` : value;
diff --git a/materialious/src/store.ts b/materialious/src/lib/store.ts
similarity index 100%
rename from materialious/src/store.ts
rename to materialious/src/lib/store.ts
diff --git a/materialious/src/routes/(no-layout)/embed/[slug]/+page.ts b/materialious/src/routes/(no-layout)/embed/[slug]/+page.ts
new file mode 100644
index 00000000..630d96ba
--- /dev/null
+++ b/materialious/src/routes/(no-layout)/embed/[slug]/+page.ts
@@ -0,0 +1,23 @@
+import { getVideo } from '$lib/Api/index.js';
+import { error } from '@sveltejs/kit';
+import { get } from 'svelte/store';
+import type { PhasedDescription } from '../../../../lib/misc.js';
+import { playerProxyVideosStore } from '../../../../lib/store.js';
+
+export async function load({ params }) {
+  let video;
+  try {
+    video = await getVideo(params.slug, get(playerProxyVideosStore));
+  } catch (errorMessage: any) {
+    error(500, errorMessage);
+  }
+
+  return {
+    video: video,
+    content: {
+      description: '',
+      timestamps: []
+    } as PhasedDescription,
+    playlistId: null
+  };
+}
\ No newline at end of file
diff --git a/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte b/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte
new file mode 100644
index 00000000..b131bcb2
--- /dev/null
+++ b/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte
@@ -0,0 +1,11 @@
+<script lang="ts">
+	import Player from '$lib/Player.svelte';
+	import type { MediaPlayerElement } from 'vidstack/elements';
+
+	export let data;
+	export let layout = false;
+
+	let player: MediaPlayerElement;
+</script>
+
+<Player bind:player {data} />
diff --git a/materialious/src/routes/+error.svelte b/materialious/src/routes/+error.svelte
index 5c56f4cd..82d91538 100644
--- a/materialious/src/routes/+error.svelte
+++ b/materialious/src/routes/+error.svelte
@@ -1,6 +1,6 @@
 <script src="ts">
 	import { page } from '$app/stores';
-	import { activePageStore } from '../store';
+	import { activePageStore } from '$lib/store';
 
 	activePageStore.set(null);
 </script>
diff --git a/materialious/src/routes/+layout.svelte b/materialious/src/routes/+layout.svelte
index 352e4045..72008f05 100644
--- a/materialious/src/routes/+layout.svelte
+++ b/materialious/src/routes/+layout.svelte
@@ -11,6 +11,14 @@
 	import SyncParty from '$lib/SyncParty.svelte';
 	import Thumbnail from '$lib/Thumbnail.svelte';
 	import { bookmarkletLoadFromUrl, loadSettingsFromEnv } from '$lib/externalSettings';
+	import {
+		activePageStore,
+		authStore,
+		darkModeStore,
+		instanceStore,
+		syncPartyPeerStore,
+		themeColorStore
+	} from '$lib/store';
 	import { App } from '@capacitor/app';
 	import { Browser } from '@capacitor/browser';
 	import { Capacitor } from '@capacitor/core';
@@ -20,14 +28,6 @@
 	import { _ } from 'svelte-i18n';
 	import { get } from 'svelte/store';
 	import { pwaInfo } from 'virtual:pwa-info';
-	import {
-		activePageStore,
-		authStore,
-		darkModeStore,
-		instanceStore,
-		syncPartyPeerStore,
-		themeColorStore
-	} from '../store';
 
 	let mobileSearchShow = false;
 
diff --git a/materialious/src/routes/+page.svelte b/materialious/src/routes/+page.svelte
index f36d73da..093f5af1 100644
--- a/materialious/src/routes/+page.svelte
+++ b/materialious/src/routes/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import VideoList from '$lib/VideoList.svelte';
-	import { activePageStore } from '../store';
+	import { activePageStore } from '$lib/store';
 
 	export let data;
 
diff --git a/materialious/src/routes/subscriptions/manage/+page.svelte b/materialious/src/routes/subscriptions/manage/+page.svelte
index 380c1ac0..58ad1d37 100644
--- a/materialious/src/routes/subscriptions/manage/+page.svelte
+++ b/materialious/src/routes/subscriptions/manage/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { deleteUnsubscribe } from '$lib/Api';
+	import { activePageStore } from '$lib/store';
 	import Fuse from 'fuse.js';
 	import { _ } from 'svelte-i18n';
-	import { activePageStore } from '../../../store';
 
 	activePageStore.set(null);
 
diff --git a/materialious/src/routes/watch/[slug]/+page.ts b/materialious/src/routes/watch/[slug]/+page.ts
index 21451daa..a6abf69c 100644
--- a/materialious/src/routes/watch/[slug]/+page.ts
+++ b/materialious/src/routes/watch/[slug]/+page.ts
@@ -7,14 +7,14 @@ import {
 	postHistory
 } from '$lib/Api/index.js';
 import { phaseDescription } from '$lib/misc';
-import { error } from '@sveltejs/kit';
-import { get } from 'svelte/store';
 import {
 	authStore,
 	playerProxyVideosStore,
 	returnYTDislikesInstanceStore,
 	returnYtDislikesStore
-} from '../../../store';
+} from '$lib/store';
+import { error } from '@sveltejs/kit';
+import { get } from 'svelte/store';
 
 export async function load({ params, url }) {
 	let video;

From 06f02a66aafdc50e84be01a8e20c088f5da60170 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Mon, 13 May 2024 15:03:54 +1200
Subject: [PATCH 09/11] Added embed support

---
 materialious/src/lib/Player.svelte                | 15 +++++++++------
 materialious/src/routes/{ => (app)}/+error.svelte |  0
 .../src/routes/{ => (app)}/+layout.svelte         |  0
 materialious/src/routes/{ => (app)}/+page.svelte  |  0
 materialious/src/routes/{ => (app)}/+page.ts      |  0
 .../src/routes/{ => (app)}/auth/+page.svelte      |  2 +-
 materialious/src/routes/{ => (app)}/auth/+page.ts |  0
 .../{ => (app)}/channel/[slug]/+page.svelte       |  2 +-
 .../routes/{ => (app)}/channel/[slug]/+page.ts    |  0
 .../src/routes/{ => (app)}/history/+page.svelte   |  2 +-
 .../src/routes/{ => (app)}/playlist/+page.ts      |  0
 .../{ => (app)}/playlist/[slug]/+page.svelte      |  2 +-
 .../routes/{ => (app)}/playlist/[slug]/+page.ts   |  0
 .../src/routes/{ => (app)}/playlists/+page.svelte |  2 +-
 .../src/routes/{ => (app)}/playlists/+page.ts     |  0
 .../routes/{ => (app)}/search/[slug]/+page.svelte |  2 +-
 .../src/routes/{ => (app)}/search/[slug]/+page.ts |  0
 .../routes/{ => (app)}/subscriptions/+page.svelte |  2 +-
 .../src/routes/{ => (app)}/subscriptions/+page.ts |  0
 .../{ => (app)}/subscriptions/manage/+page.svelte |  0
 .../{ => (app)}/subscriptions/manage/+page.ts     |  0
 .../src/routes/{ => (app)}/trending/+page.svelte  |  2 +-
 .../src/routes/{ => (app)}/trending/+page.ts      |  0
 .../src/routes/{ => (app)}/watch/+page.ts         |  0
 .../routes/{ => (app)}/watch/[slug]/+page.svelte  | 12 ++++++------
 .../src/routes/{ => (app)}/watch/[slug]/+page.ts  |  0
 .../routes/(no-layout)/embed/[slug]/+page@.svelte |  2 +-
 27 files changed, 24 insertions(+), 21 deletions(-)
 rename materialious/src/routes/{ => (app)}/+error.svelte (100%)
 rename materialious/src/routes/{ => (app)}/+layout.svelte (100%)
 rename materialious/src/routes/{ => (app)}/+page.svelte (100%)
 rename materialious/src/routes/{ => (app)}/+page.ts (100%)
 rename materialious/src/routes/{ => (app)}/auth/+page.svelte (92%)
 rename materialious/src/routes/{ => (app)}/auth/+page.ts (100%)
 rename materialious/src/routes/{ => (app)}/channel/[slug]/+page.svelte (98%)
 rename materialious/src/routes/{ => (app)}/channel/[slug]/+page.ts (100%)
 rename materialious/src/routes/{ => (app)}/history/+page.svelte (96%)
 rename materialious/src/routes/{ => (app)}/playlist/+page.ts (100%)
 rename materialious/src/routes/{ => (app)}/playlist/[slug]/+page.svelte (97%)
 rename materialious/src/routes/{ => (app)}/playlist/[slug]/+page.ts (100%)
 rename materialious/src/routes/{ => (app)}/playlists/+page.svelte (98%)
 rename materialious/src/routes/{ => (app)}/playlists/+page.ts (100%)
 rename materialious/src/routes/{ => (app)}/search/[slug]/+page.svelte (98%)
 rename materialious/src/routes/{ => (app)}/search/[slug]/+page.ts (100%)
 rename materialious/src/routes/{ => (app)}/subscriptions/+page.svelte (95%)
 rename materialious/src/routes/{ => (app)}/subscriptions/+page.ts (100%)
 rename materialious/src/routes/{ => (app)}/subscriptions/manage/+page.svelte (100%)
 rename materialious/src/routes/{ => (app)}/subscriptions/manage/+page.ts (100%)
 rename materialious/src/routes/{ => (app)}/trending/+page.svelte (77%)
 rename materialious/src/routes/{ => (app)}/trending/+page.ts (100%)
 rename materialious/src/routes/{ => (app)}/watch/+page.ts (100%)
 rename materialious/src/routes/{ => (app)}/watch/[slug]/+page.svelte (99%)
 rename materialious/src/routes/{ => (app)}/watch/[slug]/+page.ts (100%)

diff --git a/materialious/src/lib/Player.svelte b/materialious/src/lib/Player.svelte
index 3c53c262..22a883be 100644
--- a/materialious/src/lib/Player.svelte
+++ b/materialious/src/lib/Player.svelte
@@ -29,6 +29,7 @@
 	export let audioMode = false;
 	export let player: MediaPlayerElement;
 	export let isSyncing: boolean = false;
+	export let isEmbed: boolean = false;
 
 	let src: PlayerSrc = [];
 	let categoryBeingSkipped = '';
@@ -279,9 +280,11 @@
 	{/if}
 </media-player>
 
-<div class="snackbar" id="sponsorblock-alert">
-	<span
-		>{$_('skipping')}
-		<span class="bold" style="text-transform: capitalize;">{categoryBeingSkipped}</span></span
-	>
-</div>
+{#if !isEmbed}
+	<div class="snackbar" id="sponsorblock-alert">
+		<span
+			>{$_('skipping')}
+			<span class="bold" style="text-transform: capitalize;">{categoryBeingSkipped}</span></span
+		>
+	</div>
+{/if}
diff --git a/materialious/src/routes/+error.svelte b/materialious/src/routes/(app)/+error.svelte
similarity index 100%
rename from materialious/src/routes/+error.svelte
rename to materialious/src/routes/(app)/+error.svelte
diff --git a/materialious/src/routes/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte
similarity index 100%
rename from materialious/src/routes/+layout.svelte
rename to materialious/src/routes/(app)/+layout.svelte
diff --git a/materialious/src/routes/+page.svelte b/materialious/src/routes/(app)/+page.svelte
similarity index 100%
rename from materialious/src/routes/+page.svelte
rename to materialious/src/routes/(app)/+page.svelte
diff --git a/materialious/src/routes/+page.ts b/materialious/src/routes/(app)/+page.ts
similarity index 100%
rename from materialious/src/routes/+page.ts
rename to materialious/src/routes/(app)/+page.ts
diff --git a/materialious/src/routes/auth/+page.svelte b/materialious/src/routes/(app)/auth/+page.svelte
similarity index 92%
rename from materialious/src/routes/auth/+page.svelte
rename to materialious/src/routes/(app)/auth/+page.svelte
index dc33d769..2b704073 100644
--- a/materialious/src/routes/auth/+page.svelte
+++ b/materialious/src/routes/(app)/auth/+page.svelte
@@ -2,8 +2,8 @@
 	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
 	import PageLoading from '$lib/PageLoading.svelte';
+	import { authStore } from '$lib/store';
 	import { onMount } from 'svelte';
-	import { authStore } from '../../store';
 
 	// Auth response handling for Desktop
 	onMount(() => {
diff --git a/materialious/src/routes/auth/+page.ts b/materialious/src/routes/(app)/auth/+page.ts
similarity index 100%
rename from materialious/src/routes/auth/+page.ts
rename to materialious/src/routes/(app)/auth/+page.ts
diff --git a/materialious/src/routes/channel/[slug]/+page.svelte b/materialious/src/routes/(app)/channel/[slug]/+page.svelte
similarity index 98%
rename from materialious/src/routes/channel/[slug]/+page.svelte
rename to materialious/src/routes/(app)/channel/[slug]/+page.svelte
index e2eb86d1..2bdcde2b 100644
--- a/materialious/src/routes/channel/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/channel/[slug]/+page.svelte
@@ -5,12 +5,12 @@
 	import PlaylistThumbnail from '$lib/PlaylistThumbnail.svelte';
 	import Thumbnail from '$lib/Thumbnail.svelte';
 	import { cleanNumber, getBestThumbnail } from '$lib/misc';
+	import { activePageStore, authStore } from '$lib/store';
 	import { Capacitor } from '@capacitor/core';
 	import { onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
 	import { get } from 'svelte/store';
-	import { activePageStore, authStore } from '../../../store';
 
 	export let data;
 
diff --git a/materialious/src/routes/channel/[slug]/+page.ts b/materialious/src/routes/(app)/channel/[slug]/+page.ts
similarity index 100%
rename from materialious/src/routes/channel/[slug]/+page.ts
rename to materialious/src/routes/(app)/channel/[slug]/+page.ts
diff --git a/materialious/src/routes/history/+page.svelte b/materialious/src/routes/(app)/history/+page.svelte
similarity index 96%
rename from materialious/src/routes/history/+page.svelte
rename to materialious/src/routes/(app)/history/+page.svelte
index eaa5b567..0ebbf88d 100644
--- a/materialious/src/routes/history/+page.svelte
+++ b/materialious/src/routes/(app)/history/+page.svelte
@@ -3,12 +3,12 @@
 	import type { VideoPlay } from '$lib/Api/model';
 	import PageLoading from '$lib/PageLoading.svelte';
 	import VideoList from '$lib/VideoList.svelte';
+	import { activePageStore, synciousStore } from '$lib/store';
 	import { error } from '@sveltejs/kit';
 	import { onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
 	import { get } from 'svelte/store';
-	import { activePageStore, synciousStore } from '../../store';
 
 	activePageStore.set('history');
 
diff --git a/materialious/src/routes/playlist/+page.ts b/materialious/src/routes/(app)/playlist/+page.ts
similarity index 100%
rename from materialious/src/routes/playlist/+page.ts
rename to materialious/src/routes/(app)/playlist/+page.ts
diff --git a/materialious/src/routes/playlist/[slug]/+page.svelte b/materialious/src/routes/(app)/playlist/[slug]/+page.svelte
similarity index 97%
rename from materialious/src/routes/playlist/[slug]/+page.svelte
rename to materialious/src/routes/(app)/playlist/[slug]/+page.svelte
index 578af97f..979fb915 100644
--- a/materialious/src/routes/playlist/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/playlist/[slug]/+page.svelte
@@ -3,10 +3,10 @@
 	import type { PlaylistPageVideo } from '$lib/Api/model.js';
 	import VideoList from '$lib/VideoList.svelte';
 	import { cleanNumber, unsafeRandomItem } from '$lib/misc.js';
+	import { activePageStore, playlistSettingsStore } from '$lib/store';
 	import { Capacitor } from '@capacitor/core';
 	import { onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
-	import { activePageStore, playlistSettingsStore } from '../../../store';
 
 	export let data;
 
diff --git a/materialious/src/routes/playlist/[slug]/+page.ts b/materialious/src/routes/(app)/playlist/[slug]/+page.ts
similarity index 100%
rename from materialious/src/routes/playlist/[slug]/+page.ts
rename to materialious/src/routes/(app)/playlist/[slug]/+page.ts
diff --git a/materialious/src/routes/playlists/+page.svelte b/materialious/src/routes/(app)/playlists/+page.svelte
similarity index 98%
rename from materialious/src/routes/playlists/+page.svelte
rename to materialious/src/routes/(app)/playlists/+page.svelte
index df146453..d3e9b811 100644
--- a/materialious/src/routes/playlists/+page.svelte
+++ b/materialious/src/routes/(app)/playlists/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { deletePersonalPlaylist, getPersonalPlaylists, postPersonalPlaylist } from '$lib/Api';
 	import PlaylistThumbnail from '$lib/PlaylistThumbnail.svelte';
+	import { activePageStore } from '$lib/store';
 	import { _ } from 'svelte-i18n';
-	import { activePageStore } from '../../store';
 
 	export let data;
 
diff --git a/materialious/src/routes/playlists/+page.ts b/materialious/src/routes/(app)/playlists/+page.ts
similarity index 100%
rename from materialious/src/routes/playlists/+page.ts
rename to materialious/src/routes/(app)/playlists/+page.ts
diff --git a/materialious/src/routes/search/[slug]/+page.svelte b/materialious/src/routes/(app)/search/[slug]/+page.svelte
similarity index 98%
rename from materialious/src/routes/search/[slug]/+page.svelte
rename to materialious/src/routes/(app)/search/[slug]/+page.svelte
index 8a1a4454..accc3f51 100644
--- a/materialious/src/routes/search/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/search/[slug]/+page.svelte
@@ -4,9 +4,9 @@
 	import PageLoading from '$lib/PageLoading.svelte';
 	import PlaylistThumbnail from '$lib/PlaylistThumbnail.svelte';
 	import Thumbnail from '$lib/Thumbnail.svelte';
+	import { activePageStore } from '$lib/store';
 	import { _ } from 'svelte-i18n';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
-	import { activePageStore } from '../../../store';
 
 	export let data;
 
diff --git a/materialious/src/routes/search/[slug]/+page.ts b/materialious/src/routes/(app)/search/[slug]/+page.ts
similarity index 100%
rename from materialious/src/routes/search/[slug]/+page.ts
rename to materialious/src/routes/(app)/search/[slug]/+page.ts
diff --git a/materialious/src/routes/subscriptions/+page.svelte b/materialious/src/routes/(app)/subscriptions/+page.svelte
similarity index 95%
rename from materialious/src/routes/subscriptions/+page.svelte
rename to materialious/src/routes/(app)/subscriptions/+page.svelte
index 826fa186..000ad99c 100644
--- a/materialious/src/routes/subscriptions/+page.svelte
+++ b/materialious/src/routes/(app)/subscriptions/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	import { getFeed } from '$lib/Api/index.js';
 	import VideoList from '$lib/VideoList.svelte';
+	import { activePageStore } from '$lib/store';
 	import { _ } from 'svelte-i18n';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
-	import { activePageStore } from '../../store';
 
 	export let data;
 
diff --git a/materialious/src/routes/subscriptions/+page.ts b/materialious/src/routes/(app)/subscriptions/+page.ts
similarity index 100%
rename from materialious/src/routes/subscriptions/+page.ts
rename to materialious/src/routes/(app)/subscriptions/+page.ts
diff --git a/materialious/src/routes/subscriptions/manage/+page.svelte b/materialious/src/routes/(app)/subscriptions/manage/+page.svelte
similarity index 100%
rename from materialious/src/routes/subscriptions/manage/+page.svelte
rename to materialious/src/routes/(app)/subscriptions/manage/+page.svelte
diff --git a/materialious/src/routes/subscriptions/manage/+page.ts b/materialious/src/routes/(app)/subscriptions/manage/+page.ts
similarity index 100%
rename from materialious/src/routes/subscriptions/manage/+page.ts
rename to materialious/src/routes/(app)/subscriptions/manage/+page.ts
diff --git a/materialious/src/routes/trending/+page.svelte b/materialious/src/routes/(app)/trending/+page.svelte
similarity index 77%
rename from materialious/src/routes/trending/+page.svelte
rename to materialious/src/routes/(app)/trending/+page.svelte
index 4a0630e0..e2fd59f2 100644
--- a/materialious/src/routes/trending/+page.svelte
+++ b/materialious/src/routes/(app)/trending/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import VideoList from '$lib/VideoList.svelte';
-	import { activePageStore } from '../../store';
+	import { activePageStore } from '$lib/store';
 
 	export let data;
 
diff --git a/materialious/src/routes/trending/+page.ts b/materialious/src/routes/(app)/trending/+page.ts
similarity index 100%
rename from materialious/src/routes/trending/+page.ts
rename to materialious/src/routes/(app)/trending/+page.ts
diff --git a/materialious/src/routes/watch/+page.ts b/materialious/src/routes/(app)/watch/+page.ts
similarity index 100%
rename from materialious/src/routes/watch/+page.ts
rename to materialious/src/routes/(app)/watch/+page.ts
diff --git a/materialious/src/routes/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte
similarity index 99%
rename from materialious/src/routes/watch/[slug]/+page.svelte
rename to materialious/src/routes/(app)/watch/[slug]/+page.svelte
index 407d9d9f..83beea1e 100644
--- a/materialious/src/routes/watch/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte
@@ -16,11 +16,6 @@
 	import Thumbnail from '$lib/Thumbnail.svelte';
 	import { cleanNumber, getBestThumbnail, numberWithCommas, unsafeRandomItem } from '$lib/misc';
 	import type { PlayerEvents } from '$lib/player';
-	import type { DataConnection } from 'peerjs';
-	import { onDestroy, onMount } from 'svelte';
-	import { _ } from 'svelte-i18n';
-	import { get } from 'svelte/store';
-	import type { MediaPlayerElement } from 'vidstack/elements';
 	import {
 		activePageStore,
 		authStore,
@@ -32,7 +27,12 @@
 		playlistSettingsStore,
 		syncPartyConnectionsStore,
 		syncPartyPeerStore
-	} from '../../../store';
+	} from '$lib/store';
+	import type { DataConnection } from 'peerjs';
+	import { onDestroy, onMount } from 'svelte';
+	import { _ } from 'svelte-i18n';
+	import { get } from 'svelte/store';
+	import type { MediaPlayerElement } from 'vidstack/elements';
 
 	export let data;
 
diff --git a/materialious/src/routes/watch/[slug]/+page.ts b/materialious/src/routes/(app)/watch/[slug]/+page.ts
similarity index 100%
rename from materialious/src/routes/watch/[slug]/+page.ts
rename to materialious/src/routes/(app)/watch/[slug]/+page.ts
diff --git a/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte b/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte
index b131bcb2..9803214a 100644
--- a/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte
+++ b/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte
@@ -8,4 +8,4 @@
 	let player: MediaPlayerElement;
 </script>
 
-<Player bind:player {data} />
+<Player bind:player isEmbed={true} {data} />

From 7c81aec136a9c71d2d8260a5545c4eec7b7786c2 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Mon, 13 May 2024 15:35:51 +1200
Subject: [PATCH 10/11] Added comment timestamp support

---
 materialious/src/lib/Comment.svelte          | 12 ++++++++-
 materialious/src/lib/Player.svelte           | 27 ++++++++++++++------
 materialious/src/routes/(app)/watch/+page.ts | 11 ++++++--
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/materialious/src/lib/Comment.svelte b/materialious/src/lib/Comment.svelte
index 8ca4a2bb..d17d5512 100644
--- a/materialious/src/lib/Comment.svelte
+++ b/materialious/src/lib/Comment.svelte
@@ -18,6 +18,16 @@
 			});
 		} catch {}
 	}
+
+	function commentTimestamps(html: string): string {
+		const regex =
+			/<a href="([^"]+)" data-onclick="jump_to_time" data-jump-time="(\d+)">(\d+:\d+(?::\d+)?)<\/a>\s*(.+)/;
+		const replacement = `<a href="/watch/${videoId}?time=$2" data-sveltekit-preload-data="off" class="link">$3</a>`;
+
+		const processedHtml = html.replace(regex, replacement);
+
+		return processedHtml;
+	}
 </script>
 
 <div class="comment">
@@ -42,7 +52,7 @@
 			{/if}
 		</div>
 		<p style="margin-bottom: 0;">
-			{@html comment.contentHtml}
+			{@html commentTimestamps(comment.contentHtml)}
 		</p>
 		<div style="display: flex;">
 			<p><i>thumb_up</i> {numberWithCommas(comment.likeCount)}</p>
diff --git a/materialious/src/lib/Player.svelte b/materialious/src/lib/Player.svelte
index 22a883be..4ce8499d 100644
--- a/materialious/src/lib/Player.svelte
+++ b/materialious/src/lib/Player.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
 	import 'vidstack/bundle';
 
+	import { page } from '$app/stores';
+	import type { Page } from '@sveltejs/kit';
 	import { SponsorBlock, type Category } from 'sponsorblock-api';
 	import { onDestroy, onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
@@ -36,6 +38,20 @@
 	let playerIsLive = false;
 	let playerPosSet = false;
 
+	function loadTimeFromUrl(page: Page): boolean {
+		if (player) {
+			const timeGivenUrl = page.url.searchParams.get('time');
+			if (timeGivenUrl && !isNaN(parseFloat(timeGivenUrl))) {
+				player.currentTime = Number(timeGivenUrl);
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	page.subscribe((pageUpdate) => loadTimeFromUrl(pageUpdate));
+
 	export function seekTo(time: number) {
 		if (typeof player !== 'undefined') {
 			player.currentTime = time;
@@ -122,11 +138,11 @@
 			}
 
 			if (get(playerDashStore)) {
+				src = [{ src: data.video.dashUrl + '?local=true', type: 'application/dash+xml' }];
+
 				player.addEventListener('dash-can-play', async () => {
 					await loadPlayerPos();
 				});
-
-				src = [{ src: data.video.dashUrl + '?local=true', type: 'application/dash+xml' }];
 			} else {
 				let formattedSrc;
 				src = data.video.formatStreams.map((format) => {
@@ -192,12 +208,7 @@
 		if (playerPosSet) return;
 		playerPosSet = true;
 
-		const paramTime = new URLSearchParams(window.location.search).get('time');
-
-		if (paramTime && !isNaN(parseFloat(paramTime))) {
-			player.currentTime = Number(paramTime);
-			return;
-		}
+		if (loadTimeFromUrl($page)) return;
 
 		let toSetTime = 0;
 
diff --git a/materialious/src/routes/(app)/watch/+page.ts b/materialious/src/routes/(app)/watch/+page.ts
index ea46d799..6147205b 100644
--- a/materialious/src/routes/(app)/watch/+page.ts
+++ b/materialious/src/routes/(app)/watch/+page.ts
@@ -4,12 +4,19 @@ import { error } from '@sveltejs/kit';
 export async function load({ url }) {
 	const videoId = url.searchParams.get('v');
 	const playlistId = url.searchParams.get('list');
+	const timestamp = url.searchParams.get('t');
+
 	if (videoId) {
-		let goToUrl = `/watch/${videoId}`;
+		let goToUrl = new URL(`${location.origin}/watch/${videoId}`);
 
 		if (playlistId) {
-			goToUrl += `?playlist=${playlistId}`;
+			goToUrl.searchParams.set('playlist', playlistId);
 		}
+
+		if (timestamp) {
+			goToUrl.searchParams.set('time', timestamp);
+		}
+
 		goto(goToUrl);
 	} else {
 		error(404);

From 2ad943c59e52a30b4fba1db88b5e40de25e65366 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Mon, 13 May 2024 15:39:26 +1200
Subject: [PATCH 11/11] Update versions

---
 materialious/android/app/build.gradle | 4 ++--
 materialious/electron/package.json    | 2 +-
 materialious/package.json             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle
index 053d132c..e049b39a 100644
--- a/materialious/android/app/build.gradle
+++ b/materialious/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "us.materialio.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 8
-        versionName "1.0.8"
+        versionCode 9
+        versionName "1.0.9"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/materialious/electron/package.json b/materialious/electron/package.json
index ac0a3b2d..1fb112a2 100644
--- a/materialious/electron/package.json
+++ b/materialious/electron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "Materialious",
-	"version": "1.0.8",
+	"version": "1.0.9",
 	"description": "Modern material design for Invidious.",
 	"author": {
 		"name": "Ward Pearce",
diff --git a/materialious/package.json b/materialious/package.json
index 23c18eb3..ceb52b2f 100644
--- a/materialious/package.json
+++ b/materialious/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.0.8",
+	"version": "1.0.9",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",