From 48396bda849f5da4c16955329c1166db8a7b9f3d Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Sat, 31 May 2025 15:32:40 +1200
Subject: [PATCH] Load feeds quicker with stores

---
 materialious/android/app/build.gradle         |  4 +-
 .../electron/materialious.metainfo.xml        |  6 +-
 materialious/electron/package.json            |  2 +-
 materialious/package.json                     |  4 +-
 .../src/lib/components/VideoList.svelte       | 24 +++++---
 materialious/src/lib/store.ts                 | 31 +++++++---
 materialious/src/routes/(app)/+error.svelte   |  3 -
 materialious/src/routes/(app)/+layout.svelte  | 60 ++++---------------
 materialious/src/routes/(app)/+page.svelte    |  3 -
 .../routes/(app)/channel/[slug]/+page.svelte  |  4 +-
 .../routes/(app)/hashtag/[slug]/+page.svelte  |  3 -
 .../src/routes/(app)/history/+page.svelte     |  4 +-
 .../routes/(app)/playlist/[slug]/+page.svelte |  4 +-
 .../src/routes/(app)/playlists/+page.svelte   |  3 -
 .../routes/(app)/search/[slug]/+page.svelte   |  3 -
 .../routes/(app)/subscriptions/+page.svelte   | 14 ++---
 .../src/routes/(app)/subscriptions/+page.ts   | 29 ++++++---
 .../(app)/subscriptions/manage/+page.svelte   |  3 -
 .../src/routes/(app)/trending/+page.svelte    |  3 -
 .../routes/(app)/watch/[slug]/+page.svelte    |  3 -
 update_versions.py                            |  2 +-
 21 files changed, 91 insertions(+), 121 deletions(-)

diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle
index eaafb9e4..26f9e2fd 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 111
-        versionName "1.8.7"
+        versionCode 112
+        versionName "1.8.8"
         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/materialious.metainfo.xml b/materialious/electron/materialious.metainfo.xml
index 92d89949..475f55ad 100644
--- a/materialious/electron/materialious.metainfo.xml
+++ b/materialious/electron/materialious.metainfo.xml
@@ -56,7 +56,11 @@
     
     
     
-    <release version="1.8.7" date="2025-5-30">
+    
+    <release version="1.8.8" date="2025-5-31">
+      <url>https://github.com/Materialious/Materialious/releases/tag/1.8.8</url>
+    </release>
+<release version="1.8.7" date="2025-5-30">
       <url>https://github.com/Materialious/Materialious/releases/tag/1.8.7</url>
     </release>
 <release version="1.8.6" date="2025-5-29">
diff --git a/materialious/electron/package.json b/materialious/electron/package.json
index 37480b84..2ee1b142 100644
--- a/materialious/electron/package.json
+++ b/materialious/electron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "Materialious",
-	"version": "1.8.7",
+	"version": "1.8.8",
 	"description": "Modern material design for Invidious.",
 	"author": {
 		"name": "Ward Pearce",
diff --git a/materialious/package.json b/materialious/package.json
index ca71130b..0810f24a 100644
--- a/materialious/package.json
+++ b/materialious/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.8.7",
+	"version": "1.8.8",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
@@ -71,4 +71,4 @@
 		"terser": "^5.34.1",
 		"youtubei.js": "^13.4.0"
 	}
-}
+}
\ No newline at end of file
diff --git a/materialious/src/lib/components/VideoList.svelte b/materialious/src/lib/components/VideoList.svelte
index 3fee66be..ceee9e94 100644
--- a/materialious/src/lib/components/VideoList.svelte
+++ b/materialious/src/lib/components/VideoList.svelte
@@ -1,26 +1,29 @@
 <script lang="ts">
 	import Thumbnail from '$lib/components/Thumbnail.svelte';
 	import { _ } from 'svelte-i18n';
-	import { get } from 'svelte/store';
 	import { removePlaylistVideo } from '../api';
