From d994809c1e502e59641286ee275bf861e545d003 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Sat, 20 Sep 2025 01:29:20 +1200 Subject: [PATCH] Bump version --- materialious/android/app/build.gradle | 4 +- .../electron/materialious.metainfo.xml | 6 ++- materialious/electron/package-lock.json | 4 +- materialious/electron/package.json | 2 +- materialious/package-lock.json | 4 +- materialious/package.json | 2 +- .../patches/shaka-player+4.11.7.patch | 39 ------------------- materialious/src/lib/patches/youtubejs.ts | 8 ++-- update_versions.py | 2 +- 9 files changed, 19 insertions(+), 52 deletions(-) delete mode 100644 materialious/patches/shaka-player+4.11.7.patch diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 3218a8a9..9ad0aa93 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 150 - versionName "1.10.9" + versionCode 151 + versionName "1.10.10" 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 51d69684..0db33502 100644 --- a/materialious/electron/materialious.metainfo.xml +++ b/materialious/electron/materialious.metainfo.xml @@ -67,7 +67,11 @@ - + + + https://github.com/Materialious/Materialious/releases/tag/1.10.10 + + https://github.com/Materialious/Materialious/releases/tag/1.10.9 diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json index bbc5958d..670214df 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.10.7", + "version": "1.10.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.10.7", + "version": "1.10.9", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", diff --git a/materialious/electron/package.json b/materialious/electron/package.json index b58d968b..afdb6eda 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.10.9", + "version": "1.10.10", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package-lock.json b/materialious/package-lock.json index c5b61813..3ef2eaa2 100644 --- a/materialious/package-lock.json +++ b/materialious/package-lock.json @@ -1,12 +1,12 @@ { "name": "materialious", - "version": "1.10.7", + "version": "1.10.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "materialious", - "version": "1.10.7", + "version": "1.10.9", "hasInstallScript": true, "dependencies": { "@capacitor-community/electron": "^5.0.1", diff --git a/materialious/package.json b/materialious/package.json index 42a64935..c57ed81f 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.10.9", + "version": "1.10.10", "private": true, "scripts": { "dev": "vite dev", diff --git a/materialious/patches/shaka-player+4.11.7.patch b/materialious/patches/shaka-player+4.11.7.patch deleted file mode 100644 index 359f2e50..00000000 --- a/materialious/patches/shaka-player+4.11.7.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/node_modules/shaka-player/dist/shaka-player.compiled.d.ts b/node_modules/shaka-player/dist/shaka-player.compiled.d.ts -index 19c0930..cc0a3fd 100644 ---- a/node_modules/shaka-player/dist/shaka-player.compiled.d.ts -+++ b/node_modules/shaka-player/dist/shaka-player.compiled.d.ts -@@ -5117,3 +5117,5 @@ declare namespace shaka.extern { - declare namespace shaka.extern { - type TransmuxerPlugin = ( ) => shaka.extern.Transmuxer ; - } -+ -+export default shaka; -diff --git a/node_modules/shaka-player/dist/shaka-player.ui.d.ts b/node_modules/shaka-player/dist/shaka-player.ui.d.ts -index 1618ca0..a6076c6 100644 ---- a/node_modules/shaka-player/dist/shaka-player.ui.d.ts -+++ b/node_modules/shaka-player/dist/shaka-player.ui.d.ts -@@ -5830,3 +5830,5 @@ declare namespace shaka.extern { - declare namespace shaka.extern { - type UIVolumeBarColors = { base : string , level : string } ; - } -+ -+export default shaka; -diff --git a/node_modules/shaka-player/index.d.ts b/node_modules/shaka-player/index.d.ts -new file mode 100644 -index 0000000..3ebfd96 ---- /dev/null -+++ b/node_modules/shaka-player/index.d.ts -@@ -0,0 +1,2 @@ -+/// -+/// -\ No newline at end of file -diff --git a/node_modules/shaka-player/ui.d.ts b/node_modules/shaka-player/ui.d.ts -new file mode 100644 -index 0000000..84a3be0 ---- /dev/null -+++ b/node_modules/shaka-player/ui.d.ts -@@ -0,0 +1,3 @@ -+import shaka from 'shaka-player/dist/shaka-player.ui' -+export * from 'shaka-player/dist/shaka-player.ui' -+export default shaka; -\ No newline at end of file \ No newline at end of file diff --git a/materialious/src/lib/patches/youtubejs.ts b/materialious/src/lib/patches/youtubejs.ts index bd49b591..6431e047 100644 --- a/materialious/src/lib/patches/youtubejs.ts +++ b/materialious/src/lib/patches/youtubejs.ts @@ -10,7 +10,7 @@ import type { import { fromFormat } from '$lib/sabr/formatKeyUtils'; import { interfaceRegionStore, poTokenCacheStore } from '$lib/store'; import { Capacitor } from '@capacitor/core'; -import { USER_AGENT } from 'bgutils-js'; +import BG, { USER_AGENT } from 'bgutils-js'; import { get } from 'svelte/store'; import { Innertube, UniversalCache, Utils, YT, YTNodes } from 'youtubei.js'; @@ -39,8 +39,10 @@ export async function patchYoutubeJs(videoId: string): Promise { ? androidPoTokenMinter : window.electronAPI.generatePoToken; - poTokenCacheStore.set( - await platformMinter(challengeResponse.bg_challenge, requestKey, visitorData) + poTokenCacheStore.set(BG.PoToken.generateColdStartToken(visitorData)); + + platformMinter(challengeResponse.bg_challenge, requestKey, visitorData).then((poToken) => + poTokenCacheStore.set(poToken) ); const extraArgs: Record = { diff --git a/update_versions.py b/update_versions.py index d4fcb394..db71ce42 100644 --- a/update_versions.py +++ b/update_versions.py @@ -3,7 +3,7 @@ import os import re from datetime import datetime -LATEST_VERSION = "1.10.9" +LATEST_VERSION = "1.10.10" 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")