From 1782f1daf9983be168995f5cf0b1d0e7b2cb254a Mon Sep 17 00:00:00 2001 From: WardPearce Date: Sun, 25 Aug 2024 21:54:17 +1200 Subject: [PATCH 1/2] Bump version --- materialious/android/app/build.gradle | 4 ++-- materialious/electron/package.json | 2 +- materialious/package.json | 2 +- update_versions.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 0f7d8ba7..377dc511 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 17 - versionName "1.1.5" + versionCode 18 + versionName "1.1.6" 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 9feb6bd9..a4ecc3fd 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.1.5", + "version": "1.1.6", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 5c694eb5..f0dc4905 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.1.5", + "version": "1.1.6", "private": true, "scripts": { "dev": "vite dev", diff --git a/update_versions.py b/update_versions.py index 7b75cd54..b1665f71 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.1.5" +LATEST_VERSION = "1.1.6" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json") From b450f7af5684797f4269cc4db15c3d3eb1fb91cd Mon Sep 17 00:00:00 2001 From: WardPearce Date: Sun, 25 Aug 2024 22:03:27 +1200 Subject: [PATCH 2/2] Proxy static google content --- materialious/src/lib/ChannelThumbnail.svelte | 4 ++-- materialious/src/lib/Comment.svelte | 4 ++-- materialious/src/lib/misc.ts | 10 +++++++--- .../src/routes/(app)/channel/[slug]/+page.svelte | 4 ++-- .../src/routes/(app)/watch/[slug]/+page.svelte | 3 ++- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/materialious/src/lib/ChannelThumbnail.svelte b/materialious/src/lib/ChannelThumbnail.svelte index 88828ab3..28b88f72 100644 --- a/materialious/src/lib/ChannelThumbnail.svelte +++ b/materialious/src/lib/ChannelThumbnail.svelte @@ -2,7 +2,7 @@ import { onMount } from 'svelte'; import { _ } from 'svelte-i18n'; import type { Channel } from './Api/model'; - import { cleanNumber, getBestThumbnail, truncate } from './misc'; + import { cleanNumber, getBestThumbnail, proxyGoogleImage, truncate } from './misc'; export let channel: Channel; @@ -12,7 +12,7 @@ onMount(() => { img = new Image(); - img.src = getBestThumbnail(channel.authorThumbnails) || ''; + img.src = proxyGoogleImage(getBestThumbnail(channel.authorThumbnails)) || ''; img.onload = () => { loading = false; diff --git a/materialious/src/lib/Comment.svelte b/materialious/src/lib/Comment.svelte index e64a312e..a79a9724 100644 --- a/materialious/src/lib/Comment.svelte +++ b/materialious/src/lib/Comment.svelte @@ -2,7 +2,7 @@ import { _ } from 'svelte-i18n'; import { getComments } from './Api'; import { type Comment, type Comments } from './Api/model'; - import { getBestThumbnail, numberWithCommas } from './misc'; + import { getBestThumbnail, numberWithCommas, proxyGoogleImage } from './misc'; export let comment: Comment; export let videoId: string; @@ -33,7 +33,7 @@
comment profile
diff --git a/materialious/src/lib/misc.ts b/materialious/src/lib/misc.ts index b07554d8..4d1fd04c 100644 --- a/materialious/src/lib/misc.ts +++ b/materialious/src/lib/misc.ts @@ -170,6 +170,10 @@ export function proxyVideoUrl(source: string): string { return rawSrc.toString(); } +export function proxyGoogleImage(source: string): string { + return `${get(instanceStore)}/ggpht${new URL(source).pathname}`; +} + export function unsafeRandomItem(array: any[]): any { return array[Math.floor(Math.random() * array.length)]; } @@ -206,14 +210,14 @@ export function getBestThumbnail( images: Image[] | null, maxWidthDimension: number = 480, maxHeightDimension = 360 -): string | null { +): string { if (images && images.length > 0) { images = images.filter( (image) => image.width < maxWidthDimension && image.height < maxHeightDimension ); if (images.length === 0) { - return null; + return ''; } images.sort((a, b) => { @@ -222,7 +226,7 @@ export function getBestThumbnail( return images[0].url; } else { - return null; + return ''; } } diff --git a/materialious/src/routes/(app)/channel/[slug]/+page.svelte b/materialious/src/routes/(app)/channel/[slug]/+page.svelte index 42abb28b..ad1838cb 100644 --- a/materialious/src/routes/(app)/channel/[slug]/+page.svelte +++ b/materialious/src/routes/(app)/channel/[slug]/+page.svelte @@ -4,7 +4,7 @@ import PageLoading from '$lib/PageLoading.svelte'; import PlaylistThumbnail from '$lib/PlaylistThumbnail.svelte'; import Thumbnail from '$lib/Thumbnail.svelte'; - import { cleanNumber, getBestThumbnail } from '$lib/misc'; + import { cleanNumber, getBestThumbnail, proxyGoogleImage } from '$lib/misc'; import { activePageStore, authStore } from '$lib/store'; import { Capacitor } from '@capacitor/core'; import { onMount } from 'svelte'; @@ -85,7 +85,7 @@ Channel profile diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte index e3f048f5..0642529b 100644 --- a/materialious/src/routes/(app)/watch/[slug]/+page.svelte +++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte @@ -20,6 +20,7 @@ getBestThumbnail, letterCase, numberWithCommas, + proxyGoogleImage, unsafeRandomItem } from '$lib/misc'; import type { PlayerEvents } from '$lib/player'; @@ -422,7 +423,7 @@