diff --git a/src/lib/components/lemmy/comment/comments.ts b/src/lib/components/lemmy/comment/comments.ts index 964730b2..743d932a 100644 --- a/src/lib/components/lemmy/comment/comments.ts +++ b/src/lib/components/lemmy/comment/comments.ts @@ -24,7 +24,8 @@ function getDepthFromComment(comment?: Comment): number | undefined { export function buildCommentsTree( comments: CommentView[], - baseDepth: number = 0 + baseDepth: number = 0, + filter: (c: CommentView) => boolean = (c) => true ): CommentNodeI[] { const map = new Map() @@ -38,7 +39,9 @@ export function buildCommentsTree( depth: depth, } min_depth = Math.min(min_depth, depth) - map.set(comment_view.comment.id, { ...node }) + if (filter(comment_view)) { + map.set(comment_view.comment.id, { ...node }) + } } const tree: CommentNodeI[] = [] diff --git a/src/lib/components/lemmy/post/PostFeed.svelte b/src/lib/components/lemmy/post/PostFeed.svelte index e6c98f8c..a9d41aa5 100644 --- a/src/lib/components/lemmy/post/PostFeed.svelte +++ b/src/lib/components/lemmy/post/PostFeed.svelte @@ -37,7 +37,12 @@ const seenUrls = new Set() posts?.forEach((post) => { - if (!post) return + if ( + !post || + ($userSettings.hidePosts.deleted && post.post.deleted) || + ($userSettings.hidePosts.removed && post.post.removed) + ) + return if (!post?.post?.url) { results.push(post) return diff --git a/src/lib/settings.ts b/src/lib/settings.ts index 3b41beec..49182789 100644 --- a/src/lib/settings.ts +++ b/src/lib/settings.ts @@ -98,7 +98,7 @@ export const defaultSettings: Settings = { comments: env.PUBLIC_DEFAULT_COMMENT_SORT ?? ('Hot' as any), }, hidePosts: { - deleted: toBool(env.PUBLIC_HIDE_DELETED) ?? true, + deleted: toBool(env.PUBLIC_HIDE_DELETED) ?? false, removed: toBool(env.PUBLIC_HIDE_REMOVED) ?? false, }, expandSidebar: toBool(env.PUBLIC_EXPAND_SIDEBAR) ?? true, diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte index dc58f26a..ffe48552 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/+page.svelte @@ -302,7 +302,15 @@ {/if} + !( + ($userSettings.hidePosts.deleted && c.comment.deleted) || + ($userSettings.hidePosts.removed && c.comment.removed) + ) + )} isParent={true} /> {#if post.post_view.counts.comments > 5} diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 3d8167a7..03a94e9a 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -191,9 +191,9 @@ description="Blur images and remove post bodies of NSFW content." /> - Hide Posts + Hide Submissions -

Hide certain types of posts.

+

Hide certain types of submissions.

Looking to hide read posts? That was moved to your