Merge pull request #1126 from Materialious/update/1.10.13

Use videoid for content binding
2025-10-08 18:42:27 +13:00
parent f4d35d199f ae3448b753
commit 8c39d255ec
14 changed files with 141 additions and 123 deletions
@@ -98,18 +98,14 @@ I've commented out places what aren't relevant but might be in the future.-->
    </td>
  </tr>
  <tr>
-  <!-- <tr>
-    <td>iOS</td>
+    <td>Android TV</td>
    <td>
-      <a href="https://github.com/">
-        <img width="220" alt="Download iOS IPA" src="https://github.com/user-attachments/assets/3e50d93d-fb39-435c-be6b-337745f7c423">
+      <a href="https://github.com/rumboalla/apkupdater">
+          For Android TV use APKUpdater.
      </a>
-      <br/>
-      <blockquote style="color:red">
-        *iPA file only. Requires sideloading with <a href="https://altstore.io/">AltStore</a> or similar tools.
-      </blockquote>
    </td>
-  </tr> -->
+  </tr>
+  <tr>
  <tr>
    <td>Flatpak</td>
    <td>
@@ -136,13 +132,6 @@ I've commented out places what aren't relevant but might be in the future.-->
      <p>Then run: <code>sudo apt install ./Materialious-linux-amd64.deb</code></p>
    </td>
  </tr>
-  <!-- <tr>
-    <td>Arch/Manjaro</td>
-    <td>
-      <p>With pamac: <code>sudo pamac install spotube-bin</code></p>
-      <p>With yay: <code>yay -Sy spotube-bin</code></p>
-    </td>
-  </tr> -->
  <tr>
    <td>Fedora/OpenSuse</td>
    <td>
@@ -161,34 +150,6 @@ I've commented out places what aren't relevant but might be in the future.-->
      </a>
    </td>
  </tr>
-  <!-- <tr>
-    <td>Macos - <a href="https://brew.sh">Homebrew</a></td>
-    <td>
-<pre lang="bash">
-brew tap krtirtho/apps
-brew install --cask spotube
-</pre>
-    </td>
-  </tr>
-  <tr>
-    <td>Windows - <a href="https://chocolatey.org">Chocolatey</a></td>
-    <td>
-      <p><code>choco install spotube</code></p>
-    </td>
-  </tr>
-  <tr>
-    <td>Windows - <a href="https://scoop.sh">Scoop</a></td>
-    <td>
-      <p><code>scoop bucket add extras</code></p>
-      <p><code>scoop install spotube</code></p>
-    </td>
-  </tr>
-  <tr>
-    <td>Windows - <a href="https://github.com/microsoft/winget-cli">WinGet</a></td>
-    <td>
-      <p><code>winget install --id KRTirtho.Spotube</code></p>
-    </td>
-  </tr> -->
 </table>

 # Translations
@@ -4,10 +4,10 @@
    <selectionStates>
      <SelectionState runConfigName="app">
        <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-10-07T14:49:15.931464993Z">
+        <DropdownSelection timestamp="2025-10-08T03:32:17.403921789Z">
          <Target type="DEFAULT_BOOT">
            <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/home/ward/.android/avd/Pixel_9.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/home/ward/.android/avd/Television_4K.avd" />
            </handle>
          </Target>
        </DropdownSelection>
