From 50c0b8351138e8afdde269010692db84bdc44187 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sat, 13 Sep 2025 13:23:16 -0700 Subject: [PATCH] feat: [1/2]: add flairs --- src/app.d.ts | 3 +- src/lib/client/base.ts | 1 + src/lib/client/piefed/piefed.ts | 12 ++ src/lib/client/types/schemas/schemas.ts | 6 + .../lemmy/ObjectAutocomplete.svelte | 15 +- .../lemmy/community/CommunityLink.svelte | 20 +-- src/lib/components/lemmy/post/Post.svelte | 1 + src/lib/components/lemmy/post/PostMeta.svelte | 2 +- .../lemmy/post/form/PostForm.svelte | 170 +++++++++++------- src/lib/components/lemmy/user/UserLink.svelte | 2 +- src/lib/i18n/en.json | 3 +- src/lib/mono/button/Button.svelte | 7 +- src/lib/mono/modal/modal.ts | 3 +- src/lib/session.ts | 6 +- src/routes/c/[name]/+page.svelte | 5 +- 15 files changed, 160 insertions(+), 96 deletions(-) diff --git a/src/app.d.ts b/src/app.d.ts index 960de5d7..3201e590 100644 --- a/src/app.d.ts +++ b/src/app.d.ts @@ -1,7 +1,6 @@ // See https://kit.svelte.dev/docs/types#app import type { Action } from '$lib/components/ui/navbar/commands/actions.svelte' -import type { ComponentType } from 'svelte' // for information about these interfaces declare global { @@ -13,7 +12,7 @@ declare global { interface PageData { slots?: { sidebar?: { - component?: ComponentType + component?: Component props?: any } } diff --git a/src/lib/client/base.ts b/src/lib/client/base.ts index 5942a6b9..c331e5b5 100644 --- a/src/lib/client/base.ts +++ b/src/lib/client/base.ts @@ -226,6 +226,7 @@ export abstract class BaseClient { abstract setFlair?(form: types.SetPersonFlair): Promise abstract getFeeds?(form: types.GetFeeds): Promise abstract getTopics?(form: types.GetTopics): Promise + abstract assignFlair?(form: types.AssignFlair): Promise } export type NullableFnArg = T extends ( diff --git a/src/lib/client/piefed/piefed.ts b/src/lib/client/piefed/piefed.ts index aa13c40e..e48dc163 100644 --- a/src/lib/client/piefed/piefed.ts +++ b/src/lib/client/piefed/piefed.ts @@ -1002,4 +1002,16 @@ export class PiefedClient implements BaseClient { topics: response.topics.map(toTopicView), } } + + async assignFlair( + params: NullableFnArg[0], + ): NullableFnReturn { + const response = ( + await this.#client.POST('/api/alpha/post/assign_flair', { + body: params, + }) + ).data! + + return toPostView(response) + } } diff --git a/src/lib/client/types/schemas/schemas.ts b/src/lib/client/types/schemas/schemas.ts index dc23bad6..6a2bd996 100644 --- a/src/lib/client/types/schemas/schemas.ts +++ b/src/lib/client/types/schemas/schemas.ts @@ -263,6 +263,7 @@ export interface CommunityView { blocked: boolean counts: CommunityAggregates banned_from_community: boolean + flair_list?: CommunityFlair[] } export type CommunityVisibility = 'Public' | 'LocalOnly' @@ -2057,3 +2058,8 @@ export interface TopicView { export interface GetTopicsResponse { topics: TopicView[] } + +export interface AssignFlair { + post_id: number + flair_id_list: number[] +} diff --git a/src/lib/components/lemmy/ObjectAutocomplete.svelte b/src/lib/components/lemmy/ObjectAutocomplete.svelte index 08f39e50..57a0a618 100644 --- a/src/lib/components/lemmy/ObjectAutocomplete.svelte +++ b/src/lib/components/lemmy/ObjectAutocomplete.svelte @@ -44,9 +44,10 @@ sort: 'TopAll', }) - return results.communities.map((c) => c.community) + return results.communities }} - extractName={(c) => `${c.title}@${new URL(c.actor_id).hostname}`} + extractName={(c) => + `${c.community.name}@${new URL(c.community.actor_id).hostname}`} bind:query={q} {...rest} > @@ -67,11 +68,15 @@ {#snippet children({ item, select })}
select(item)}> - +
- {item.title} + {item.community.title} - {new URL(item.actor_id).hostname} + {new URL(item.community.actor_id).hostname}
diff --git a/src/lib/components/lemmy/community/CommunityLink.svelte b/src/lib/components/lemmy/community/CommunityLink.svelte index e0aff334..22c996db 100644 --- a/src/lib/components/lemmy/community/CommunityLink.svelte +++ b/src/lib/components/lemmy/community/CommunityLink.svelte @@ -1,9 +1,9 @@ {#if uploadingImage} @@ -248,22 +260,39 @@ {/await} {/if} -{#if addAltText} - -
{ - e.preventDefault() - addAltText = !addAltText - }} - class="space-y-4 w-full" - > -