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] 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;