diff --git a/materialious/Dockerfile b/materialious/Dockerfile index 7c47e49c..0a25e0d5 100644 --- a/materialious/Dockerfile +++ b/materialious/Dockerfile @@ -18,7 +18,7 @@ RUN echo "VITE_DEFAULT_INVIDIOUS_INSTANCE=VITE_DEFAULT_INVIDIOUS_INSTANCE_PLACEH echo "VITE_DEFAULT_PEERJS_PATH=VITE_DEFAULT_PEERJS_PATH_PLACEHOLDER" >> .env && \ echo "VITE_DEFAULT_PEERJS_PORT=VITE_DEFAULT_PEERJS_PORT_PLACEHOLDER" >> .env && \ echo "VITE_DEFAULT_SYNCIOUS_INSTANCE=VITE_DEFAULT_SYNCIOUS_INSTANCE_PLACEHOLDER" >> .env && \ - echo "VITE_DEFAULT_SETTINGS=VITE_DEFAULT_SETTINGS_PLACEHOLDER" >> .env && \ + echo "VITE_DEFAULT_SETTINGS='\"VITE_DEFAULT_SETTINGS_PLACEHOLDER\"'" >> .env && \ echo "VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE=VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE_PLACEHOLDER" >> .env # Install dependencies and build the project diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 53b2d061..053d132c 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 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.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/package.json b/materialious/electron/package.json index 110d6d0e..ac0a3b2d 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.0.7", + "version": "1.0.8", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 299254c9..23c18eb3 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.0.7", + "version": "1.0.8", "private": true, "scripts": { "dev": "vite dev", diff --git a/materialious/src/lib/externalSettings.ts b/materialious/src/lib/externalSettings.ts index 9ce4ba3f..66570a97 100644 --- a/materialious/src/lib/externalSettings.ts +++ b/materialious/src/lib/externalSettings.ts @@ -168,12 +168,25 @@ function setStores(toSet: Record) { } export function loadSettingsFromEnv() { + if (typeof import.meta.env.VITE_DEFAULT_SETTINGS !== 'string') return; + + // If $VITE_DEFAULT_SETTINGS is passed via docker, it will be wrapped with quotations. + let defaultSettingsJson = import.meta.env.VITE_DEFAULT_SETTINGS; + + if (defaultSettingsJson.startsWith('"')) { + defaultSettingsJson = defaultSettingsJson.slice(1); + } + + if (defaultSettingsJson.endsWith('"')) { + defaultSettingsJson = defaultSettingsJson.slice(0, -1); + } + try { - if (typeof import.meta.env.VITE_DEFAULT_SETTINGS !== 'undefined') { - const defaultSettings = JSON.parse(import.meta.env.VITE_DEFAULT_SETTINGS); - setStores(defaultSettings); - } - } catch { } + const defaultSettings = JSON.parse(defaultSettingsJson); + setStores(defaultSettings); + } catch (error) { + console.log(error); + } } export function bookmarkletSaveToUrl(): string { diff --git a/materialious/src/routes/search/[slug]/+page.svelte b/materialious/src/routes/search/[slug]/+page.svelte index 8944fb3e..8a1a4454 100644 --- a/materialious/src/routes/search/[slug]/+page.svelte +++ b/materialious/src/routes/search/[slug]/+page.svelte @@ -37,7 +37,7 @@ } -
+