diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index d2e897e6..aa43c503 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 21 - versionName "1.1.9" + versionCode 22 + versionName "1.1.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/package.json b/materialious/electron/package.json index 8dd5d4de..0b6ad8c4 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.1.9", + "version": "1.1.10", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 76286031..728880d7 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.1.9", + "version": "1.1.10", "private": true, "scripts": { "dev": "vite dev", diff --git a/materialious/src/lib/Comment.svelte b/materialious/src/lib/Comment.svelte index ee7ac4ed..89c0bc82 100644 --- a/materialious/src/lib/Comment.svelte +++ b/materialious/src/lib/Comment.svelte @@ -53,7 +53,7 @@ edit {/if} -

+

{@html commentTimestamps(comment.contentHtml)}

diff --git a/materialious/src/lib/Search.svelte b/materialious/src/lib/Search.svelte index ecbad408..35e341cf 100644 --- a/materialious/src/lib/Search.svelte +++ b/materialious/src/lib/Search.svelte @@ -87,7 +87,7 @@ search (showSearchBox = true)} /> diff --git a/materialious/src/lib/Thumbnail.svelte b/materialious/src/lib/Thumbnail.svelte index 58ba6301..4eec9018 100644 --- a/materialious/src/lib/Thumbnail.svelte +++ b/materialious/src/lib/Thumbnail.svelte @@ -2,15 +2,14 @@ import { createEventDispatcher, onDestroy, onMount } from 'svelte'; import { _ } from 'svelte-i18n'; import { get } from 'svelte/store'; - import { getDeArrow, getThumbnail, getVideo, getVideoProgress } from './Api'; + import { getChannel, getDeArrow, getThumbnail, getVideo, getVideoProgress } from './Api'; import type { Notification, PlaylistPageVideo, Video, VideoBase, VideoPlay } from './Api/model'; - import ShareVideo from './ShareVideo.svelte'; import { cleanNumber, getBestThumbnail, letterCase, + proxyGoogleImage, proxyVideoUrl, - truncate, videoLength } from './misc'; import type { PlayerEvents } from './player'; @@ -39,6 +38,8 @@ let videoPreviewVolume: number = 0.4; let imgHeight: number; + let authorImg: string = ''; + let proxyVideos = get(playerProxyVideosStore); let watchUrl = new URL(`${location.origin}/watch/${video.videoId}`); @@ -77,6 +78,17 @@ else sideways = true; } + async function loadAuthor() { + const channel = await getChannel(video.authorId); + + const authorImgObject = new Image(); + authorImgObject.src = proxyGoogleImage(getBestThumbnail(channel.authorThumbnails)); + + authorImgObject.onload = () => { + authorImg = authorImgObject.src; + }; + } + onMount(async () => { try { thumbnailHidden = localStorage.getItem(`v_h_${video.videoId}`) === '1'; @@ -87,10 +99,15 @@ return; } + // Load author details in background. + loadAuthor(); + // Check if sideways should be enabled or disabled. disableSideways(); - addEventListener('resize', disableSideways); + addEventListener('resize', () => { + disableSideways(); + }); let imageSrc = getBestThumbnail(video.videoThumbnails) as string; @@ -223,20 +240,11 @@ imgHeight = document.getElementById('thumbnail-container')?.clientHeight as number; } - - function hideVideo() { - try { - localStorage.setItem(`v_h_${video.videoId}`, '1'); - dispatch('videoHidden'); - thumbnailHidden = true; - } catch {} - } {#if !thumbnailHidden}
(showVideoPreview = false)} on:focus={() => {}} @@ -250,7 +258,9 @@ on:click={syncChangeVideo} > {#if loading} - + {#if !sideways} +
+ {/if} {:else if loaded} {#if showVideoPreview && videoPreview}
@@ -318,47 +328,36 @@ {/if}
-
- +
{/if} @@ -367,19 +366,6 @@