From 5630ac3bf8bb9177470c379d759cc2a012b0a625 Mon Sep 17 00:00:00 2001 From: Kehet Date: Thu, 29 Jan 2026 04:28:50 +0200 Subject: [PATCH] Add keyword and URL filtering for posts (#711) * feat: Add keyword and URL filtering for posts * impr: add minimizing filters, improve UI, fix some reactivity problems --- src/lib/app/i18n/en.json | 8 ++ src/lib/app/render/VirtualList.svelte | 6 ++ src/lib/app/settings.svelte.ts | 8 +- src/lib/feature/post/feed/PostFeed.svelte | 64 ++++++++++++---- src/lib/feature/post/feed/VirtualFeed.svelte | 81 ++++++++++++++------ src/lib/feature/post/filters.ts | 30 ++++++++ src/routes/settings/app/+page.svelte | 31 +++++++- src/routes/settings/app/Filter.svelte | 46 +++++++++++ 8 files changed, 232 insertions(+), 42 deletions(-) create mode 100644 src/lib/feature/post/filters.ts create mode 100644 src/routes/settings/app/Filter.svelte diff --git a/src/lib/app/i18n/en.json b/src/lib/app/i18n/en.json index 4bb17389..57066ed8 100644 --- a/src/lib/app/i18n/en.json +++ b/src/lib/app/i18n/en.json @@ -903,6 +903,14 @@ "deleted": "Deleted by user", "removed": "Removed by moderator" }, + "contentFilter": { + "title": "Content filters", + "description": "Hide or minimize posts matching given strings. Supports regular expressions.", + "hide": "Hide", + "minimize": "Minimize", + "minimized": "Content hidden by your filters", + "disabled": "Off" + }, "nsfwBlur": { "title": "NSFW blur", "description": "Blurs images and remove post bodies of NSFW posts." diff --git a/src/lib/app/render/VirtualList.svelte b/src/lib/app/render/VirtualList.svelte index fdad90af..6dc78533 100644 --- a/src/lib/app/render/VirtualList.svelte +++ b/src/lib/app/render/VirtualList.svelte @@ -47,6 +47,12 @@ } } + export function rerender() { + requestAnimationFrame(() => { + updateVisibleItems() + }) + } + onDestroy(() => { restore = { itemHeights: itemHeights, diff --git a/src/lib/app/settings.svelte.ts b/src/lib/app/settings.svelte.ts index 7aa921a4..860cd295 100644 --- a/src/lib/app/settings.svelte.ts +++ b/src/lib/app/settings.svelte.ts @@ -1,8 +1,11 @@ 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 { locale } from './i18n' +// TODO extract settings into submodules + export type View = 'cozy' | 'compact' export const SSR_ENABLED = env.PUBLIC_SSR_ENABLED?.toLowerCase() == 'true' @@ -89,6 +92,7 @@ interface Settings { reverseActions: boolean titleOpensUrl: boolean } + filters: Filter[] forms: { autosubmitAutofill: boolean } @@ -97,7 +101,6 @@ interface Settings { useRtl: boolean parseTags: boolean logoColorMonth: number | null - absoluteDates: boolean messages: { fullMarkdown: boolean @@ -106,7 +109,7 @@ interface Settings { } export const defaultSettings: Settings = { - settingsVer: 7, + settingsVer: 8, expandableImages: toBool(env.PUBLIC_EXPANDABLE_IMAGES) ?? true, markReadPosts: toBool(env.PUBLIC_MARK_READ_POSTS) ?? true, showInstances: { @@ -172,6 +175,7 @@ export const defaultSettings: Settings = { reverseActions: toBool(env.PUBLIC_REVERSE_ACTIONS) ?? false, titleOpensUrl: toBool(env.PUBLIC_TITLE_OPENS_URL) ?? false, }, + filters: [], forms: { autosubmitAutofill: false, }, diff --git a/src/lib/feature/post/feed/PostFeed.svelte b/src/lib/feature/post/feed/PostFeed.svelte index 98337a6f..3bbcdb8c 100644 --- a/src/lib/feature/post/feed/PostFeed.svelte +++ b/src/lib/feature/post/feed/PostFeed.svelte @@ -4,8 +4,10 @@ import Placeholder from '$lib/ui/info/Placeholder.svelte' import { Button } from 'mono-svelte' import type { Snippet } from 'svelte' - import { ArchiveBox, Plus } from 'svelte-hero-icons/dist' + import { ArchiveBox, ArrowsPointingOut, Plus } from 'svelte-hero-icons/dist' import { Post } from '..' + import { filterPost, type FilteredItem } from '../filters' + import { t } from '$lib/app/i18n' interface Props { posts: PostView[] @@ -14,12 +16,25 @@ } let { posts = $bindable(), community = false, children }: Props = $props() + + let filteredPosts: FilteredItem[] = $derived( + posts.map((post) => ({ + id: post.post.id, + action: filterPost(post, settings.filters), + })), + ) + + const removePost = (postId: number) => { + const index = posts.findIndex((post) => post.post.id === postId) + if (index === -1) return + posts = posts.toSpliced(index, 1) + }