From 454c73e6b46fd2e884ad42d1333e1c616bc5028e Mon Sep 17 00:00:00 2001 From: WardPearce Date: Thu, 20 Nov 2025 20:52:51 +1300 Subject: [PATCH] Reslove fixes --- materialious/electron/package-lock.json | 4 +- materialious/electron/package.json | 3 +- .../electron/src/rt/electron-plugins.js | 2 + materialious/package-lock.json | 38 +++++++++---------- .../lib/components/ChannelThumbnail.svelte | 6 ++- .../lib/components/HashtagThumbnail.svelte | 2 +- .../lib/components/PlaylistThumbnail.svelte | 16 +++++--- materialious/src/lib/components/Search.svelte | 10 ++--- .../src/lib/components/ShareVideo.svelte | 2 +- .../src/lib/components/SyncParty.svelte | 8 ++-- .../src/lib/components/Thumbnail.svelte | 5 ++- .../lib/components/settings/Interface.svelte | 2 +- .../src/lib/components/watch/Author.svelte | 2 +- .../src/lib/components/watch/Comment.svelte | 4 +- .../lib/components/watch/Description.svelte | 7 +++- materialious/src/lib/misc.ts | 4 +- materialious/src/lib/player.ts | 22 ++++++++--- materialious/src/routes/(app)/+layout.svelte | 22 ++++++----- .../src/routes/(app)/auth/+page.svelte | 2 +- .../routes/(app)/channel/[slug]/+page.svelte | 2 +- .../src/routes/(app)/playlist/+page.ts | 2 +- .../routes/(app)/playlist/[slug]/+page.svelte | 22 ++++++++--- .../src/routes/(app)/playlists/+page.svelte | 2 +- .../(app)/subscriptions/manage/+page.svelte | 4 +- materialious/src/routes/(app)/watch/+page.ts | 2 +- .../routes/(app)/watch/[slug]/+page.svelte | 16 ++++---- materialious/src/routes/+layout.ts | 8 ++-- 27 files changed, 130 insertions(+), 89 deletions(-) diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json index 77f18e6c..e41c649f 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.11.6", + "version": "1.11.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.11.6", + "version": "1.11.7", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", diff --git a/materialious/electron/package.json b/materialious/electron/package.json index 1dc8fdf7..8fe1395e 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -24,6 +24,7 @@ "dependencies": { "@capacitor-community/electron": "^5.0.0", "bgutils-js": "^3.2.0", + "capacitor-nodejs": "https://github.com/hampoelz/capacitor-nodejs/releases/download/v1.0.0-beta.9/capacitor-nodejs.tgz", "chokidar": "~4.0.3", "electron-is-dev": "~2.0.0", "electron-serve": "~3.0.0", @@ -43,4 +44,4 @@ "capacitor", "electron" ] -} \ No newline at end of file +} diff --git a/materialious/electron/src/rt/electron-plugins.js b/materialious/electron/src/rt/electron-plugins.js index b33b2826..5f312366 100644 --- a/materialious/electron/src/rt/electron-plugins.js +++ b/materialious/electron/src/rt/electron-plugins.js @@ -1,4 +1,6 @@ /* eslint-disable @typescript-eslint/no-var-requires */ +const CapacitorNodejs = require('../../../node_modules/capacitor-nodejs/electron/dist/plugin.js'); module.exports = { + CapacitorNodejs, } \ No newline at end of file diff --git a/materialious/package-lock.json b/materialious/package-lock.json index 61b22607..c824e32f 100644 --- a/materialious/package-lock.json +++ b/materialious/package-lock.json @@ -1,12 +1,12 @@ { "name": "materialious", - "version": "1.11.6", + "version": "1.11.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "materialious", - "version": "1.11.6", + "version": "1.11.7", "hasInstallScript": true, "dependencies": { "@capacitor-community/electron": "^5.0.1", @@ -95,7 +95,6 @@ "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.3", @@ -2069,7 +2068,6 @@ "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-7.4.3.tgz", "integrity": "sha512-wCWr8fQ9Wxn0466vPg7nMn0tivbNVjNy1yL4GvDSIZuZx7UpU2HeVGNe9QjN/quEd+YLRFeKEBLBw619VqUiNg==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.1.0" } @@ -3346,7 +3344,6 @@ "integrity": "sha512-7TSvMrCdmig5TMyYDW876C5FljhA0wlGixtvASCiqUqtLfmyEEpaysXjC7GhR5mWcGRrCGF+L2Bl1eEaW1wTCA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@standard-schema/spec": "^1.0.0", "@sveltejs/acorn-typescript": "^1.0.5", @@ -3386,7 +3383,6 @@ "integrity": "sha512-YZs/OSKOQAQCnJvM/P+F1URotNnYNeU3P2s4oIpzm1uFaqUEqRxUB0g5ejMjEb5Gjb9/PiBI5Ktrq4rUUF8UVQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@sveltejs/vite-plugin-svelte-inspector": "^5.0.0", "debug": "^4.4.1", @@ -3637,7 +3633,6 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz", "integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==", "license": "MIT", - "peer": true, "dependencies": { "undici-types": "~6.21.0" } @@ -3715,7 +3710,6 @@ "integrity": "sha512-6m1I5RmHBGTnUGS113G04DMu3CpSdxCAU/UvtjNWL4Nuf3MW9tQhiJqRlHzChIkhy6kZSAQmc+I1bcGjE3yNKg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.46.3", "@typescript-eslint/types": "8.46.3", @@ -3975,7 +3969,6 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -4548,7 +4541,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.3", "caniuse-lite": "^1.0.30001741", @@ -6006,7 +5998,6 @@ "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -9613,7 +9604,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -9811,7 +9801,6 @@ "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", "dev": true, "license": "MIT", - "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -10698,7 +10687,6 @@ "integrity": "sha512-CLEVl+MnPAiKh5pl4dEWSyMTpuflgNQiLGhMv8ezD5W/qP8AKvmYpCOKRRNOh7oRKnauBZ4SyeYkMS+1VSyKwQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/estree": "1.0.8" }, @@ -11632,7 +11620,6 @@ "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.43.5.tgz", "integrity": "sha512-HQoZArIewxQVNedseDsgMgnRSC4XOXczxXLF9rOJaPIJkg58INOPUiL8aEtzqZIXNSZJyw8NmqObwg/voajiHQ==", "license": "MIT", - "peer": true, "dependencies": { "@jridgewell/remapping": "^2.3.4", "@jridgewell/sourcemap-codec": "^1.5.0", @@ -11692,6 +11679,21 @@ } } }, + "node_modules/svelte-check/node_modules/picomatch": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", + "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/svelte-eslint-parser": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/svelte-eslint-parser/-/svelte-eslint-parser-1.4.0.tgz", @@ -11952,7 +11954,6 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -12202,7 +12203,6 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "devOptional": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -12441,7 +12441,6 @@ "integrity": "sha512-ZWyE8YXEXqJrrSLvYgrRP7p62OziLW7xI5HYGWFzOvupfAlrLvURSzv/FyGyy0eidogEM3ujU+kUG1zuHgb6Ug==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.5.0", @@ -13023,7 +13022,6 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -13376,7 +13374,6 @@ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -13493,7 +13490,6 @@ "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==", "dev": true, "license": "MIT", - "peer": true, "bin": { "rollup": "dist/bin/rollup" }, diff --git a/materialious/src/lib/components/ChannelThumbnail.svelte b/materialious/src/lib/components/ChannelThumbnail.svelte index fdce3fe1..c406902b 100644 --- a/materialious/src/lib/components/ChannelThumbnail.svelte +++ b/materialious/src/lib/components/ChannelThumbnail.svelte @@ -29,7 +29,11 @@ }); - +
{#if !$interfaceLowBandwidthMode}
diff --git a/materialious/src/lib/components/HashtagThumbnail.svelte b/materialious/src/lib/components/HashtagThumbnail.svelte index 07d968f4..f4d499b0 100644 --- a/materialious/src/lib/components/HashtagThumbnail.svelte +++ b/materialious/src/lib/components/HashtagThumbnail.svelte @@ -12,7 +12,7 @@ let { hashtag }: Props = $props(); - +
{truncate(hashtag.title, 14)}
diff --git a/materialious/src/lib/components/PlaylistThumbnail.svelte b/materialious/src/lib/components/PlaylistThumbnail.svelte index 9a2f5789..c9bd4edd 100644 --- a/materialious/src/lib/components/PlaylistThumbnail.svelte +++ b/materialious/src/lib/components/PlaylistThumbnail.svelte @@ -20,7 +20,7 @@ let img: HTMLImageElement | undefined = $state(); - const playlistLink = `/playlist/${playlist.playlistId}`; + const playlistLink = resolve('/playlist/[playlistId]', { playlistId: playlist.playlistId }); onMount(async () => { if (get(interfaceLowBandwidthMode)) return; @@ -48,7 +48,7 @@ diff --git a/materialious/src/lib/components/Search.svelte b/materialious/src/lib/components/Search.svelte index 29fc6d1e..62375a3f 100644 --- a/materialious/src/lib/components/Search.svelte +++ b/materialious/src/lib/components/Search.svelte @@ -52,7 +52,7 @@ } selectedSuggestionIndex = -1; - goto(resolve(`/search/${encodeURIComponent(searchTrimed)}`)); + goto(resolve(`/search/[search]`, { search: encodeURIComponent(searchTrimed) })); suggestionsForSearch = []; showSearchBox = false; @@ -156,7 +156,7 @@ close
{#if searchSuggestions} - {#each suggestionsForSearch as suggestion, index} + {#each suggestionsForSearch as suggestion, index (index)}
  • { @@ -164,7 +164,7 @@ handleSubmit(); }} class:selected={index === selectedSuggestionIndex} - href={resolve(`/search/${encodeURIComponent(suggestion)}`)} + href={resolve(`/search/[search]`, { search: encodeURIComponent(suggestion) })} >
    {suggestion}
     @@ -172,13 +172,13 @@ {/each} {/if} {#if !suggestionsForSearch.length && $interfaceSearchHistoryEnabled} - {#each $searchHistoryStore as history} + {#each $searchHistoryStore as history (history)}
  • { search = history; }} - href={resolve(`/search/${encodeURIComponent(history)}`)} + href={resolve(`/search/[search]`, { search: encodeURIComponent(history) })} >
    {history}
     diff --git a/materialious/src/lib/components/ShareVideo.svelte b/materialious/src/lib/components/ShareVideo.svelte index 18d55616..30f49375 100644 --- a/materialious/src/lib/components/ShareVideo.svelte +++ b/materialious/src/lib/components/ShareVideo.svelte @@ -34,7 +34,7 @@ if (Capacitor.isNativePlatform()) { url = `${get(instanceStore)}/watch/${video.videoId}`; } else { - url = `${location.origin}`+resolve(`/watch/${video.videoId}`); + url = `${location.origin}${resolve('/watch/[videoId]', { videoId: video.videoId })}`; } if (includeTimestamp && currentTime !== undefined) { url += `?time=${Math.floor(currentTime)}`; diff --git a/materialious/src/lib/components/SyncParty.svelte b/materialious/src/lib/components/SyncParty.svelte index 407ccc11..ebd41295 100644 --- a/materialious/src/lib/components/SyncParty.svelte +++ b/materialious/src/lib/components/SyncParty.svelte @@ -21,7 +21,7 @@ events.events.forEach((event) => { if (event.type === 'change-video' && event.videoId) { - currentUrl.pathname = resolve(`/watch/${event.videoId}`); + currentUrl.pathname = resolve(`/watch/[videoId]`, { videoId: event.videoId }); goto(currentUrl); } else if (event.type === 'goto' && event.path && event.path !== $page.url.pathname) { if (blockedPages.includes(event.path.replace('/', ''))) { @@ -73,7 +73,7 @@ } page.subscribe((newPage) => { - if (!newPage.url.pathname.startsWith(resolve('/watch')) && $syncPartyPeerStore) { + if (!newPage.url.pathname.startsWith(resolve('/watch', {})) && $syncPartyPeerStore) { $syncPartyConnectionsStore?.forEach((conn) => { conn.send({ events: [ @@ -125,7 +125,7 @@ @@ -133,7 +133,7 @@