feat: add instance blocking

This commit is contained in:
Xylight committed 2023-12-15 15:30:11 -08:00
1 parent 0704ee86c2
commit 896175935e
8 files changed
+202 -47

No files matched your search

+22 -2
View File
@@ -11,7 +11,14 @@
import { Button, Modal, toast } from 'mono-svelte'
import { afterNavigate } from '$app/navigation'
import { browser } from '$app/environment'
import { ChartBar, EllipsisHorizontal, Icon } from 'svelte-hero-icons'
import {
ArrowRight,
ChartBar,
EllipsisHorizontal,
Icon,
XMark,
} from 'svelte-hero-icons'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
export let data
@@ -89,7 +96,20 @@
<div class="flex flex-row gap-4 max-w-full w-full items-end">
<Sort selected={data.sort} />
</div>
<PostFeed community={true} posts={data.posts.posts} />
{#if data.community.community_view.blocked}
<Placeholder
icon={XMark}
title="Blocked"
description="You've blocked this community."
>
<Button href="/profile/blocks">
<Icon src={ArrowRight} size="16" mini slot="suffix" />
Blocked Communities
</Button>
</Placeholder>
{:else}
<PostFeed community={true} posts={data.posts.posts} />
{/if}
<Pageination
page={data.page}
@@ -0,0 +1,5 @@
<div
class="flex flex-col divide-y divide-zinc-800 [&>*]:py-3 first:p-0 last:py-0"
>
<slot />
</div>
@@ -1,17 +1,22 @@
<script lang="ts">
import type { CommunityBlockView, PersonBlockView } from 'lemmy-js-client'
import type {
CommunityBlockView,
InstanceBlockView,
PersonBlockView,
} from 'lemmy-js-client'
import type { PageData } from './$types.js'
import EditableList from '$lib/components/ui/list/EditableList.svelte'
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
import { getClient } from '$lib/lemmy.js'
import { profile } from '$lib/auth.js'
import { Check, Icon, Trash } from 'svelte-hero-icons'
import { Check, Icon, Trash, XMark } from 'svelte-hero-icons'
import CommunityLink from '$lib/components/lemmy/community/CommunityLink.svelte'
import { flip } from 'svelte/animate'
import { slide } from 'svelte/transition'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import { Button } from 'mono-svelte'
import Entity from '$lib/components/ui/Entity.svelte'
// sveltekit doesn't feel like making types work right now
export let data: PageData & {
@@ -53,22 +58,108 @@
community_id: item.community.id,
})
}
async function unblockInstances(item: InstanceBlockView) {
if (!$profile?.jwt) return
if (!data.my_user?.instance_blocks) return
data.my_user.instance_blocks.splice(
data.my_user.instance_blocks.findIndex(
(i) => i.instance.id == item.instance.id
),
1
)
data.my_user.instance_blocks = data.my_user.instance_blocks
await getClient().blockInstance({
block: false,
instance_id: item.instance.id,
})
}
</script>
{#if data.community_blocks?.length > 0 || data.person_blocks?.length > 0}
{#if data.community_blocks?.length > 0 || data.person_blocks?.length > 0 || (data.my_user?.instance_blocks?.length ?? 0) > 0}
{#if data.my_user?.instance_blocks && (data.my_user?.instance_blocks?.length ?? 0) > 0}
<div>
<SectionTitle>Instances</SectionTitle>
<EditableList let:action on:action={(i) => unblockInstances(i.detail)}>
{#each data.my_user?.instance_blocks as block (block.instance.id)}
<div
class="flex flex-row gap-2 items-center py-4 justify-between"
animate:flip={{ duration: 250 }}
out:slide|local={{ axis: 'y' }}
>
<Entity
icon={block.site?.icon}
name={block.site?.name ?? block.instance.domain}
label={block.instance.domain}
/>
<Button
title="Unblock"
size="square-md"
on:click={() => action(block)}
>
<Icon src={XMark} mini size="16" slot="prefix" />
</Button>
</div>
{/each}
</EditableList>
</div>
{:else}
<Placeholder
description="Go to a community's page and click 'block instance' to stop seeing posts and
comments from its instance."
title="No blocked instances"
center={false}
/>
{/if}
{#if data.community_blocks?.length > 0}
<div>
<SectionTitle>Communities</SectionTitle>
<EditableList let:action on:action={(i) => unblockCommunity(i.detail)}>
{#each data.community_blocks as block (block.community.id)}
<div
class="flex flex-row gap-2 items-center py-2 justify-between"
animate:flip={{ duration: 250 }}
out:slide|local={{ axis: 'y' }}
>
<CommunityLink community={block.community} avatar />
<Button
title="Unblock"
size="square-md"
on:click={() => action(block)}
>
<Icon src={XMark} mini size="16" slot="prefix" />
</Button>
</div>
{/each}
</EditableList>
</div>
{:else}
<Placeholder
description="Go to a community's page and click 'block' to stop seeing posts and
comments from it."
title="No blocked communities"
center={false}
/>
{/if}
{#if data.person_blocks?.length > 0}
<div>
<SectionTitle>Users</SectionTitle>
<EditableList let:action on:action={(i) => unblockUser(i.detail)}>
{#each data.person_blocks as block (block.target.id)}
<div
class="flex flex-row gap-4 items-center py-4 justify-between"
class="flex flex-row gap-2 items-center py-2 justify-between"
animate:flip={{ duration: 250 }}
out:slide|local={{ axis: 'y' }}
>
<UserLink user={block.target} avatar badges />
<Button size="square-md" on:click={() => action(block)}>
<Icon src={Trash} mini size="16" slot="prefix" />
<Button
title="Unblock"
size="square-md"
on:click={() => action(block)}
>
<Icon src={XMark} mini size="16" slot="prefix" />
</Button>
</div>
{/each}
@@ -78,43 +169,16 @@
<Placeholder
description="Go to a user's profile and click 'block' to stop seeing posts and
comments from them."
title="No user blocks"
icon={Check}
/>
{/if}
{#if data.community_blocks?.length > 0}
<div>
<SectionTitle>Communities</SectionTitle>
<EditableList let:action on:action={(i) => unblockCommunity(i.detail)}>
{#each data.community_blocks as block (block.community.id)}
<div
class="flex flex-row gap-4 items-center py-4 justify-between"
animate:flip={{ duration: 250 }}
out:slide|local={{ axis: 'y' }}
>
<CommunityLink community={block.community} avatar />
<Button size="square-md" on:click={() => action(block)}>
<Icon src={Trash} mini size="16" slot="prefix" />
</Button>
</div>
{/each}
</EditableList>
</div>
{:else}
<Placeholder
description="Go to a community's page and click 'block' to stop seeing posts and
comments from it."
title="No community blocks"
icon={Check}
title="No blocked users"
center={false}
/>
{/if}
{:else}
<div class="my-auto">
<Placeholder
description="Go to a community or user's page to stop seeing submissions from it."
description="Go to a community or user's page and click 'block' to stop seeing submissions from it."
title="No blocks"
icon={Check}
center={false}
/>
</div>
{/if}