From e39632dc2e21249d48fc62f18412bb7a9db305e8 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Fri, 15 Sep 2023 17:19:44 +0200 Subject: [PATCH 1/4] fix: Move JSON-LD scripts to `head` nodes --- src/lib/components/Meta.svelte | 24 +++++++++++------ src/routes/+error.svelte | 1 - src/routes/+page.svelte | 5 +--- src/routes/contributors/+page.svelte | 5 ++-- src/routes/donate/+page.svelte | 40 +++++++++++++++++++++++----- src/routes/download/+page.svelte | 5 ++-- src/routes/patches/+page.svelte | 4 +-- 7 files changed, 57 insertions(+), 27 deletions(-) diff --git a/src/lib/components/Meta.svelte b/src/lib/components/Meta.svelte index 9e5b2a8..2d3d170 100644 --- a/src/lib/components/Meta.svelte +++ b/src/lib/components/Meta.svelte @@ -1,26 +1,34 @@ - {title} - + {title} + - + - + + + {#if schema} + + {/if} diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index 51f3a29..7120a66 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -1,6 +1,5 @@ - - - - - - + Donate', + publisher: { + '@type': 'Organization', + name: 'ReVanced', + url: 'https://revanced.app/', + logo: { + '@type': 'ImageObject', + url: 'https://revanced.app/embed.png' + }, + sameAs: [ + 'https://github.com/revanced', + 'https://twitter.com/revancedapp', + 'https://revanced.app/discord', + 'https://www.reddit.com/r/revancedapp', + 'https://t.me/app_revanced', + 'https://www.youtube.com/@ReVanced' + ] + } + }} +/>
@@ -67,11 +93,12 @@ {/each} @@ -79,7 +106,9 @@ {#if data.wallets} {/if} + {:else} +
  • 🎯 Any
    • {/if} From 3c6b6d23f5c6b93d29642e4310545823920ff591 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Thu, 5 Oct 2023 04:55:47 +0200 Subject: [PATCH 4/4] fix: Display patches using new patches JSON format --- src/data/api/index.ts | 5 +++-- src/lib/types.ts | 9 ++++---- src/routes/patches/+page.svelte | 8 ++++---- src/routes/patches/PatchItem.svelte | 32 +++++++++++++++-------------- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/data/api/index.ts b/src/data/api/index.ts index 4e580f3..85bf746 100644 --- a/src/data/api/index.ts +++ b/src/data/api/index.ts @@ -10,7 +10,8 @@ import type { DonationPlatform, CryptoWallet, Social, - Info + Info, + CompatiblePackage } from '$lib/types'; export type ReposData = { repositories: Repository[] }; @@ -44,7 +45,7 @@ async function patches(): Promise { // gets packages and patch count for (let i = 0; i < json.patches.length; i++) { - json.patches[i].compatiblePackages.forEach((pkg: Patch) => { + json.patches[i].compatiblePackages?.forEach((pkg: CompatiblePackage) => { packagesWithCount[pkg.name] = (packagesWithCount[pkg.name] || 0) + 1; }); } diff --git a/src/lib/types.ts b/src/lib/types.ts index 82ffe75..98dfe28 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -12,11 +12,10 @@ export interface Repository { export interface Patch { name: string; description: string; - version: string; - excluded: boolean; - dependencies: string[]; - options: PatchOption[]; compatiblePackages: CompatiblePackage[]; + use: boolean; + requiresIntegrations: boolean; + options: PatchOption[]; } export interface CompatiblePackage { @@ -26,10 +25,10 @@ export interface CompatiblePackage { export interface PatchOption { key: string; + default: any; title: string; description: string; required: boolean; - choices: string[]; } export interface Asset { diff --git a/src/routes/patches/+page.svelte b/src/routes/patches/+page.svelte index 477ea48..0f627c2 100644 --- a/src/routes/patches/+page.svelte +++ b/src/routes/patches/+page.svelte @@ -47,11 +47,11 @@ if (pkg === '') { return false; } - return !!patch.compatiblePackages.find((compat) => compat.name === pkg); + return !!patch.compatiblePackages?.find((compat) => compat.name === pkg); } - function searchString(str: string, term: string, filter: RegExp) { - return str.toLowerCase().replace(filter, '').includes(term); + function searchString(str?: string, term: string, filter: RegExp) { + return str?.toLowerCase().replace(filter, '').includes(term); } function filter(patches: Patch[], pkg: string, search?: string): Patch[] { @@ -70,7 +70,7 @@ return ( searchString(patch.description, search, /\s/g) || searchString(patch.name, search, /\s/g) || - patch.compatiblePackages.find((x) => searchString(x.name, search, /\./g)) + patch.compatiblePackages?.find((x) => searchString(x.name, search, /\./g)) ); } return true; diff --git a/src/routes/patches/PatchItem.svelte b/src/routes/patches/PatchItem.svelte index 0260e40..59ba050 100644 --- a/src/routes/patches/PatchItem.svelte +++ b/src/routes/patches/PatchItem.svelte @@ -7,7 +7,7 @@ export let patch: Patch; export let showAllVersions: boolean; - const hasPatchOptions = !!patch.options.length; + const hasPatchOptions = !!patch.options?.length; let expanded: boolean = false; @@ -26,28 +26,30 @@ dropdown {/if} -
    {patch.description}
    + {#if patch.description} +
    {patch.description}
    + {/if}
      - {#each patch.compatiblePackages as pkg} - -
    • 📦 {pkg.name}
      • -       - {/each} - - {#if !patch.compatiblePackages.length} + {#if !patch.compatiblePackages?.length}
    • 🌎 Universal patch
      • + {:else} + {#each patch.compatiblePackages as pkg} + +
    • 📦 {pkg.name}
      • +       + {/each} {/if} {#if hasPatchOptions}
    • ⚙️ Patch options
      • {/if} - - {#if patch.compatiblePackages.length && patch.compatiblePackages[0].versions.length} + + {#if patch.compatiblePackages?.length && patch.compatiblePackages[0].versions?.length} {#if showAllVersions} {#each patch.compatiblePackages[0].versions .slice()