@@ -7,8 +7,8 @@ android {
        applicationId "us.materialio.app"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 153
-        versionName "1.10.12"
+        versionCode 154
+        versionName "1.10.13"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        aaptOptions {
             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -70,7 +70,11 @@
    
    
    
-    <release version="1.10.12" date="2025-10-07">
+    
+    <release version="1.10.13" date="2025-10-08">
+      <url>https://github.com/Materialious/Materialious/releases/tag/1.10.13</url>
+    </release>
+<release version="1.10.12" date="2025-10-07">
      <url>https://github.com/Materialious/Materialious/releases/tag/1.10.12</url>
    </release>
 <release version="1.10.11" date="2025-9-25">
@@ -1,12 +1,12 @@
 {
 	"name": "Materialious",
-	"version": "1.10.12",
+	"version": "1.10.13",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "Materialious",
-			"version": "1.10.12",
+			"version": "1.10.13",
 			"license": "MIT",
 			"dependencies": {
 				"@capacitor-community/electron": "^5.0.0",
@@ -1,6 +1,6 @@
 {
 	"name": "Materialious",
-	"version": "1.10.12",
+	"version": "1.10.13",
 	"description": "Modern material design for Invidious.",
 	"author": {
 		"name": "Ward Pearce",
@@ -44,4 +44,4 @@
 		"capacitor",
 		"electron"
 	]
-}
+}
@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.10.12",
+	"version": "1.10.13",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
@@ -0,0 +1,81 @@
+<script lang="ts">
+	import { _ } from '$lib/i18n';
+	import { onMount } from 'svelte';
+
+	let ghContributors: { login: string; avatar_url: string; type: 'Bot' | 'User' }[] = $state([]);
+	onMount(() => {
+		fetch('https://api.github.com/repos/Materialious/Materialious/contributors', {
+			priority: 'low'
+		}).then(async (resp) => {
+			if (!resp.ok) {
+				return;
+			}
+
+			ghContributors = await resp.json();
+		});
+	});
+</script>
+
+<p>
+	Materialious is a modern material design frontend for Invidious, focused on a clean,
+	privacy-friendly YouTube experience. It supports local video fallback when Invidious fails and is
+	available on Web, Desktop, Android, and Android TV.
+</p>
+
+<div class="grid">
+	<div class="s12 m4 l4">
+		<a href="https://github.com/sponsors/WardPearce" target="_blank" referrerpolicy="no-referrer">
+			<article>
+				<i>favorite</i>
+				<span>{$_('donate')}</span>
+			</article>
+		</a>
+	</div>
+	<div class="s12 m4 l4">
+		<a
+			href="https://github.com/Materialious/Materialious"
+			target="_blank"
+			referrerpolicy="no-referrer"
+		>
+			<article>
+				<i>code</i>
+				<span>GitHub</span>
+			</article>
+		</a>
+	</div>
+	<div class="s12 m4 l4">
+		<article>
+			<span>{$_('version')}</span>
+			<span>{import.meta.env.APP_VERSION}</span>
+		</article>
+	</div>
+</div>
+
+<h4>{$_('contributors')}</h4>
+
+<div class="grid">
+	{#each ghContributors as contributor}
+		{#if contributor.type === 'User'}
+			<div class="s12 m4 l4">
+				<article>
+					<img class="circle" src={contributor.avatar_url} alt={contributor.login} />
+					<p>{contributor.login}</p>
+				</article>
+			</div>
+		{/if}
+	{/each}
+</div>
+
+<style>
+	a,
+	article {
+		width: 100%;
+		height: 100%;
+	}
+	article {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+	}
+</style>
@@ -1,16 +0,0 @@
-<script lang="ts">
-	import { instanceStore } from '$lib/store';
-	import { _ } from '$lib/i18n';
-	import { get } from 'svelte/store';
-</script>
-
-<p style="width: 240px;">
-	<a
-		href={`${get(instanceStore)}/preferences`}
-		target="_blank"
-		rel="noopener noreferrer"
-		class="link"
-	>
-		{$_('layout.dataPreferences.content')}
-	</a>
-</p>
@@ -2,13 +2,13 @@
 	import { onMount } from 'svelte';
 	import { _ } from '$lib/i18n';
 	import ApiExtended from './ApiExtended.svelte';
-	import DataPreferences from './DataPreferences.svelte';
 	import DeArrow from './DeArrow.svelte';
 	import Interface from './Interface.svelte';
 	import Player from './Player.svelte';
 	import Ryd from './RYD.svelte';
 	import SponsorBlock from './SponsorBlock.svelte';
-	import { isAndroidTvStore } from '$lib/store';
+	import { instanceStore, isAndroidTvStore } from '$lib/store';
+	import About from './About.svelte';

 	let activeTab = $state('interface');
 	const isActive = (id: string) => activeTab === id;
@@ -24,6 +24,12 @@
 			label: $_('layout.deArrow.title'),
 			icon: 'keyboard_double_arrow_down',
 			component: DeArrow
+		},
+		{
+			id: 'about',
+			label: $_('layout.about'),
+			icon: 'info',
+			component: About
 		}
 	];

@@ -83,7 +89,7 @@

 	<div>
 		<nav class="tabbed small" style="outline: none" role="tablist" tabindex="0">
-			{#each tabs as tab, i}
+			{#each tabs as tab, index}
 				<a
 					role="tab"
 					class:active={isActive(tab.id)}
@@ -92,40 +98,33 @@
 					aria-controls={`panel-${tab.id}`}
 					tabindex={isActive(tab.id) ? 0 : -1}
 					onclick={() => (activeTab = tab.id)}
-					onkeydown={(event) => onKeydown(event, i)}
+					onkeydown={(event) => onKeydown(event, index)}
 				>
 					<i>{tab.icon}</i>
 					<span>{tab.label}</span>
 				</a>
 			{/each}
 			{#if !$isAndroidTvStore}
-				<a
-					role="tab"
-					class:active={isActive('data')}
-					aria-selected={isActive('data')}
-					id="tab-data"
-					aria-controls="panel-data"
-					tabindex="0"
-					onclick={() => (activeTab = 'data')}
-				>
-					<i>save</i>
-					<span>{$_('layout.dataPreferences.dataPreferences')}</span>
-				</a>
-				<a
-					href="https://github.com/sponsors/WardPearce"
-					target="_blank"
-					referrerpolicy="no-referrer"
-				>
-					<i>favorite</i>
-					<span>{$_('donate')}</span>
-				</a>
-				<a
-					href="https://github.com/Materialious/Materialious"
-					target="_blank"
-					referrerpolicy="no-referrer"
-				>
-					<i>code</i>
-					<span>GitHub</span>
+				<a href={`${$instanceStore}/preferences`} target="_blank" referrerpolicy="no-referrer">
+					<i>
+						<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg">
+							<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"
+								><path
+									d="M244.2 502.3c-25.1-1-49.2-5.4-72.6-13.3-77.4-26.1-138-87.1-161.3-162.4C.2 294.1-2.5 258 2.3 222.3c4.7-34.9 17.3-68 37.3-98.2 15.3-23.2 37-46.1 60-63.3 46.9-35.1 109.2-54 168.2-51 32.9 1.7 63.4 8.6 92.9 21.1 10.4 4.4 25.4 12.3 35.2 18.5 18 11.3 28.4 19.7 43.8 35 16.8 16.8 28.1 30.8 38.6 48.1 9.2 15.1 17.9 34.5 23.2 51.3 2 6.5 5.6 20.9 7.2 28.8 3 15.1 3.4 20 3.4 42.3 0 23.5-.6 31-3.7 46.7-11.8 59.6-45.2 112-95.1 149.4-29 21.7-63.5 37.5-99.8 45.5-21.3 4.8-45.1 6.7-69.3 5.8m-44.6-100.1c0-.7-.1-2.6-.2-4.3l-.2-3.1-6-.3c-5.1-.3-6.1-.4-6.8-1-2.6-1.9-1.9-7.7 2.9-23.4 1.1-3.7 4.2-14.4 7-23.8 2.7-9.5 6.6-22.7 8.6-29.3 2-6.7 5.3-18.1 7.4-25.5 2.1-7.3 4.6-15.8 5.5-18.8s4.1-14 7.2-24.5c6.3-21.6 10.4-35.2 11.4-37.9.7-1.8.7-1.8 1.3-1.2.3.3 4.9 9.4 10.1 20.1 5.3 10.7 16.6 33.8 25.3 51.2 21.8 44.1 48.1 97.3 55 111.3l5.8 11.8 14.4-.1c7.9-.1 14.8-.2 15.2-.4.7-.3.7-.4-1.7-5.5-1.4-2.9-10.3-21.1-20-40.5-62.1-125-78-157.4-86.5-176-6-13.1-8.8-18.8-9.8-20-1.1-1.2-2.1-1.4-3-.3-1.5 1.7-5.2 12.8-11.9 35.9-2.6 9-8.3 28.5-12.6 43.3-8.4 28.7-10.8 36.9-18.2 62.1-2.6 8.8-6.1 20.8-7.8 26.6s-5.1 17.5-7.6 26.1c-5.5 18.9-7.8 26.5-9.4 30.8-2.7 7.3-3.3 8-6.3 8.6-1.1.2-3.1.4-4.3.4-2.8 0-4.5.5-5.2 1.4-.5.8-.7 6.2-.2 7 .3.4 3.1.5 29.6.7l10.9.1zm46.7-261.1c5.5-1.2 10.7-6.3 12-11.7.5-2 .4-6.3-.1-8.2-1.1-4-4.2-8-7.7-9.9-4.8-2.6-12-2.6-16.9 0-7.6 4.1-10.4 14.1-6.1 22.1 3.5 6.4 10.7 9.4 18.8 7.7"
+									style="fill:#f0f0f0"
+								/><path
+									d="M2712.8 5196.2c-157.5-82.6-156.2-323.9 3.8-405.2 109.2-55.9 249-20.3 313.7 78.8 73.7 110.5 33 268-85.1 327.7-64.7 33-167.6 33-232.4-1.3z"
+									style="fill:#00b6f0;stroke:#00b6f0;stroke-width:.297;stroke-miterlimit:10"
+									transform="matrix(.0699 0 0 -.0699 44.236 474.48)"
+								/><path
+									d="M2833.5 4483.6c-15.2-20.3-80-210.9-129.6-384.9-38.1-132.1-128.3-444.6-209.6-717.7-25.4-87.6-73.7-252.8-108-368.4-33-115.6-81.3-280.7-108-368.4-25.4-87.6-73.7-252.8-108-368.4-33-115.6-81.3-280.7-108-368.4-25.4-87.6-72.4-247.7-102.9-355.7-74.9-262.9-118.1-379.8-146.1-393.8-12.7-7.6-44.5-12.7-71.1-12.7-92.7 0-106.7-10.2-102.9-68.6l3.8-52.1 289.6-3.8 289.6-2.5-3.8 59.7-3.8 61-92.7 3.8c-83.8 3.8-94 6.4-106.7 34.3-16.5 35.6 0 132.1 47 285.8 16.5 52.1 59.7 198.2 95.3 323.9 35.6 125.8 83.8 292.2 108 368.4 22.9 77.5 71.1 242.6 108 368.4 35.6 125.8 83.8 292.2 108 368.4 22.9 77.5 71.1 242.6 108 368.4 108 377.3 156.2 532.2 166.4 544.9 6.4 6.4 21.6-14 35.6-44.5 12.7-30.5 243.9-499.2 511.9-1040.3s567.8-1145.7 664.3-1343.9l176.6-358.2h213.4c116.9 0 213.4 5.1 213.4 10.2s-95.3 200.7-210.9 434.4C3613.4 2965.6 3129.4 3950 3048.2 4130.4c-36.8 80-87.6 191.8-113.1 247.7-55.9 120.8-73.7 139.8-101.6 105.5"
+									style="fill:#575757"
+									transform="matrix(.0699 0 0 -.0699 44.236 474.48)"
+								/></svg
+							>
+						</svg>
+					</i>
+					<span>{$_('layout.settings')}</span>
 				</a>
 			{/if}
 		</nav>
@@ -143,18 +142,6 @@
 				<tab.component />
 			</div>
 		{/each}
-		<div
-			class="page padding"
-			id="panel-data"
-			role="tabpanel"
-			aria-labelledby="tab-data"
-			hidden={!isActive('data')}
-			inert={!$isAndroidTvStore && !isActive('data')}
-			aria-hidden={!isActive('data')}
-			class:active={isActive('data')}
-		>
-			<DataPreferences />
-		</div>
 	</div>
 </dialog>

@@ -25,7 +25,9 @@
 	"reply": "reply",
 	"replies": "replies",
 	"region": "Region",
+	"contributors": "Contributors",
 	"noResult": "No results",
+	"version": "Version",
 	"language": "Language",
 	"channels": "channels",
 	"transcript": "Transcript",
@@ -113,6 +115,7 @@
 		"interface": "Interface",
 		"star": "Star us on Github!",
 		"syncParty": "Sync party",
+		"about": "About",
 		"syncPartyWarning": "Please note your IP will be visible to users you invite.",
 		"startSyncParty": "Start sync party",
 		"endSyncParty": "End sync party",
@@ -140,10 +143,6 @@
 		"expandComments": "Expand comments by default",
 		"allowInsecureRequests": "Allow insecure requests",
 		"disableAutoUpdate": "Disable automatic updates",
-		"dataPreferences": {
-			"content": "Looking to import/export subscriptions, change password or delete account? Click here and scroll to the bottom of the page.",
-			"dataPreferences": "Data preferences"
-		},
 		"player": {
 			"title": "Player",
 			"autoPlay": "Autoplay video",
@@ -26,8 +26,6 @@ export async function patchYoutubeJs(videoId: string): Promise<VideoPlay> {
 		player_id: '0004de42'
 	});

-	const visitorData = youtube.session.context.client.visitorData ?? '';
-
 	const requestKey = 'O43z0dpjhgX20SCx4KAo';

 	const platformMinter =
@@ -64,11 +62,11 @@ export async function patchYoutubeJs(videoId: string): Promise<VideoPlay> {
 	}

 	if (video.basic_info.is_live) {
-		poTokenCacheStore.set(await platformMinter(requestKey, visitorData));
+		poTokenCacheStore.set(await platformMinter(requestKey, videoId));
 	} else {
-		poTokenCacheStore.set(BG.PoToken.generateColdStartToken(visitorData));
+		poTokenCacheStore.set(BG.PoToken.generateColdStartToken(videoId));

-		platformMinter(requestKey, visitorData).then((poToken) => poTokenCacheStore.set(poToken));
+		platformMinter(requestKey, videoId).then((poToken) => poTokenCacheStore.set(poToken));
 	}

 	let dashUri: string | undefined;
@@ -1,6 +1,7 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import { SvelteKitPWA } from '@vite-pwa/sveltekit';
 import { defineConfig } from 'vite';
+import pkg from './package.json';

 export default defineConfig({
 	plugins: [
@@ -36,5 +37,8 @@ export default defineConfig({
 	],
 	ssr: {
 		noExternal: ['beercss']
+	},
+	define: {
+		'import.meta.env.APP_VERSION': JSON.stringify(pkg.version)
 	}
 });
@@ -3,7 +3,7 @@ import os
 import re
 from datetime import datetime

-LATEST_VERSION = "1.10.12"
+LATEST_VERSION = "1.10.13"
 RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d")  # Format: YYYY-M-D

 WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")