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)
+ }
- {#if posts?.length == 0}
+ {#if posts.length === 0}
{:else}
- {#each posts as post, index (post.post.id)}
- -
- {
- posts = posts.toSpliced(index, 1)
- }}
- />
-
+ {#each posts as post, row (post.post.id)}
+ {@const filter = filteredPosts[row]}
+ {#if filter.action != 'hide'}
+ -
+ {#if filter.action == 'none'}
+ removePost(post.post.id)}
+ />
+ {:else if filteredPosts[row].action == 'minimize'}
+
+ {/if}
+
+ {/if}
{/each}
{/if}
{@render children?.()}
diff --git a/src/lib/feature/post/feed/VirtualFeed.svelte b/src/lib/feature/post/feed/VirtualFeed.svelte
index c27cfb01..de8fba8e 100644
--- a/src/lib/feature/post/feed/VirtualFeed.svelte
+++ b/src/lib/feature/post/feed/VirtualFeed.svelte
@@ -12,6 +12,7 @@
import { onDestroy, onMount, untrack } from 'svelte'
import {
ArchiveBox,
+ ArrowsPointingOut,
ArrowTopRightOnSquare,
ChevronDoubleUp,
ExclamationTriangle,
@@ -22,6 +23,8 @@
import { SvelteSet } from 'svelte/reactivity'
import { fly } from 'svelte/transition'
import { Post } from '..'
+ import { filterPost, type FilteredItem } from '../filters'
+ import { ReactiveState } from '$lib/app/util.svelte'
interface Props {
posts: PostView[]
@@ -41,9 +44,17 @@
children,
}: Props = $props()
+ let filteredPosts: FilteredItem[] = $derived(
+ posts.map((post) => ({
+ id: post.post.id,
+ action: filterPost(post, settings.filters),
+ })),
+ )
+
let listEl = $state()
let listComp = $state<{
scrollToIndex: (index: number, window?: boolean) => void
+ rerender: () => void
}>()
let error = $state()
@@ -53,6 +64,12 @@
const abortLoad = new AbortController()
let seenIds = new SvelteSet(posts.map((post) => post.post.id))
+ const removePost = (postId: number) => {
+ const index = posts.findIndex((post) => post.post.id === postId)
+ if (index === -1) return
+ posts = posts.toSpliced(index, 1)
+ }
+
async function loadMore() {
if (!hasMore || loading) return
@@ -157,7 +174,7 @@
{#key posts}
- {#if posts?.length == 0}
+ {#if posts.length == 0}
{#snippet item(row)}
- -
- {
- posts = posts.toSpliced(row, 1)
- }}
- class="px-3 sm:px-6 hover:bg-slate-100/30 hover:dark:bg-zinc-900/30 transition-colors"
- >
-
+
+ {@const filter = new ReactiveState(filteredPosts[row])}
+ {#if posts[row] && filter.value.action != 'hide'}
+ -
+
+ {#if filter.value.action == 'none'}
+ removePost(posts[row].post.id)}
+ class="px-3 sm:px-6 hover:bg-slate-100/30 hover:dark:bg-zinc-900/30 transition-colors"
+ >
+ {:else if filter.value.action == 'minimize'}
+
+ {/if}
+
+ {/if}
{/snippet}
{/if}
diff --git a/src/lib/feature/post/filters.ts b/src/lib/feature/post/filters.ts
new file mode 100644
index 00000000..80abc20d
--- /dev/null
+++ b/src/lib/feature/post/filters.ts
@@ -0,0 +1,30 @@
+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/+page.svelte b/src/routes/settings/app/+page.svelte
index 64117bfe..b148558e 100644
--- a/src/routes/settings/app/+page.svelte
+++ b/src/routes/settings/app/+page.svelte
@@ -7,7 +7,7 @@
import Link from '$lib/ui/form/Link.svelte'
import Switch from '$lib/ui/form/Switch.svelte'
import { CommonList } from '$lib/ui/layout'
- import { Button, Option, Select } from 'mono-svelte'
+ import { Button, Option, Select, TextArea } from 'mono-svelte'
import {
ArrowsPointingOut,
ArrowsRightLeft,
@@ -22,12 +22,14 @@
Clock,
CubeTransparent,
DocumentText,
+ EyeSlash,
Fire,
GlobeAmericas,
Heart,
Icon,
Language,
Photo,
+ Plus,
Star,
TableCells,
Tag,
@@ -36,6 +38,7 @@
} from 'svelte-hero-icons/dist'
import Setting from '../Setting.svelte'
import ToggleSetting from '../ToggleSetting.svelte'
+ import Filter from './Filter.svelte'
let localeMap: Map<
string,
@@ -191,6 +194,32 @@
title={$t('settings.app.infiniteScroll.title')}
description={$t('settings.app.infiniteScroll.description')}
/>
+
+ {#snippet title()}
+ {$t('settings.lemmy.contentFilter.title')}
+ {/snippet}
+ {#snippet description()}
+ {$t('settings.lemmy.contentFilter.description')}
+ {/snippet}
+
+ {#each settings.filters as filter, index}
+ settings.filters.splice(index, 1)} bind:filter />
+ {/each}
+ -
+
+
{#snippet title()}
{$t('settings.app.thumbnailSide.title')}
diff --git a/src/routes/settings/app/Filter.svelte b/src/routes/settings/app/Filter.svelte
new file mode 100644
index 00000000..4517fbbd
--- /dev/null
+++ b/src/routes/settings/app/Filter.svelte
@@ -0,0 +1,46 @@
+
+
+-
+
+
+
+
+
+