diff --git a/materialious/src/lib/api/index.ts b/materialious/src/lib/api/index.ts index d7414cd1..49e6ab4d 100644 --- a/materialious/src/lib/api/index.ts +++ b/materialious/src/lib/api/index.ts @@ -33,7 +33,7 @@ import type { } from './model'; import { commentsSetDefaults, searchSetDefaults, useEngineFallback } from './misc'; import { getSearchYTjs } from './youtubejs/search'; -import { isYTBackend } from '$lib/misc'; +import { isUnrestrictedPlatform, isYTBackend } from '$lib/misc'; import { getSearchSuggestionsYTjs } from './youtubejs/searchSuggestions'; import { getResolveUrlYTjs } from './youtubejs/misc'; import { getCommentsYTjs } from './youtubejs/comments'; @@ -110,7 +110,7 @@ export async function getVideo( fetchOptions?: RequestInit ): Promise { if ( - (get(playerYouTubeJsAlways) && Capacitor.isNativePlatform()) || + (get(playerYouTubeJsAlways) && isUnrestrictedPlatform()) || isYTBackend() || useEngineFallback('Video') ) { @@ -119,7 +119,7 @@ export async function getVideo( const resp = await fetch(setRegion(buildPath(`videos/${videoId}?local=${local}`)), fetchOptions); - if (!resp.ok && get(playerYouTubeJsFallback) && Capacitor.isNativePlatform()) { + if (!resp.ok && get(playerYouTubeJsFallback) && isUnrestrictedPlatform()) { return await getVideoYTjs(videoId); } else { await fetchErrorHandle(resp); diff --git a/materialious/src/lib/api/misc.ts b/materialious/src/lib/api/misc.ts index 30e4cb8e..dee11df4 100644 --- a/materialious/src/lib/api/misc.ts +++ b/materialious/src/lib/api/misc.ts @@ -2,6 +2,7 @@ import { get } from 'svelte/store'; import type { CommentsOptions, SearchOptions } from './model'; import { engineFallbacksStore } from '$lib/store'; import { Capacitor } from '@capacitor/core'; +import { isUnrestrictedPlatform } from '$lib/misc'; export function searchSetDefaults(options: SearchOptions) { if (typeof options.sort_by === 'undefined') { @@ -34,5 +35,5 @@ export type EngineFallback = | 'Playlist'; export function useEngineFallback(fallback: EngineFallback): boolean { - return get(engineFallbacksStore).includes(fallback) && Capacitor.isNativePlatform(); + return get(engineFallbacksStore).includes(fallback) && isUnrestrictedPlatform(); } diff --git a/materialious/src/lib/api/youtubejs/video.ts b/materialious/src/lib/api/youtubejs/video.ts index 6f447a06..ce915f67 100644 --- a/materialious/src/lib/api/youtubejs/video.ts +++ b/materialious/src/lib/api/youtubejs/video.ts @@ -15,6 +15,7 @@ import { get } from 'svelte/store'; import type { Types } from 'youtubei.js'; import { Utils, YT, YTNodes, Platform } from 'youtubei.js'; import { getInnertube } from '.'; +import { isUnrestrictedPlatform } from '$lib/misc'; Platform.shim.eval = async ( data: Types.BuildScriptResult, @@ -36,7 +37,7 @@ Platform.shim.eval = async ( }; export async function getVideoYTjs(videoId: string): Promise { - if (!Capacitor.isNativePlatform()) { + if (!isUnrestrictedPlatform()) { throw new Error('Platform not supported'); } diff --git a/materialious/src/lib/components/Player.svelte b/materialious/src/lib/components/Player.svelte index 3146aba0..4efd39ff 100644 --- a/materialious/src/lib/components/Player.svelte +++ b/materialious/src/lib/components/Player.svelte @@ -58,7 +58,7 @@ import { Network, type ConnectionStatus } from '@capacitor/network'; import { fade } from 'svelte/transition'; import { addToast } from './Toast.svelte'; - import { isMobile, isYTBackend, truncate } from '$lib/misc'; + import { isMobile, isUnrestrictedPlatform, isYTBackend, truncate } from '$lib/misc'; import { generateThumbnailWebVTT, drawTimelineThumbnail, @@ -524,7 +524,7 @@ dashUrl = data.video.dashUrl; } - if (!data.video.fallbackPatch && (!Capacitor.isNativePlatform() || $playerProxyVideosStore)) { + if (!data.video.fallbackPatch && (!isUnrestrictedPlatform() || $playerProxyVideosStore)) { dashUrl += '?local=true'; } @@ -1035,7 +1035,7 @@ console.error(error); if ( - !Capacitor.isNativePlatform() || + !isUnrestrictedPlatform() || data.video.fallbackPatch === 'youtubejs' || (error as shaka.extern.Error).code !== 1001 ) diff --git a/materialious/src/lib/components/ShareVideo.svelte b/materialious/src/lib/components/ShareVideo.svelte index c1d1bbf8..1d75fc0a 100644 --- a/materialious/src/lib/components/ShareVideo.svelte +++ b/materialious/src/lib/components/ShareVideo.svelte @@ -5,7 +5,7 @@ import { _ } from '$lib/i18n'; import { get } from 'svelte/store'; import type { Notification, PlaylistPageVideo, Video, VideoBase } from '../api/model'; - import { shareURL } from '$lib/misc'; + import { isUnrestrictedPlatform, shareURL } from '$lib/misc'; import { addToast } from './Toast.svelte'; interface Props { @@ -45,7 +45,7 @@ class="row" role="presentation" onclick={async () => { - if (Capacitor.isNativePlatform()) { + if (isUnrestrictedPlatform()) { shareVideo(`${get(instanceStore)}/watch/${video.videoId}`); } else { shareVideo( diff --git a/materialious/src/lib/components/settings/Interface.svelte b/materialious/src/lib/components/settings/Interface.svelte index feb8345d..3b07a7e7 100644 --- a/materialious/src/lib/components/settings/Interface.svelte +++ b/materialious/src/lib/components/settings/Interface.svelte @@ -11,7 +11,7 @@ import type { RgbaColor, HsvaColor, Colord } from 'colord'; import { _ } from '$lib/i18n'; import { get } from 'svelte/store'; - import { ensureNoTrailingSlash, isMobile, clearCaches } from '../../misc'; + import { ensureNoTrailingSlash, isMobile, clearCaches, isUnrestrictedPlatform } from '../../misc'; import { getPages, type Pages } from '../../navPages'; import ColorPicker from 'svelte-awesome-color-picker'; import { @@ -153,7 +153,7 @@ }); -{#if Capacitor.isNativePlatform()} +{#if isUnrestrictedPlatform()}
{/if} -{#if Capacitor.isNativePlatform()} +{#if isUnrestrictedPlatform()}