chore: Merge branch dev to main (#231)

oSumAtrIX · web-flow · commit c4c3ba7ffbe5 · 2024-07-03T15:40:27.000+02:00
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,7 +1,14 @@
 name: Deploy
 
-on: [pull_request, push]
-
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - dev
+  pull_request:
+    branches:
+      - dev
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -24,7 +31,7 @@ jobs:
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
+          projectName: ${{ vars.CLOUDFLARE_PROJECT_NAME }}
           directory: public
         id: publish
 
diff --git a/.github/workflows/open_pull_request.yml b/.github/workflows/open_pull_request.yml
@@ -0,0 +1,26 @@
+name: Open a PR to main
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  MESSAGE: Merge branch `${{ github.head_ref || github.ref_name }}` to `main`
+
+jobs:
+  pull-request:
+    name: Open pull request
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Open pull request
+        uses: repo-sync/pull-request@v2
+        with:
+          destination_branch: 'main'
+          pr_title: 'chore: ${{ env.MESSAGE }}'
+          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
+          pr_draft: true
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
 		"eslint": "^8.56.0",
 		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-svelte": "^2.35.1",
+		"fuse.js": "^7.0.0",
 		"imagetools-core": "^6.0.3",
 		"prettier": "^3.1.1",
 		"prettier-plugin-svelte": "^3.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/layout/Footer/FooterHost.svelte b/src/layout/Footer/FooterHost.svelte
@@ -163,13 +163,6 @@
 		margin-top: 1rem;
 	}
 