-	import type { Notification, PlaylistPageVideo, Video, VideoBase } from '../api/model';
-	import { authStore } from '../store';
+	import type { PlaylistPageVideo, Video, VideoBase } from '../api/model';
+	import { authStore, feedLastItemId } from '../store';
 	import ContentColumn from './ContentColumn.svelte';
+	import { onMount } from 'svelte';
 
 	interface Props {
-		videos?: VideoBase[] | Video[] | Notification[] | PlaylistPageVideo[];
+		videos?: (VideoBase | Video | PlaylistPageVideo)[];
 		playlistId?: string;
 		playlistAuthor?: string;
 	}
 
 	let { videos = [], playlistId = '', playlistAuthor = '' }: Props = $props();
 
-	let auth = get(authStore);
-
 	async function removePlaylistItem(indexId: string) {
 		if (!playlistId) return;
 		await removePlaylistVideo(playlistId, indexId);
 	}
+
+	onMount(() => {
+		if ($feedLastItemId)
+			document.getElementById($feedLastItemId)?.scrollIntoView({ behavior: 'instant' });
+	});
 </script>
 
 <div class="page right active">
@@ -28,9 +31,14 @@
 	<div class="grid">
 		{#each videos as video}
 			<ContentColumn>
-				<article class="no-padding" style="height: 100%;">
+				<article
+					class="no-padding"
+					style="height: 100%;"
+					id={video.videoId}
+					onclick={() => feedLastItemId.set(video.videoId)}
+				>
 					<Thumbnail {video} {playlistId} />
-					{#if auth && decodeURIComponent(auth.username) === playlistAuthor && 'indexId' in video}
+					{#if $authStore && decodeURIComponent($authStore.username) === playlistAuthor && 'indexId' in video}
 						<div class="right-align" style="margin: 1em .5em;">
 							<button
 								onclick={async () => removePlaylistItem(video.indexId)}
diff --git a/materialious/src/lib/store.ts b/materialious/src/lib/store.ts
index 720fc746..381ad075 100644
--- a/materialious/src/lib/store.ts
+++ b/materialious/src/lib/store.ts
@@ -4,6 +4,7 @@ import type { DataConnection } from 'peerjs';
 import { persisted } from 'svelte-persisted-store';
 import { writable, type Writable } from 'svelte/store';
 import type { TitleCase } from './letterCasing';
+import type { PlaylistPageVideo, Video, VideoBase } from './api/model';
 
 function platformDependentDefault(givenValue: any, defaultValue: any): any {
 	if (typeof givenValue !== 'undefined' && typeof givenValue !== null) {
@@ -14,11 +15,14 @@ function platformDependentDefault(givenValue: any, defaultValue: any): any {
 }
 
 export const instanceStore: Writable<string> = persisted(
-	"invidiousInstance",
-	platformDependentDefault(import.meta.env.VITE_DEFAULT_INVIDIOUS_INSTANCE, 'https://invidious.materialio.us')
+	'invidiousInstance',
+	platformDependentDefault(
+		import.meta.env.VITE_DEFAULT_INVIDIOUS_INSTANCE,
+		'https://invidious.materialio.us'
+	)
 );
 
-export const authStore: Writable<null | { username: string; token: string; }> = persisted(
+export const authStore: Writable<null | { username: string; token: string }> = persisted(
 	'authToken',
 	null
 );
@@ -28,8 +32,6 @@ export const themeColorStore: Writable<null | string> = persisted('themeColor',
 
 export const showWarningStore = persisted('showWarning', true);
 
-export const activePageStore: Writable<string | null> = writable('home');
-
 export const playerAutoPlayStore = persisted('autoPlay', true);
 export const playerAlwaysLoopStore = persisted('alwaysLoop', false);
 export const playerProxyVideosStore = persisted('proxyVideos', true);
@@ -44,13 +46,20 @@ export const playerDefaultLanguage = persisted('defaultLanguage', '');
 export const returnYtDislikesStore = persisted('returnYtDislikes', false);
 export const returnYTDislikesInstanceStore: Writable<string | null | undefined> = persisted(
 	'returnYTDislikesInstance',
-	platformDependentDefault(import.meta.env.VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE, 'https://ryd-proxy.materialio.us')
+	platformDependentDefault(
+		import.meta.env.VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE,
+		'https://ryd-proxy.materialio.us'
+	)
 );
 
 export const synciousStore = persisted('syncious', true);
 export const synciousInstanceStore: Writable<string | null | undefined> = persisted(
 	'synciousInstance',
-	platformDependentDefault(import.meta.env.VITE_DEFAULT_SYNCIOUS_INSTANCE || import.meta.env.VITE_DEFAULT_API_EXTENDED_INSTANCE, 'https://extended-api.materialio.us')
+	platformDependentDefault(
+		import.meta.env.VITE_DEFAULT_SYNCIOUS_INSTANCE ||
+			import.meta.env.VITE_DEFAULT_API_EXTENDED_INSTANCE,
+		'https://extended-api.materialio.us'
+	)
 );
 
 export const interfaceRegionStore: Writable<string> = persisted('interfaceRegion', 'US');
@@ -96,10 +105,14 @@ export const deArrowThumbnailInstanceStore = persisted(
 export const syncPartyPeerStore: Writable<Peer | null> = writable(null);
 export const syncPartyConnectionsStore: Writable<DataConnection[] | null> = writable();
 
-export const playlistSettingsStore: Writable<Record<string, { shuffle: boolean; loop: boolean; }>> =
+export const playlistSettingsStore: Writable<Record<string, { shuffle: boolean; loop: boolean }>> =
 	writable({});
 
-
 export const poTokenCacheStore: Writable<string | undefined> = writable();
 
 export const searchHistoryStore: Writable<string[]> = persisted('searchHistory', []);
+
+export const feedCacheStore: Writable<{
+	[key: string]: (VideoBase | Video | PlaylistPageVideo)[];
+}> = writable({});
+export const feedLastItemId: Writable<string | undefined> = writable(undefined);
diff --git a/materialious/src/routes/(app)/+error.svelte b/materialious/src/routes/(app)/+error.svelte
index 98458dcf..9ebfd8a5 100644
--- a/materialious/src/routes/(app)/+error.svelte
+++ b/materialious/src/routes/(app)/+error.svelte
@@ -1,8 +1,5 @@
 <script lang="ts">
 	import { page } from '$app/stores';
-	import { activePageStore } from '$lib/store';
-
-	activePageStore.set(null);
 </script>
 
 <div class="space"></div>
diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte
index 42cc158f..6b1f4cb0 100644
--- a/materialious/src/routes/(app)/+layout.svelte
+++ b/materialious/src/routes/(app)/+layout.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { afterNavigate, beforeNavigate, goto } from '$app/navigation';
 
-	import { navigating } from '$app/stores';
+	import { navigating, page } from '$app/stores';
 	import '$lib/android/http/androidRequests';
 	import colorTheme, { convertToHexColorCode } from '$lib/android/plugins/colorTheme';
 	import { getFeed } from '$lib/api/index';
@@ -16,7 +16,6 @@
 	import { bookmarkletLoadFromUrl, loadSettingsFromEnv } from '$lib/externalSettings';
 	import { getPages } from '$lib/navPages';
 	import {
-		activePageStore,
 		authStore,
 		darkModeStore,
 		instanceStore,
@@ -33,7 +32,7 @@
 	import 'beercss';
 	import ui from 'beercss';
 	import 'material-dynamic-colors';
-	import { onMount, tick } from 'svelte';
+	import { onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
 	import { get } from 'svelte/store';
 	import { pwaInfo } from 'virtual:pwa-info';
@@ -42,9 +41,6 @@
 
 	let mobileSearchShow = $state(false);
 
-	let currentPage: string | null = $state('');
-	activePageStore.subscribe((page) => (currentPage = page));
-
 	let isLoggedIn = $state(false);
 	authStore.subscribe((value) => {
 		isLoggedIn = value !== null;
@@ -120,41 +116,11 @@
 		notifications = feed.notifications;
 	}
 
-	let scrollPositions = new Map();
-	let scrollableRoot: HTMLElement | null = null;
-
-	beforeNavigate(({ from }) => {
-		if (from?.url && scrollableRoot) {
-			// Save the scroll position of the root element
-			scrollPositions.set(from.url.pathname, scrollableRoot.scrollTop);
-		}
-	});
-
-	// Restore the scroll position after navigating to a new page
-	afterNavigate(async ({ to, type }) => {
-		if (!scrollableRoot) return;
-
-		if (to?.url && scrollPositions.has(to.url.pathname)) {
-			// Check user went back
-			if (type === 'popstate') {
-				await tick();
-				scrollableRoot.scrollTo(0, scrollPositions.get(to.url.pathname) || 0);
-			} else {
-				scrollPositions.delete(to.url.pathname);
-			}
-		} else {
-			// Default behavior: scroll to top
-			scrollableRoot.scrollTo(0, 0);
-		}
-	});
-
 	onMount(async () => {
 		ui();
 
 		document.addEventListener('click', linkClickOverwrite);
 
-		scrollableRoot = document.querySelector('.root');
-
 		loadSettingsFromEnv();
 		// Should always be loaded after env settings
 		// So user preferences overwrite instance preferences.
@@ -205,11 +171,11 @@
 
 <nav class="left m l small">
 	<header></header>
-	{#each getPages() as page}
-		{#if !page.requiresAuth || isLoggedIn}
-			<a href={page.href} class:active={currentPage === page.name.toLowerCase()}
-				><i>{page.icon}</i>
-				<div>{page.name}</div>
+	{#each getPages() as navPage}
+		{#if !navPage.requiresAuth || isLoggedIn}
+			<a href={navPage.href} class:active={$page.url.href.endsWith(navPage.href)}
+				><i>{navPage.icon}</i>
+				<div>{navPage.name}</div>
 			</a>
 		{/if}
 	{/each}
@@ -288,12 +254,12 @@
 </nav>
 
 <nav class="bottom s">
-	{#each getPages() as page}
-		{#if !page.requiresAuth || isLoggedIn}
-			<a class="round" href={page.href} class:active={currentPage === page.name.toLowerCase()}
-				><i>{page.icon}</i>
-				{#if currentPage === page.name.toLowerCase()}
-					<span style="font-size: .8em;">{page.name}</span>
+	{#each getPages() as navPage}
+		{#if !navPage.requiresAuth || isLoggedIn}
+			<a class="round" href={navPage.href} class:active={$page.url.href.endsWith(navPage.href)}
+				><i>{navPage.icon}</i>
+				{#if $page.url.href.endsWith(navPage.href)}
+					<span style="font-size: .8em;">{navPage.name}</span>
 				{/if}
 			</a>
 		{/if}
diff --git a/materialious/src/routes/(app)/+page.svelte b/materialious/src/routes/(app)/+page.svelte
index f7ff58f8..50ef53fa 100644
--- a/materialious/src/routes/(app)/+page.svelte
+++ b/materialious/src/routes/(app)/+page.svelte
@@ -1,10 +1,7 @@
 <script lang="ts">
 	import VideoList from '$lib/components/VideoList.svelte';
-	import { activePageStore } from '$lib/store';
 
 	let { data } = $props();
-
-	activePageStore.set('home');
 </script>
 
 {#if data.popularDisabled}
diff --git a/materialious/src/routes/(app)/channel/[slug]/+page.svelte b/materialious/src/routes/(app)/channel/[slug]/+page.svelte
index 5b5515a4..f75af4d9 100644
--- a/materialious/src/routes/(app)/channel/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/channel/[slug]/+page.svelte
@@ -7,7 +7,7 @@
 	import VideoList from '$lib/components/VideoList.svelte';
 	import { getBestThumbnail, proxyGoogleImage } from '$lib/images';
 	import { cleanNumber } from '$lib/numbers';
-	import { activePageStore, authStore, interfaceLowBandwidthMode } from '$lib/store';
+	import { authStore, interfaceLowBandwidthMode } from '$lib/store';
 	import { Clipboard } from '@capacitor/clipboard';
 	import { Capacitor } from '@capacitor/core';
 	import { onMount } from 'svelte';
@@ -17,8 +17,6 @@
 
 	let { data } = $props();
 
-	activePageStore.set(null);
-
 	let isSubscribed = $state(false);
 
 	let tab: 'videos' | 'playlists' | 'streams' | 'shorts' = $state('videos');
diff --git a/materialious/src/routes/(app)/hashtag/[slug]/+page.svelte b/materialious/src/routes/(app)/hashtag/[slug]/+page.svelte
index 66fd65d4..b4a6bb44 100644
--- a/materialious/src/routes/(app)/hashtag/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/hashtag/[slug]/+page.svelte
@@ -2,7 +2,6 @@
 	import { getHashtag } from '$lib/api';
 	import type { Video } from '$lib/api/model.js';
 	import VideoList from '$lib/components/VideoList.svelte';
-	import { activePageStore } from '$lib/store';
 	import { onMount } from 'svelte';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
 
@@ -15,8 +14,6 @@
 		videos = [...data.hashTagVideos.results];
 	});
 
-	activePageStore.set('hashtag');
-
 	async function loadMore(event: InfiniteEvent) {
 		currentPage++;
 		const hashtagVideos = (await getHashtag(data.hashtag, currentPage)).results;
diff --git a/materialious/src/routes/(app)/history/+page.svelte b/materialious/src/routes/(app)/history/+page.svelte
index 5e362fb7..89e9d7f5 100644
--- a/materialious/src/routes/(app)/history/+page.svelte
+++ b/materialious/src/routes/(app)/history/+page.svelte
@@ -3,15 +3,13 @@
 	import type { VideoPlay } from '$lib/api/model';
 	import PageLoading from '$lib/components/PageLoading.svelte';
 	import VideoList from '$lib/components/VideoList.svelte';
-	import { activePageStore, synciousStore } from '$lib/store';
+	import { 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';
 
-	activePageStore.set('history');
-
 	let history: VideoPlay[] = $state([]);
 	let loaded = $state(false);
 
diff --git a/materialious/src/routes/(app)/playlist/[slug]/+page.svelte b/materialious/src/routes/(app)/playlist/[slug]/+page.svelte
index fae9db6a..233d0a16 100644
--- a/materialious/src/routes/(app)/playlist/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/playlist/[slug]/+page.svelte
@@ -4,7 +4,7 @@
 	import VideoList from '$lib/components/VideoList.svelte';
 	import { unsafeRandomItem } from '$lib/misc';
 	import { cleanNumber } from '$lib/numbers';
-	import { activePageStore, playlistSettingsStore } from '$lib/store';
+	import { playlistSettingsStore } from '$lib/store';
 	import { Clipboard } from '@capacitor/clipboard';
 	import { Capacitor } from '@capacitor/core';
 	import { onMount } from 'svelte';
@@ -12,8 +12,6 @@
 
 	let { data } = $props();
 
-	activePageStore.set(null);
-
 	let videos: PlaylistPageVideo[] | undefined = $state();
 	if (data.playlist.videos.length > 0) {
 		videos = data.playlist.videos.sort((a: PlaylistPageVideo, b: PlaylistPageVideo) => {
diff --git a/materialious/src/routes/(app)/playlists/+page.svelte b/materialious/src/routes/(app)/playlists/+page.svelte
index bca08ff7..0ede4862 100644
--- a/materialious/src/routes/(app)/playlists/+page.svelte
+++ b/materialious/src/routes/(app)/playlists/+page.svelte
@@ -4,7 +4,6 @@
 	import { deletePersonalPlaylist, getPersonalPlaylists, postPersonalPlaylist } from '$lib/api';
 	import ContentColumn from '$lib/components/ContentColumn.svelte';
 	import PlaylistThumbnail from '$lib/components/PlaylistThumbnail.svelte';
-	import { activePageStore } from '$lib/store';
 	import { ui } from 'beercss';
 	import { _ } from 'svelte-i18n';
 
@@ -12,8 +11,6 @@
 
 	let playlists = $state(data);
 
-	activePageStore.set('playlists');
-
 	let playlistPrivacy: 'public' | 'private' | 'unlisted' = 'public';
 	let playlistTitle: string = $state('');
 
diff --git a/materialious/src/routes/(app)/search/[slug]/+page.svelte b/materialious/src/routes/(app)/search/[slug]/+page.svelte
index a2f3e8d4..65fbfc1d 100644
--- a/materialious/src/routes/(app)/search/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/search/[slug]/+page.svelte
@@ -6,7 +6,6 @@
 	import PageLoading from '$lib/components/PageLoading.svelte';
 	import PlaylistThumbnail from '$lib/components/PlaylistThumbnail.svelte';
 	import Thumbnail from '$lib/components/Thumbnail.svelte';
-	import { activePageStore } from '$lib/store';
 	import { _ } from 'svelte-i18n';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
 
@@ -16,8 +15,6 @@
 
 	let currentPage = 1;
 
-	activePageStore.set(null);
-
 	async function changeType(type: 'playlist' | 'all' | 'video' | 'channel') {
 		searchResults.searchType = type;
 		currentPage = 1;
diff --git a/materialious/src/routes/(app)/subscriptions/+page.svelte b/materialious/src/routes/(app)/subscriptions/+page.svelte
index f5bc92aa..c4042a56 100644
--- a/materialious/src/routes/(app)/subscriptions/+page.svelte
+++ b/materialious/src/routes/(app)/subscriptions/+page.svelte
@@ -1,22 +1,15 @@
 <script lang="ts">
 	import { getFeed } from '$lib/api/index';
-	import type { Notification, Video } from '$lib/api/model.js';
+	import type { PlaylistPageVideo, Video, VideoBase } from '$lib/api/model.js';
 	import VideoList from '$lib/components/VideoList.svelte';
-	import { activePageStore } from '$lib/store';
-	import { onMount } from 'svelte';
+	import { feedCacheStore } from '$lib/store';
 	import { _ } from 'svelte-i18n';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
 
 	let { data } = $props();
 
 	let currentPage = 1;
-	let videos: (Notification | Video)[] = $state([]);
-
-	onMount(() => {
-		videos = [...data.feed.notifications, ...data.feed.videos];
-	});
-
-	activePageStore.set('subscriptions');
+	let videos: (VideoBase | Video | PlaylistPageVideo)[] = $state(data.videos);
 
 	async function loadMore(event: InfiniteEvent) {
 		currentPage++;
@@ -25,6 +18,7 @@
 			event.detail.complete();
 		} else {
 			videos = [...videos, ...feed.videos, ...feed.notifications];
+			feedCacheStore.set({ subscription: videos });
 			event.detail.loaded();
 		}
 	}
diff --git a/materialious/src/routes/(app)/subscriptions/+page.ts b/materialious/src/routes/(app)/subscriptions/+page.ts
index 6b27f7a4..0f042c53 100644
--- a/materialious/src/routes/(app)/subscriptions/+page.ts
+++ b/materialious/src/routes/(app)/subscriptions/+page.ts
@@ -1,15 +1,30 @@
 import { getFeed } from '$lib/api/index';
+import { feedCacheStore } from '$lib/store';
 import { error } from '@sveltejs/kit';
+import { get } from 'svelte/store';
 
-export async function load({ params }) {
-	let feed;
+export async function load() {
+	let videos = get(feedCacheStore).subscription;
 
-	try {
-		feed = await getFeed(100, 1);
-	} catch (errorMessage: any) {
-		error(500, errorMessage);
+	if (!videos) {
+		let feeds;
+		try {
+			feeds = await getFeed(100, 1);
+		} catch (errorMessage: any) {
+			error(500, errorMessage);
+		}
+
+		videos = [...feeds.notifications, ...feeds.videos];
+
+		feedCacheStore.set({ subscription: videos });
+	} else {
+		await getFeed(100, 1).then((feeds) => {
+			const newVideos = [...feeds.notifications, ...feeds.videos];
+			feedCacheStore.set({ subscription: { ...Array.from(new Set(newVideos)), ...videos } });
+		});
 	}
+
 	return {
-		feed: feed
+		videos: videos
 	};
 }
diff --git a/materialious/src/routes/(app)/subscriptions/manage/+page.svelte b/materialious/src/routes/(app)/subscriptions/manage/+page.svelte
index 578c5318..96b6ea34 100644
--- a/materialious/src/routes/(app)/subscriptions/manage/+page.svelte
+++ b/materialious/src/routes/(app)/subscriptions/manage/+page.svelte
@@ -1,11 +1,8 @@
 <script lang="ts">
 	import { deleteUnsubscribe } from '$lib/api';
-	import { activePageStore } from '$lib/store';
 	import Fuse from 'fuse.js';
 	import { _ } from 'svelte-i18n';
 
-	activePageStore.set(null);
-
 	let { data } = $props();
 
 	let subscriptions = $state(structuredClone(data.subscriptions));
diff --git a/materialious/src/routes/(app)/trending/+page.svelte b/materialious/src/routes/(app)/trending/+page.svelte
index 7764fffc..be94a542 100644
--- a/materialious/src/routes/(app)/trending/+page.svelte
+++ b/materialious/src/routes/(app)/trending/+page.svelte
@@ -1,10 +1,7 @@
 <script lang="ts">
 	import VideoList from '$lib/components/VideoList.svelte';
-	import { activePageStore } from '$lib/store';
 
 	let { data } = $props();
-
-	activePageStore.set('trending');
 </script>
 
 <VideoList videos={data.trending} />
diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte
index 67b39ea7..33a75520 100644
--- a/materialious/src/routes/(app)/watch/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte
@@ -21,7 +21,6 @@
 	import { cleanNumber, humanizeSeconds, numberWithCommas } from '$lib/numbers';
 	import type { PlayerEvents } from '$lib/player.js';
 	import {
-		activePageStore,
 		authStore,
 		interfaceAutoExpandComments,
 		interfaceAutoExpandDesc,
@@ -56,8 +55,6 @@
 	let personalPlaylists: PlaylistPage[] | null = $state(null);
 	data.streamed.personalPlaylists?.then((streamPlaylists) => (personalPlaylists = streamPlaylists));
 
-	activePageStore.set(null);
-
 	let playlistVideos: PlaylistPageVideo[] = $state([]);
 	let playlist: PlaylistPage | null = $state(null);
 
diff --git a/update_versions.py b/update_versions.py
index 041fa243..436824ae 100644
--- a/update_versions.py
+++ b/update_versions.py
@@ -3,7 +3,7 @@ import os
 import re
 from datetime import datetime
 
-LATEST_VERSION = "1.8.7"
+LATEST_VERSION = "1.8.8"
 RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d")  # Format: YYYY-M-D
 
 WORKING_DIR = os.path.join(