From 5392d7fea640b95c797bbcacbdf81a15287f0ee0 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Thu, 30 Apr 2026 02:49:11 +1200
Subject: [PATCH] Ensure image is routed through proxy on mobile

---
 .../android/.idea/deploymentTargetSelector.xml         |  2 +-
 materialious/electron/package.json                     |  3 +--
 materialious/electron/src/rt/electron-plugins.js       |  2 --
 .../lib/components/thumbnail/PlaylistThumbnail.svelte  |  4 ++--
 .../src/lib/components/thumbnail/VideoThumbnail.svelte |  4 ++--
 materialious/src/lib/images.ts                         | 10 ++++++++++
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/materialious/android/.idea/deploymentTargetSelector.xml b/materialious/android/.idea/deploymentTargetSelector.xml
index e3239429..e6828002 100644
--- a/materialious/android/.idea/deploymentTargetSelector.xml
+++ b/materialious/android/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-04-29T14:13:42.770873710Z">
+        <DropdownSelection timestamp="2026-04-29T14:41:26.350324296Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="LocalEmulator" identifier="path=/home/wpearce/.android/avd/Pixel_9.avd" />
diff --git a/materialious/electron/package.json b/materialious/electron/package.json
index de533379..8107d177 100644
--- a/materialious/electron/package.json
+++ b/materialious/electron/package.json
@@ -25,7 +25,6 @@
 		"@capacitor-community/electron": "^5.0.0",
 		"@types/jsdom": "^28.0.1",
 		"bgutils-js": "^3.2.0",
-		"capacitor-nodejs": "https://github.com/hampoelz/capacitor-nodejs/releases/download/v1.0.0-beta.9/capacitor-nodejs.tgz",
 		"chokidar": "~5.0.0",
 		"electron-is-dev": "~2.0.0",
 		"electron-serve": "~3.0.0",
@@ -46,4 +45,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 5f312366..b33b2826 100644
--- a/materialious/electron/src/rt/electron-plugins.js
+++ b/materialious/electron/src/rt/electron-plugins.js
@@ -1,6 +1,4 @@
 /* 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/src/lib/components/thumbnail/PlaylistThumbnail.svelte b/materialious/src/lib/components/thumbnail/PlaylistThumbnail.svelte
index dcd80d6d..1964940f 100644
--- a/materialious/src/lib/components/thumbnail/PlaylistThumbnail.svelte
+++ b/materialious/src/lib/components/thumbnail/PlaylistThumbnail.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { getBestThumbnail } from '$lib/images';
+	import { getBestThumbnail, imageHandleCors } from '$lib/images';
 	import { resolve } from '$app/paths';
 	import { letterCase } from '$lib/letterCasing';
 	import { _ } from '$lib/i18n';
@@ -23,7 +23,7 @@
 		thumbnailSrc = playlist.playlistThumbnail;
 	}
 
-	const thumbnail = new Avatar({ src: thumbnailSrc });
+	const thumbnail = new Avatar({ src: imageHandleCors(thumbnailSrc) });
 </script>
 
 <a href={playlistLink} style="width: 100%; overflow: hidden;min-height:100px;" class="wave">
diff --git a/materialious/src/lib/components/thumbnail/VideoThumbnail.svelte b/materialious/src/lib/components/thumbnail/VideoThumbnail.svelte
index 85e17bce..595ee737 100644
--- a/materialious/src/lib/components/thumbnail/VideoThumbnail.svelte
+++ b/materialious/src/lib/components/thumbnail/VideoThumbnail.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { resolve } from '$app/paths';
-	import { getBestThumbnail } from '$lib/images';
+	import { getBestThumbnail, imageHandleCors } from '$lib/images';
 	import { letterCase } from '$lib/letterCasing';
 	import { cleanNumber, videoLength } from '$lib/numbers';
 	import { onDestroy, onMount } from 'svelte';
@@ -78,7 +78,7 @@
 	let thumbnailElement: HTMLElement | undefined = $state();
 
 	const thumbnail = new Avatar({
-		src: () => thumbnailSrc,
+		src: () => imageHandleCors(thumbnailSrc),
 		onLoadingStatusChange: () => {
 			if (thumbnailImageElement) thumbnailHeight = thumbnailImageElement.naturalHeight;
 		}
diff --git a/materialious/src/lib/images.ts b/materialious/src/lib/images.ts
index a92724b7..8cad600f 100644
--- a/materialious/src/lib/images.ts
+++ b/materialious/src/lib/images.ts
@@ -2,6 +2,8 @@ import { get } from 'svelte/store';
 import type { Image } from './api/model';
 import { invidiousInstanceStore } from './store';
 import { isYTBackend } from './misc';
+import { Capacitor } from '@capacitor/core';
+import { corsProxyUrl } from './fetchProxy';
 
 export class ImageCache {
 	private cache = new Map<string, HTMLImageElement>();
@@ -67,3 +69,11 @@ export function proxyGoogleImage(source: string): string {
 
 	return `${get(invidiousInstanceStore)}/ggpht${path}`;
 }
+
+export function imageHandleCors(source: string): string {
+	if (Capacitor.getPlatform() === 'android') {
+		return corsProxyUrl + source;
+	}
+
+	return source;
+}