-	ul {
-		display: flex;
-		gap: 1rem;
-		flex-direction: column;
-		width: max-content;
-	}
-
 	@media screen and (max-width: 1050px) {
 		.footer-top {
 			flex-direction: column;
diff --git a/src/layout/Hero/SocialButton.svelte b/src/layout/Hero/SocialButton.svelte
@@ -1,16 +1,11 @@
 <script lang="ts">
 	import type { Social } from '$lib/types';
-	export let social = '';
-	export let data: Social[];
+	export let social: Social;
 </script>
 
-<a
-	href={data.find((jsonSocial) => jsonSocial.name.toLowerCase() === social.toLowerCase())?.url}
-	rel="noreferrer"
-	target="_blank"
->
+<a href={social.url} rel="noreferrer" target="_blank">
 	<div>
-		<img src="socials/{social}.svg" alt={social} />
+		<img src="socials/{social.name.toLowerCase()}.svg" alt={social.name} />
 	</div>
 </a>
 
diff --git a/src/layout/Hero/SocialHost.svelte b/src/layout/Hero/SocialHost.svelte
@@ -10,10 +10,9 @@
 <div class="social-host">
 	<Query {query} let:data>
 		{#if data}
-			<SocialButton social="github" data={data.socials} />
-			<SocialButton social="discord" data={data.socials} />
-			<SocialButton social="reddit" data={data.socials} />
-			<SocialButton social="telegram" data={data.socials} />
+			{#each data.socials.filter((s) => s.name != 'Website') as social}
+				<SocialButton {social} />
+			{/each}
 		{/if}
 	</Query>
 </div>
@@ -36,6 +35,7 @@
 			left: 0;
 			width: 100%;
 			display: flex;
+			flex-wrap: wrap;
 			justify-content: center;
 		}
 	}
diff --git a/src/lib/components/Dialogue.svelte b/src/lib/components/Dialogue.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
 	import { fade } from 'svelte/transition';
 	import { quadInOut } from 'svelte/easing';
-	import { disableScrollHandling } from '$app/navigation';
 	export let modalOpen = false;
 	export let fullscreen = false;
 	export let notDismissible = false;
diff --git a/src/lib/components/Search.svelte b/src/lib/components/Search.svelte
@@ -6,11 +6,11 @@
 
 	export let title: string;
 	export let searchTerm: string | null;
-	export let searchTermFiltered: string | undefined;
+	export let displayedTerm: string | undefined;
 
 	function clear() {
 		searchTerm = '';
-		searchTermFiltered = '';
+		displayedTerm = '';
 
 		const url = new URL($page.url);
 		url.searchParams.delete('s');
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -9,7 +9,6 @@
 	import { derived } from 'svelte/store';
 	import { onMount } from 'svelte';
 	import { browser } from '$app/environment';
-	import { page } from '$app/stores';
 
 	import { QueryClient } from '@tanstack/query-core';
 	import { persistQueryClient } from '@tanstack/query-persist-client-core';
diff --git a/src/routes/contributors/ContributorSection.svelte b/src/routes/contributors/ContributorSection.svelte
@@ -10,7 +10,7 @@
 	let expanded = true;
 
 	// Yes
-	let usersIwantToExplodeSoBadly = ['semantic-release-bot'];
+	let usersIwantToExplodeSoBadly = ['semantic-release-bot', 'revanced-bot'];
 	let repo_name = friendlyName(repo);
 </script>
 
diff --git a/src/routes/download/+page.svelte b/src/routes/download/+page.svelte
@@ -14,7 +14,6 @@
 	import Picture from '$lib/components/Picture.svelte';
 	import Dialogue from '$lib/components/Dialogue.svelte';
 	import { onMount } from 'svelte';
-	import ContributorPerson from '../contributors/ContributorPerson.svelte';
 
 	const query = createQuery(['manager'], queries.manager);
 
diff --git a/src/routes/patches/+page.svelte b/src/routes/patches/+page.svelte
@@ -10,7 +10,6 @@
 	import { createQuery } from '@tanstack/svelte-query';
 	import { queries } from '$data/api';
 
-	import { JsonLd } from 'svelte-meta-tags';
 	import Head from '$lib/components/Head.svelte';
 	import PackageMenu from './PackageMenu.svelte';
 	import Package from './Package.svelte';
@@ -20,9 +19,13 @@
 	import FilterChip from '$lib/components/FilterChip.svelte';
 	import Dialogue from '$lib/components/Dialogue.svelte';
 	import Query from '$lib/components/Query.svelte';
+	import Fuse from 'fuse.js';
+	import { onMount } from 'svelte';
 
 	const query = createQuery(['patches'], queries.patches);
 
+	let searcher: Fuse<Patch> | undefined;
+
 	let searchParams: Readable<URLSearchParams>;
 	if (building) {
 		searchParams = readable(new URLSearchParams());
@@ -31,15 +34,8 @@
 	}
 
 	$: selectedPkg = $searchParams.get('pkg');
-	let searchTerm = $searchParams.get('s');
-	let searchTermFiltered = searchTerm
-		?.replace(/\./g, '')
-		.replace(/\s/g, '')
-		.replace(/-/g, '')
-		.replace(/_/g, '')
-		.toLowerCase();
-
-	let timeout: ReturnType<typeof setTimeout>;
+	let searchTerm = $searchParams.get('s') || '';
+
 	let mobilePackages = false;
 	let showAllVersions = false;
 
@@ -50,61 +46,58 @@
 		return !!patch.compatiblePackages?.find((compat) => compat.name === pkg);
 	}
 
-	function searchString(str?: string, term: string, filter: RegExp) {
-		return str?.toLowerCase().replace(filter, '').includes(term);
-	}
-
 	function filter(patches: Patch[], pkg: string, search?: string): Patch[] {
-		if (search === undefined && pkg === '') {
-			return patches;
+		if (!search) {
+			if (pkg) return patches.filter((patch) => checkCompatibility(patch, pkg));
+			else return patches;
 		}
 
-		return patches.filter((patch) => {
-			// Don't show if the patch doesn't support the selected package
-			if (pkg && !checkCompatibility(patch, pkg)) {
-				return false;
-			}
-
-			// Filter based on the search term.
-			if (search !== undefined) {
-				return (
-					searchString(patch.description, search, /\s/g) ||
-					searchString(patch.name, search, /\s/g) ||
-					patch.compatiblePackages?.find((x) => searchString(x.name, search, /\./g))
-				);
-			}
-			return true;
-		});
+		if (!searcher) {
+			searcher = new Fuse(patches, {
+				keys: ['name', 'description', 'compatiblePackages.name', 'compatiblePackages.versions'],
+				shouldSort: true,
+				threshold: 0.3
+			});
+		}
+
+		const result = searcher
+			.search(search)
+			.map(({ item }) => item)
+			.filter((item) => {
+				// Don't show if the patch doesn't support the selected package
+				if (pkg && !checkCompatibility(item, pkg)) {
+					return false;
+				}
+				return true;
+			});
+		return result;
 	}
 
 	// Make sure we don't have to filter the patches after every key press
-	const debounce = () => {
-		clearTimeout(timeout);
-		timeout = setTimeout(() => {
-			// Filter search term for better results (i.e. "  Unl O-ck" and "unlock" gives the same results)
-			searchTermFiltered = searchTerm
-				?.replace(/\./g, '')
-				.replace(/\s/g, '')
-				.replace(/-/g, '')
-				.replace(/_/g, '')
-				.toLowerCase();
-			// Update search URL params
-			// must use history.pushState instead of goto(), as goto() unselects the search bar
-			const url = new URL(window.location.href);
-			url.pathname = '/patches';
-
-			const params = new URLSearchParams();
-			if (selectedPkg) {
-				params.set('pkg', selectedPkg);
-			}
-			if (searchTerm) {
-				params.set('s', searchTerm);
-			}
-
-			url.search = params.toString();
-			window.history.pushState(null, '', url.toString());
-		}, 500);
+	let displayedTerm = '';
+	const debounce = <T extends any[]>(f: (...args: T) => void) => {
+		let timeout: number;
+		return (...args: T) => {
+			clearTimeout(timeout);
+			timeout = setTimeout(() => f(...args), 350);
+		};
 	};
+	const update = () => {
+		displayedTerm = searchTerm;
+
+		const url = new URL(window.location.href);
+		url.pathname = '/patches';
+
+		if (searchTerm) {
+			url.searchParams.set('s', searchTerm);
+		} else {
+			url.searchParams.delete('s');
+		}
+
+		window.history.pushState(null, '', url);
+	};
+
+	onMount(update);
 </script>
 
 <Head
@@ -135,12 +128,11 @@
 <div class="search">
 	<div class="search-contain">
 		<!-- Must bind both variables: we get searchTerm from the text input, -->
-		<!-- and searchTermFiltered gets cleared with the clear button -->
 		<Search
 			bind:searchTerm
-			bind:searchTermFiltered
+			bind:displayedTerm
 			title="Search for patches"
-			on:keyup={debounce}
+			on:keyup={debounce(update)}
 		/>
 	</div>
 </div>
@@ -192,9 +184,9 @@
 		</aside>
 
 		<div class="patches-container">
-			{#each filter(data.patches, selectedPkg || '', searchTermFiltered) as patch}
+			{#each filter(data.patches, selectedPkg || '', displayedTerm) as patch}
 				<!-- Trigger new animations when package or search changes (I love Svelte) -->
-				{#key selectedPkg || searchTermFiltered}
+				{#key selectedPkg || displayedTerm}
 					<div in:fly={{ y: 10, easing: quintOut, duration: 750 }}>
 						<PatchItem {patch} bind:showAllVersions />
 					</div>
diff --git a/src/routes/patches/PatchItem.svelte b/src/routes/patches/PatchItem.svelte
diff --git a/static/socials/twitter.svg b/static/socials/twitter.svg
diff --git a/static/socials/youtube.svg b/static/socials/youtube.svg
