From 9e67489df2d0895d04fecf15cfc59edcb94a61a7 Mon Sep 17 00:00:00 2001 From: Xylight Date: Thu, 29 Jan 2026 20:45:35 -0800 Subject: [PATCH] impr: precompute regexes for filters rather than uhhh re-creating them in a loop every single time filter() is called this is CS 101 brethren --- src/lib/app/settings.svelte.ts | 2 +- src/lib/feature/post/feed/PostFeed.svelte | 4 +- src/lib/feature/post/feed/VirtualFeed.svelte | 4 +- src/lib/feature/post/filters.svelte.ts | 42 ++++++++++++++++++++ src/lib/feature/post/filters.ts | 30 -------------- src/routes/settings/app/Filter.svelte | 7 ++-- 6 files changed, 51 insertions(+), 38 deletions(-) create mode 100644 src/lib/feature/post/filters.svelte.ts delete mode 100644 src/lib/feature/post/filters.ts diff --git a/src/lib/app/settings.svelte.ts b/src/lib/app/settings.svelte.ts index 860cd295..a86c7378 100644 --- a/src/lib/app/settings.svelte.ts +++ b/src/lib/app/settings.svelte.ts @@ -1,7 +1,7 @@ import { browser } from '$app/environment' import { env } from '$env/dynamic/public' import type { CommentSortType, ListingType, SortType } from '$lib/api/types' -import type { Filter } from '$lib/feature/post/filters' +import type { Filter } from '$lib/feature/post/filters.svelte' import { locale } from './i18n' // TODO extract settings into submodules diff --git a/src/lib/feature/post/feed/PostFeed.svelte b/src/lib/feature/post/feed/PostFeed.svelte index 3bbcdb8c..ddca49a0 100644 --- a/src/lib/feature/post/feed/PostFeed.svelte +++ b/src/lib/feature/post/feed/PostFeed.svelte @@ -6,7 +6,7 @@ import type { Snippet } from 'svelte' import { ArchiveBox, ArrowsPointingOut, Plus } from 'svelte-hero-icons/dist' import { Post } from '..' - import { filterPost, type FilteredItem } from '../filters' + import { filterPost, type FilteredItem } from '../filters.svelte' import { t } from '$lib/app/i18n' interface Props { @@ -20,7 +20,7 @@ let filteredPosts: FilteredItem[] = $derived( posts.map((post) => ({ id: post.post.id, - action: filterPost(post, settings.filters), + action: filterPost(post), })), ) diff --git a/src/lib/feature/post/feed/VirtualFeed.svelte b/src/lib/feature/post/feed/VirtualFeed.svelte index e0b16ed3..bd2c868e 100644 --- a/src/lib/feature/post/feed/VirtualFeed.svelte +++ b/src/lib/feature/post/feed/VirtualFeed.svelte @@ -23,7 +23,7 @@ import { SvelteSet } from 'svelte/reactivity' import { fly } from 'svelte/transition' import { Post } from '..' - import { filterPost, type FilteredItem } from '../filters' + import { filterPost, type FilteredItem } from '../filters.svelte' import { ReactiveState } from '$lib/app/util.svelte' interface Props { @@ -47,7 +47,7 @@ let filteredPosts: FilteredItem[] = $derived( posts.map((post) => ({ id: post.post.id, - action: filterPost(post, settings.filters), + action: filterPost(post), })), ) diff --git a/src/lib/feature/post/filters.svelte.ts b/src/lib/feature/post/filters.svelte.ts new file mode 100644 index 00000000..0662b4f1 --- /dev/null +++ b/src/lib/feature/post/filters.svelte.ts @@ -0,0 +1,42 @@ +import type { PostView } from '$lib/api/types' +import { settings } from '$lib/app/settings.svelte' + +type FilterAction = 'none' | 'minimize' | 'hide' +type FilterType = 'keyword' + +export interface Filter { + match: string + action: FilterAction + type: FilterType +} + +type FilterEx = Filter & { regex: RegExp } + +export type FilteredItem = { id: number; action: FilterAction } + +// ban me from regex brother +const filtersEx: FilterEx[] = $derived( + settings.filters.map((filter) => ({ + ...filter, + regex: new RegExp(filter.match, 'i'), + })), +) + +export function filterPost( + post: PostView, + filters: FilterEx[] = filtersEx, +): FilterAction { + for (const filter of filters) { + try { + if ( + filter.regex.test(post.post.url ?? '') || + filter.regex.test(post.post.name) || + filter.regex.test(post.post.body ?? '') + ) + return filter.action + } catch { + /* */ + } + } + return 'none' +} diff --git a/src/lib/feature/post/filters.ts b/src/lib/feature/post/filters.ts deleted file mode 100644 index 80abc20d..00000000 --- a/src/lib/feature/post/filters.ts +++ /dev/null @@ -1,30 +0,0 @@ -import type { PostView } from '$lib/api/types' - -type FilterAction = 'none' | 'minimize' | 'hide' -type FilterType = 'keyword' -// since we can test regexes on URLs, why not unify them? - -export interface Filter { - match: string - action: FilterAction - type: FilterType -} - -export type FilteredItem = { id: number; action: FilterAction } - -export function filterPost(post: PostView, filters: Filter[]): FilterAction { - for (const filter of filters) { - try { - const regex = new RegExp(filter.match, 'i') - if ( - regex.test(post.post.url ?? '') || - regex.test(post.post.name) || - regex.test(post.post.body ?? '') - ) - return filter.action - } catch { - /* */ - } - } - return 'none' -} diff --git a/src/routes/settings/app/Filter.svelte b/src/routes/settings/app/Filter.svelte index 4517fbbd..2ea9f986 100644 --- a/src/routes/settings/app/Filter.svelte +++ b/src/routes/settings/app/Filter.svelte @@ -1,6 +1,6 @@
  • - +