From 0718c8e0c628f92c5213f10d94c55b3ef303d9bc Mon Sep 17 00:00:00 2001 From: Xylight Date: Wed, 23 Oct 2024 19:55:20 -0700 Subject: [PATCH 001/161] prep: replace $$props.class with props --- .../components/error/ErrorContainer.svelte | 4 +- src/lib/components/input/FreeTextInput.svelte | 4 +- src/lib/components/input/Link.svelte | 7 +- src/lib/components/input/Switch.svelte | 8 ++- src/lib/components/lemmy/SiteCard.svelte | 4 +- .../components/lemmy/comment/Comment.svelte | 8 ++- .../lemmy/comment/CommentItem.svelte | 4 +- .../lemmy/community/CommunityCard.svelte | 6 +- .../lemmy/community/CommunityHeader.svelte | 4 +- .../lemmy/community/CommunityItem.svelte | 7 +- .../lemmy/community/CommunityLink.svelte | 9 ++- .../components/lemmy/dropdowns/Sort.svelte | 5 +- .../lemmy/inbox/PrivateMessage.svelte | 4 +- .../lemmy/moderation/ShieldIcon.svelte | 7 +- src/lib/components/lemmy/post/Post.svelte | 8 ++- .../components/lemmy/post/PostActions.svelte | 4 +- src/lib/components/lemmy/post/PostBody.svelte | 9 ++- src/lib/components/lemmy/post/PostMeta.svelte | 7 +- .../lemmy/post/media/PostIframe.svelte | 7 +- .../lemmy/post/media/PostMediaCompact.svelte | 9 +-- src/lib/components/lemmy/user/UserItem.svelte | 8 +-- src/lib/components/lemmy/user/UserLink.svelte | 9 ++- .../components/lemmy/util/SearchBar.svelte | 6 +- src/lib/components/markdown/Markdown.svelte | 8 ++- .../components/markdown/MarkdownEditor.svelte | 7 +- src/lib/components/ui/Avatar.svelte | 9 ++- src/lib/components/ui/EndPlaceholder.svelte | 8 ++- src/lib/components/ui/EntityHeader.svelte | 5 +- src/lib/components/ui/Expandable.svelte | 7 +- src/lib/components/ui/ExpandableImage.svelte | 4 +- src/lib/components/ui/LabelStat.svelte | 17 +++-- src/lib/components/ui/Placeholder.svelte | 6 +- src/lib/components/ui/SectionTitle.svelte | 4 +- src/lib/components/ui/StickyCard.svelte | 7 +- src/lib/components/ui/layout/Shell.svelte | 5 +- .../components/ui/layout/pages/Header.svelte | 10 +-- .../components/ui/layout/pages/Tabs.svelte | 4 +- .../components/ui/list/EditableList.svelte | 4 +- src/lib/components/ui/navbar/NavButton.svelte | 4 +- src/lib/components/ui/navbar/Navbar.svelte | 7 +- src/lib/components/ui/navbar/Profile.svelte | 4 +- .../ui/navbar/commands/CommandItem.svelte | 4 +- src/lib/components/ui/sidebar/Sidebar.svelte | 8 ++- .../ui/sidebar/SidebarButton.svelte | 4 +- src/lib/components/ui/text/TextProps.svelte | 4 +- .../components/util/FormattedNumber.svelte | 5 +- src/lib/components/util/RelativeDate.svelte | 10 ++- src/lib/mono/badge/Badge.svelte | 69 ++++++++++--------- src/lib/mono/button/Button.svelte | 5 +- src/lib/mono/code/Codeblock.svelte | 5 +- src/lib/mono/code/Snippet.svelte | 5 +- src/lib/mono/disclosure/Disclosure.svelte | 4 +- src/lib/mono/forms/ChoiceboxGroup.svelte | 8 +-- src/lib/mono/forms/FileInput.svelte | 5 +- src/lib/mono/forms/Form.svelte | 31 +++++---- src/lib/mono/forms/Label.svelte | 33 +++++---- src/lib/mono/forms/RadioGroup.svelte | 6 +- src/lib/mono/forms/Select.svelte | 6 +- src/lib/mono/forms/Switch.svelte | 8 ++- src/lib/mono/forms/TextArea.svelte | 8 ++- src/lib/mono/forms/TextInput.svelte | 8 ++- src/lib/mono/materials/Material.svelte | 4 +- src/lib/mono/popover/Menu.svelte | 4 +- src/lib/mono/popover/MenuButton.svelte | 4 +- src/lib/mono/popover/Popover.svelte | 10 +-- src/lib/mono/popover/Portal.svelte | 47 +++++++------ src/routes/about/Profile.svelte | 5 +- src/routes/settings/Setting.svelte | 14 ++-- src/routes/theme/ColorSwatch.svelte | 5 +- 69 files changed, 383 insertions(+), 214 deletions(-) diff --git a/src/lib/components/error/ErrorContainer.svelte b/src/lib/components/error/ErrorContainer.svelte index db74cc06..938b233d 100644 --- a/src/lib/components/error/ErrorContainer.svelte +++ b/src/lib/components/error/ErrorContainer.svelte @@ -33,11 +33,13 @@ onDestroy(() => { clearErrorScope(scope) }) + let clazz: string = '' + export { clazz as class } {#if scopedErrors.length > 0}
diff --git a/src/lib/components/input/FreeTextInput.svelte b/src/lib/components/input/FreeTextInput.svelte index 1519501c..6313d6b5 100644 --- a/src/lib/components/input/FreeTextInput.svelte +++ b/src/lib/components/input/FreeTextInput.svelte @@ -16,6 +16,8 @@ textarea.style.height = `${textarea.scrollHeight}px` // Set height to the scrollHeight } } + let clazz: string = '' + export { clazz as class } diff --git a/src/lib/components/input/Link.svelte b/src/lib/components/input/Link.svelte index f8f8d9fb..facb9e6b 100644 --- a/src/lib/components/input/Link.svelte +++ b/src/lib/components/input/Link.svelte @@ -14,6 +14,9 @@ export let nowrap: boolean = false $: richURL = $$slots.default ? undefined : parseURL(href) + + let clazz: string = '' + export { clazz as class } {#if richURL} diff --git a/src/lib/components/input/Switch.svelte b/src/lib/components/input/Switch.svelte index 41a3e7d0..f90625a1 100644 --- a/src/lib/components/input/Switch.svelte +++ b/src/lib/components/input/Switch.svelte @@ -10,6 +10,10 @@ export let selected: T export let headless: boolean = false + let clazz: string = '' + export let buttonClazz: string = '' + export { clazz as class } + const dispatcher = createEventDispatcher<{ select: T }>() $: { @@ -19,7 +23,7 @@ let containerClass = ` flex flex-row rtl:flex-row-reverse items-center w-max max-w-full overflow-auto ${headless ? 'pb-1 gap-1' : ''} - ${$$props.class} + ${clazz} ` const buttonClass = (selected: boolean) => ` @@ -27,7 +31,7 @@ last:rounded-r-lg last:border-r last:dark:border-r-transparent rounded-l-none rounded-r-none - px-3 py-1.5 text-sm hover:brightness-110 ${$$props.buttonClass || ''} + px-3 py-1.5 text-sm hover:brightness-110 ${buttonClazz || ''} ${ !selected ? `hover:dark:bg-zinc-800 border-slate-100 border-t border-b border-b-slate-300 dark:border-b-0 diff --git a/src/lib/components/lemmy/SiteCard.svelte b/src/lib/components/lemmy/SiteCard.svelte index 9d2d793c..2e573b6a 100644 --- a/src/lib/components/lemmy/SiteCard.svelte +++ b/src/lib/components/lemmy/SiteCard.svelte @@ -26,9 +26,11 @@ export let taglines: Tagline[] | undefined = undefined export let admins: PersonView[] | undefined = undefined export let version: string | undefined = undefined + let clazz: string = '' + export { clazz as class } - + {#if site.site.banner}
{#if meta} @@ -194,7 +198,7 @@ {/if} {#if open}
diff --git a/src/lib/components/lemmy/community/CommunityCard.svelte b/src/lib/components/lemmy/community/CommunityCard.svelte index eb1b98f9..b8e73691 100644 --- a/src/lib/components/lemmy/community/CommunityCard.svelte +++ b/src/lib/components/lemmy/community/CommunityCard.svelte @@ -140,11 +140,11 @@ loading.subscribing = false } + let clazz: string = '' + export { clazz as class } - + @@ -42,7 +45,7 @@ {#if showInstance} @{new URL(community.actor_id).hostname} diff --git a/src/lib/components/lemmy/dropdowns/Sort.svelte b/src/lib/components/lemmy/dropdowns/Sort.svelte index 5fd4283a..96056701 100644 --- a/src/lib/components/lemmy/dropdowns/Sort.svelte +++ b/src/lib/components/lemmy/dropdowns/Sort.svelte @@ -37,9 +37,12 @@ $: changeDefault ? ($userSettings.defaultSort.sort = selected as SortType) : undefined + + let clazz: string = '' + export { clazz as class } -
+
diff --git a/src/lib/components/input/ImagePreviewInput.svelte b/src/lib/components/input/ImagePreviewInput.svelte index 8a4b9180..50b982b0 100644 --- a/src/lib/components/input/ImagePreviewInput.svelte +++ b/src/lib/components/input/ImagePreviewInput.svelte @@ -13,9 +13,7 @@
- + - - + {@render icon?.()} + {#if children}{@render children()}{:else} - export let value: number - export let min: number = 0 - export let max: number = 100 - export let step: number = 1 + import { createBubbler } from 'svelte/legacy' + + const bubble = createBubbler() + interface Props { + value: number + min?: number + max?: number + step?: number + } + + let { value = $bindable(), min = 0, max = 100, step = 1 }: Props = $props() diff --git a/src/lib/components/input/Switch.svelte b/src/lib/components/input/Switch.svelte index f90625a1..ff670320 100644 --- a/src/lib/components/input/Switch.svelte +++ b/src/lib/components/input/Switch.svelte @@ -1,24 +1,39 @@ {#if type == 'community'} @@ -35,33 +48,35 @@ on:select bind:query={q} {showWhenEmpty} - {...$$restProps} - let:item - let:select + {...rest} > -
- {#if q == '' && showWhenEmpty} - dispatcher('select', undefined)}> - + {#snippet noresults()} +
+ {#if q == '' && showWhenEmpty} + dispatcher('select', undefined)}> + +
+ None +
+
+ {:else} + No results. + {/if} +
+ {/snippet} + {#snippet children({ item, select })} +
+ select(item)}> +
- None + {item.title} + + {new URL(item.actor_id).hostname} +
- {:else} - No results. - {/if} -
-
- select(item)}> - -
- {item.title} - - {new URL(item.actor_id).hostname} - -
-
-
+
+ {/snippet} {:else if type == 'instance'} i.software === 'lemmy' && i.domain.includes(q) + (i) => i.software === 'lemmy' && i.domain.includes(q), ) : [] }} @@ -78,28 +93,30 @@ on:select bind:query={q} {showWhenEmpty} - {...$$restProps} - let:item - let:select + {...rest} > -
- {#if q == '' && showWhenEmpty} - dispatcher('select', undefined)}> + {#snippet noresults()} +
+ {#if q == '' && showWhenEmpty} + dispatcher('select', undefined)}> +
+ None (Start typing to search) +
+
+ {:else} + No results. + {/if} +
+ {/snippet} + {#snippet children({ item, select })} +
+ select(item)}> +
- None (Start typing to search) + {item.domain}
- {:else} - No results. - {/if} -
-
- select(item)}> - -
- {item.domain} -
-
-
+
+ {/snippet}
{/if} diff --git a/src/lib/components/lemmy/SiteCard.svelte b/src/lib/components/lemmy/SiteCard.svelte index 2e573b6a..0d46308a 100644 --- a/src/lib/components/lemmy/SiteCard.svelte +++ b/src/lib/components/lemmy/SiteCard.svelte @@ -22,12 +22,21 @@ import { userSettings } from '$lib/settings' import { optimizeImageURL } from './post/helpers' - export let site: SiteView - export let taglines: Tagline[] | undefined = undefined - export let admins: PersonView[] | undefined = undefined - export let version: string | undefined = undefined - let clazz: string = '' - export { clazz as class } + interface Props { + site: SiteView + taglines?: Tagline[] | undefined + admins?: PersonView[] | undefined + version?: string | undefined + class?: string + } + + let { + site, + taglines = undefined, + admins = undefined, + version = undefined, + class: clazz = '', + }: Props = $props() @@ -45,13 +54,14 @@
{/if} - + {#snippet customIcon()} + + {/snippet}
{/if} diff --git a/src/lib/components/lemmy/comment/CommentActions.svelte b/src/lib/components/lemmy/comment/CommentActions.svelte index f43d5fb2..4dee6295 100644 --- a/src/lib/components/lemmy/comment/CommentActions.svelte +++ b/src/lib/components/lemmy/comment/CommentActions.svelte @@ -30,14 +30,22 @@ import { text } from '$lib/components/translate/translation' import { userSettings } from '$lib/settings' - export let comment: CommentView - export let replying: boolean = false - export let disabled = false + interface Props { + comment: CommentView + replying?: boolean + disabled?: boolean + } + + let { + comment = $bindable(), + replying = $bindable(false), + disabled = false, + }: Props = $props() const dispatcher = createEventDispatcher<{ edit: CommentView }>() let reply = '' - let translating = false + let translating = $state(false) {#if translating} @@ -69,22 +77,19 @@ {/if} - + {#snippet target()} + + {/snippet} {$t('comment.actions.label')} { @@ -104,7 +109,9 @@ translating = !translating }} > - + {#snippet prefix()} + + {/snippet} {$t('post.actions.more.translate')} {/if} @@ -134,7 +141,7 @@ comment.comment.deleted = await deleteItem( comment, !comment.comment.deleted, - $profile.jwt + $profile.jwt, ) }} > @@ -154,5 +161,5 @@ {/if} {/if} -
+
diff --git a/src/lib/components/lemmy/comment/CommentForm.svelte b/src/lib/components/lemmy/comment/CommentForm.svelte index e0a24160..30b80d47 100644 --- a/src/lib/components/lemmy/comment/CommentForm.svelte +++ b/src/lib/components/lemmy/comment/CommentForm.svelte @@ -12,26 +12,39 @@ import { errorMessage } from '$lib/lemmy/error' import { Icon, XMark } from 'svelte-hero-icons' - export let postId: number - export let parentId: number | undefined = undefined - export let locked: boolean = false - export let banned: boolean = false - export let rows: number = 7 - export let placeholder: string | undefined = undefined - const dispatch = createEventDispatcher<{ comment: CommentResponse confirm: string cancel: boolean }>() - export let value = '' - export let actions = true + interface Props { + postId: number + parentId?: number | undefined + locked?: boolean + banned?: boolean + rows?: number + placeholder?: string | undefined + value?: string + actions?: boolean + preview?: boolean + [key: string]: any + } - let previewAction = true - export { previewAction as preview } + let { + postId, + parentId = undefined, + locked = false, + banned = false, + rows = 7, + placeholder = undefined, + value = $bindable(''), + actions = true, + preview: previewAction = true, + ...rest + }: Props = $props() - let loading = false + let loading = $state(false) let preview = false async function submit() { @@ -70,7 +83,7 @@
{:else} -
+
{#if actions}
diff --git a/src/lib/components/lemmy/comment/CommentListVirtualizer.svelte b/src/lib/components/lemmy/comment/CommentListVirtualizer.svelte index 17ab52ea..53279853 100644 --- a/src/lib/components/lemmy/comment/CommentListVirtualizer.svelte +++ b/src/lib/components/lemmy/comment/CommentListVirtualizer.svelte @@ -1,4 +1,6 @@ @@ -149,34 +155,39 @@ name={community_view.community.title} label="!{fullCommunityName( community_view.community.name, - community_view.community.actor_id + community_view.community.actor_id, )}" > - + {#snippet customIcon()} + + {/snippet}

- - - {$t('cards.site.about')} - + {#snippet title()} + + + {$t('cards.site.about')} + + {/snippet}
- - - {$t('cards.site.stats')} - + {#snippet title()} + + + {$t('cards.site.stats')} + + {/snippet}
0}
- - - {$t('cards.community.moderators')} - + {#snippet title()} + + + {$t('cards.community.moderators')} + + {/snippet} ({ id: m.moderator.id, @@ -224,12 +237,13 @@ on:click={subscribe} class="flex-1 relative z-[inherit]" > - + {#snippet prefix()} + + {/snippet} {community_view.subscribed == 'Subscribed' || community_view.subscribed == 'Pending' ? $t('cards.community.subscribed') @@ -240,17 +254,23 @@ {/if}
- + {#snippet target()} + + {/snippet} {$t('cards.community.modlog')} @@ -262,7 +282,9 @@ on:click={() => block(community_view.community.id, !community_view.blocked)} > - + {#snippet prefix()} + + {/snippet} {community_view.blocked ? $t('cards.community.unblock') : $t('cards.community.block')} @@ -273,7 +295,9 @@ size="lg" on:click={() => blockInstance(community_view.community.instance_id)} > - + {#snippet prefix()} + + {/snippet} {$t('cards.community.blockInstance')} {/if} @@ -301,7 +325,9 @@ type: 'error', })} > - + {#snippet prefix()} + + {/snippet} {$t('admin.purge')} {/if} diff --git a/src/lib/components/lemmy/community/CommunityForm.svelte b/src/lib/components/lemmy/community/CommunityForm.svelte index 8c3ce656..701ba541 100644 --- a/src/lib/components/lemmy/community/CommunityForm.svelte +++ b/src/lib/components/lemmy/community/CommunityForm.svelte @@ -1,4 +1,6 @@ - + {#if formtitle}{@render formtitle()}{:else}
{$t('routes.createCommunity')}
-
+ {/if} {$t('routes.admin.config.icon')} + {#snippet nameDetail()} + + {/snippet} {#if moderators.length > 0} - + {#snippet title()} {$t('cards.community.moderators')} - + {/snippet} ({ id: m.moderator.id, @@ -114,30 +125,32 @@ dark:border-zinc-800 border-slate-300 border-opacity-50 text-slate-700 dark:text counts: counts ?? {}, subscribed: subscribed, }} - let:subscribe - let:subscribing > - + {#snippet children({ subscribe, subscribing })} + + {/snippet} {/if} @@ -150,7 +163,7 @@ dark:border-zinc-800 border-slate-300 border-opacity-50 text-slate-700 dark:text rounding="xl" href="/c/{fullCommunityName( community.name, - community.actor_id + community.actor_id, )}/settings" style="height: 38px; width: 38px;" > @@ -158,14 +171,13 @@ dark:border-zinc-800 border-slate-300 border-opacity-50 text-slate-700 dark:text {/if}
- + {#snippet target()} + + {/snippet} {$t('cards.community.modlog')} @@ -176,7 +188,9 @@ dark:border-zinc-800 border-slate-300 border-opacity-50 text-slate-700 dark:text size="lg" on:click={() => block(community.id, !blocked)} > - + {#snippet prefix()} + + {/snippet} {blocked ? $t('cards.community.unblock') : $t('cards.community.block')} @@ -187,7 +201,9 @@ dark:border-zinc-800 border-slate-300 border-opacity-50 text-slate-700 dark:text size="lg" on:click={() => blockInstance(community.instance_id)} > - + {#snippet prefix()} + + {/snippet} {$t('cards.community.blockInstance')} {/if} @@ -215,7 +231,9 @@ dark:border-zinc-800 border-slate-300 border-opacity-50 text-slate-700 dark:text type: 'error', })} > - + {#snippet prefix()} + + {/snippet} {$t('admin.purge')} {/if} diff --git a/src/lib/components/lemmy/community/CommunityItem.svelte b/src/lib/components/lemmy/community/CommunityItem.svelte index bff71559..2fe66798 100644 --- a/src/lib/components/lemmy/community/CommunityItem.svelte +++ b/src/lib/components/lemmy/community/CommunityItem.svelte @@ -23,13 +23,22 @@ import { t } from '$lib/translations' import Entity from '$lib/components/ui/Entity.svelte' - export let community: CommunityView - export let view: 'cozy' | 'compact' = 'compact' - export let showCounts: boolean = true + let showInfo = $state(false) + interface Props { + community: CommunityView + view?: 'cozy' | 'compact' + showCounts?: boolean + class?: string + icon?: import('svelte').Snippet + } - let showInfo = false - let clazz: string = 'py-4 flex flex-col gap-4 text-sm max-w-full relative' - export { clazz as class } + let { + community = $bindable(), + view = 'compact', + showCounts = true, + class: clazz = 'py-4 flex flex-col gap-4 text-sm max-w-full relative', + icon, + }: Props = $props() {#if showInfo} @@ -48,7 +57,7 @@ - + {#if icon}{@render icon()}{:else} - + {/if}
@@ -92,50 +101,55 @@ - - + community.subscribed = newSubscribed + addSubscription( + community.community, + newSubscribed == 'Subscribed', + ) + } + }} + size="custom" + title={isSubscribed(community.subscribed) + ? $t('cards.community.subscribed') + : $t('cards.community.subscribe')} + color={isSubscribed(community.subscribed) + ? 'elevatedLow' + : 'primary'} + class="{isSubscribed(community.subscribed) + ? 'text-slate-600 dark:text-zinc-400' + : ''} + aspect-square h-8 @md:px-2 @md:min-w-32 @md:aspect-auto" + > + {#snippet prefix()} + + {/snippet} + + + {/snippet}
diff --git a/src/lib/components/lemmy/community/CommunityLink.svelte b/src/lib/components/lemmy/community/CommunityLink.svelte index b94e31b8..64e785bd 100644 --- a/src/lib/components/lemmy/community/CommunityLink.svelte +++ b/src/lib/components/lemmy/community/CommunityLink.svelte @@ -5,25 +5,37 @@ import type { Community } from 'lemmy-js-client' import { ExclamationTriangle, Icon } from 'svelte-hero-icons' - export let community: Community - - export let avatar: boolean = false - export let name: boolean = true - export let avatarSize: number = 24 - export let showInstance: boolean = $userSettings.showInstances.community - export let displayName: boolean = true - - export let badges = { - nsfw: false, + interface Props { + community: Community + avatar?: boolean + name?: boolean + avatarSize?: number + showInstance?: boolean + displayName?: boolean + badges?: any + class?: string + instanceClass?: string + [key: string]: any } - let clazz: string = '' - export let instanceClass: string = '' - export { clazz as class } + let { + community, + avatar = false, + name = true, + avatarSize = 24, + showInstance = $userSettings.showInstances.community, + displayName = true, + badges = { + nsfw: false, + }, + class: clazz = '', + instanceClass = '', + ...rest + }: Props = $props()
diff --git a/src/lib/components/lemmy/dropdowns/Location.svelte b/src/lib/components/lemmy/dropdowns/Location.svelte index dc82a253..95efa1dc 100644 --- a/src/lib/components/lemmy/dropdowns/Location.svelte +++ b/src/lib/components/lemmy/dropdowns/Location.svelte @@ -1,4 +1,6 @@ { @@ -52,10 +68,12 @@ if (navigate) searchParam($page.url, 'sort', selected, 'page', 'cursor') }} > - - - {$t('filter.sort.label')} - + {#snippet label()} + + + {$t('filter.sort.label')} + + {/snippet}
diff --git a/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte b/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte index d3522bee..478370ad 100644 --- a/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte +++ b/src/lib/components/lemmy/modal/ApplicationDenyModal.svelte @@ -1,16 +1,25 @@ -

- {$t('routes.admin.applications.modalTitle')} -

- deny()} class="flex flex-col gap-4"> + {#snippet title()} +

+ {$t('routes.admin.applications.modalTitle')} +

+ {/snippet} + deny())} class="flex flex-col gap-4"> + import { preventDefault } from 'svelte/legacy' + import { profile } from '$lib/auth.js' import ProgressBar from '$lib/components/ui/ProgressBar.svelte' import { errorMessage } from '$lib/lemmy/error' @@ -11,14 +13,24 @@ import { expoOut } from 'svelte/easing' import { slide } from 'svelte/transition' - export let open: boolean - export let image: FileList | null = null - export let preview: boolean = true - export let multiple: boolean = true - let progress = 1 + interface Props { + open: boolean + image?: FileList | null + preview?: boolean + multiple?: boolean + } - $: previewURLs = - preview && image ? Array.from(image).map(URL.createObjectURL) : undefined + let { + open = $bindable(), + image = $bindable(null), + preview = true, + multiple = true, + }: Props = $props() + let progress = $state(1) + + let previewURLs = $derived( + preview && image ? Array.from(image).map(URL.createObjectURL) : undefined, + ) const dispatcher = createEventDispatcher<{ upload: string[] }>() @@ -39,8 +51,8 @@ .catch((err) => { toast({ content: errorMessage(err), type: 'error' }) return 'Failed to upload' - }) - ) + }), + ), ) ).filter((i) => i != undefined) @@ -61,13 +73,15 @@ -
Upload image
+ {#snippet title()} +
Upload image
+ {/snippet} {#if progress != 1}
{/if} - +
- + {#snippet target()} + + {/snippet} {#if ($profile?.user && amMod($profile.user, item.community)) || ($profile?.user && isAdmin($profile.user))} {#if !item.community.local && !amMod($profile.user, item.community)} @@ -36,7 +42,9 @@ {/if} remove(item)}> - + {#snippet prefix()} + + {/snippet} {#if isCommentView(item)} {item.comment.removed ? $t('moderation.restore') @@ -52,7 +60,9 @@ on:click={() => ban(item.creator_banned_from_community, item.creator, item.community)} > - + {#snippet prefix()} + + {/snippet} {item.creator_banned_from_community ? $t('moderation.ban.unbanFromCommunity') : $t('moderation.ban.banFromCommunity')} @@ -67,12 +77,14 @@ await feature( !item.comment.distinguished, item.comment, - $profile.jwt + $profile.jwt, ) ).comment_view.comment }} > - + {#snippet prefix()} + + {/snippet} {item.comment.distinguished ? $t('moderation.unfeature') : $t('moderation.feature')} @@ -83,7 +95,9 @@ {#if $profile?.user && isAdmin($profile.user)} {$t('admin.label')} remove(item, true)}> - + {#snippet prefix()} + + {/snippet} {$t('admin.purge')} {/if} diff --git a/src/lib/components/lemmy/moderation/ModerationMenu.svelte b/src/lib/components/lemmy/moderation/ModerationMenu.svelte index c2f1a628..52fbc14a 100644 --- a/src/lib/components/lemmy/moderation/ModerationMenu.svelte +++ b/src/lib/components/lemmy/moderation/ModerationMenu.svelte @@ -18,12 +18,17 @@ import { t } from '$lib/translations' import ShieldIcon from './ShieldIcon.svelte' - export let item: PostView | CommentView + interface Props { + item: PostView | CommentView + [key: string]: any + } - let locking = false - let pinning = false + let { item = $bindable(), ...rest }: Props = $props() - $: acting = locking || pinning + let locking = $state(false) + let pinning = $state(false) + + let acting = $derived(locking || pinning) async function lock(lock: boolean) { if (!$profile?.jwt || !isPostView(item)) return @@ -71,16 +76,17 @@ - + {#snippet target()} + + {/snippet} {#if ($profile?.user && amMod($profile.user, item.community)) || ($profile?.user && isAdmin($profile.user))} {#if !item.community.local && !amMod($profile.user, item.community)} @@ -95,12 +101,9 @@ loading={locking} disabled={locking} > - + {#snippet prefix()} + + {/snippet} {item.post.locked ? $t('moderation.unlock') : $t('moderation.lock')} diff --git a/src/lib/components/lemmy/moderation/RemoveModal.svelte b/src/lib/components/lemmy/moderation/RemoveModal.svelte index 0f9c0dd7..72030723 100644 --- a/src/lib/components/lemmy/moderation/RemoveModal.svelte +++ b/src/lib/components/lemmy/moderation/RemoveModal.svelte @@ -1,4 +1,6 @@ {#if item} {#if isCommentView(item)} @@ -212,16 +227,18 @@ placeholder={replyReason} rows={3} > -
- {$t('comment.reply')} - -
+ {#snippet label()} +
+ {$t('comment.reply')} + +
+ {/snippet} {/if} {/if} @@ -233,7 +250,9 @@ disabled={loading} submit > - + {#snippet prefix()} + + {/snippet} {#if purge} {$t('admin.purge')} {:else} diff --git a/src/lib/components/lemmy/moderation/ReportModal.svelte b/src/lib/components/lemmy/moderation/ReportModal.svelte index cf59812e..99296ab1 100644 --- a/src/lib/components/lemmy/moderation/ReportModal.svelte +++ b/src/lib/components/lemmy/moderation/ReportModal.svelte @@ -1,4 +1,6 @@ - + {#if item}
{#if isComment(item)} diff --git a/src/lib/components/lemmy/moderation/ShieldIcon.svelte b/src/lib/components/lemmy/moderation/ShieldIcon.svelte index f52f5394..2a16d83b 100644 --- a/src/lib/components/lemmy/moderation/ShieldIcon.svelte +++ b/src/lib/components/lemmy/moderation/ShieldIcon.svelte @@ -1,9 +1,11 @@ {#if filled} diff --git a/src/lib/components/lemmy/moderation/moderation.ts b/src/lib/components/lemmy/moderation/moderation.ts index 94e3e5c1..0f49debb 100644 --- a/src/lib/components/lemmy/moderation/moderation.ts +++ b/src/lib/components/lemmy/moderation/moderation.ts @@ -106,7 +106,7 @@ export const removalTemplate = ( communityLink?: string username?: string reason?: string - } + }, ) => { if (content.postTitle) input = input.replaceAll('{{post}}', content.postTitle) if (content.communityLink) diff --git a/src/lib/components/lemmy/post/Post.svelte b/src/lib/components/lemmy/post/Post.svelte index 6f9c419d..1db93c09 100644 --- a/src/lib/components/lemmy/post/Post.svelte +++ b/src/lib/components/lemmy/post/Post.svelte @@ -31,26 +31,6 @@ import { profile } from '$lib/auth' import { goto } from '$app/navigation' - export let post: PostView - export let actions: boolean = true - export let hideCommunity = false - export let view = $userSettings.view - - $: tags = parseTags(post.post.name) - $: type = mediaType(post.post.url, view) - $: rule = getTagRule(tags.tags) - - $: hideTitle = - $userSettings.posts.deduplicateEmbed && - post.post.embed_title == post.post.name && - view != 'compact' && - type != 'iframe' - - $: hideBody = - $userSettings.posts.deduplicateEmbed && - post.post.embed_description == post.post.body && - view != 'compact' - function getTagRule(tags: Tag[]): 'blur' | 'hide' | undefined { const tagContent = tags.map((t) => t.content.toLowerCase()) @@ -75,9 +55,40 @@ } } - export let style: string = '' - let clazz: string = '' - export { clazz as class } + interface Props { + post: PostView + actions?: boolean + hideCommunity?: boolean + view?: any + style?: string + class?: string + badges?: import('svelte').Snippet + } + + let { + post, + actions = true, + hideCommunity = false, + view = $userSettings.view, + style = '', + class: clazz = '', + badges, + }: Props = $props() + + let tags = $derived(parseTags(post.post.name)) + let type = $derived(mediaType(post.post.url, view)) + let rule = $derived(getTagRule(tags.tags)) + let hideTitle = $derived( + $userSettings.posts.deduplicateEmbed && + post.post.embed_title == post.post.name && + view != 'compact' && + type != 'iframe', + ) + let hideBody = $derived( + $userSettings.posts.deduplicateEmbed && + post.post.embed_description == post.post.body && + view != 'compact', + ) - - - + + +
{ + onclick={(e) => { onClick(e) }} - on:keydown={(e) => { + onkeydown={(e) => { // @ts-ignore if (e.key == 'Enter') onClick(e) }} @@ -135,7 +146,9 @@ tags={tags?.tags} {view} > - + {#snippet extraBadges()} + {@render badges?.()} + {/snippet} {#key post.post.url}
- + {#snippet icon()} + + {/snippet} {post.counts.score} - + {#snippet icon()} + + {/snippet} {post.counts.comments}
@@ -194,7 +211,7 @@ group-hover:inset-y-0.5 group-hover:-inset-x-4 group-hover:sm:-inset-x-5 group-hover:opacity-100 group-focus:inset-y-0.5 group-focus:-inset-x-4 group-focus:sm:-inset-x-5 group-focus:opacity-100 duration-150" - /> + >
diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte index e3a82f29..a1fd848a 100644 --- a/src/routes/search/+page.svelte +++ b/src/routes/search/+page.svelte @@ -39,13 +39,14 @@ import Header from '$lib/components/ui/layout/pages/Header.svelte' import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte' import { contentPadding } from '$lib/components/ui/layout/Shell.svelte' + import { goto } from '$app/navigation' type Result = PostView | CommentView | PersonView | CommunityView let { data = $bindable() } = $props() let query = $state(data.query || '') - let searchElement: HTMLInputElement = $state() + let searchElement: HTMLInputElement | undefined = $state() let pageNum = $state(data.page) @@ -71,14 +72,14 @@ > - searchParam($page.url, 'q', query, 'page'), - )} + method="get" + action="/search" class="flex gap-2 flex-row items-center w-full text-base h-10" > searchParam($page.url, 'type', data.type ?? 'All', 'page')} > - {#snippet label()} + {#snippet customLabel()} {$t('filter.type')} From adc5dc3ad37b30c7552714ee1245664d6c9f4261 Mon Sep 17 00:00:00 2001 From: Xylight Date: Sun, 10 Nov 2024 13:34:28 -0800 Subject: [PATCH 015/161] impr: use native forms instead of submit events --- src/lib/components/input/FreeTextInput.svelte | 2 +- .../lemmy/community/CommunityForm.svelte | 2 +- src/lib/components/ui/Expandable.svelte | 9 ++--- src/lib/mono/forms/{ => select}/Select.svelte | 22 ++++++------- src/lib/mono/index.ts | 2 +- src/lib/mono/popover/Menu.svelte | 33 +++++++------------ src/routes/saved/+page.svelte | 8 ++--- 7 files changed, 33 insertions(+), 45 deletions(-) rename src/lib/mono/forms/{ => select}/Select.svelte (87%) diff --git a/src/lib/components/input/FreeTextInput.svelte b/src/lib/components/input/FreeTextInput.svelte index 301b26d1..66cf0102 100644 --- a/src/lib/components/input/FreeTextInput.svelte +++ b/src/lib/components/input/FreeTextInput.svelte @@ -4,7 +4,7 @@ import { browser } from '$app/environment' import { tick } from 'svelte' - let textarea: HTMLTextAreaElement = $state() + let textarea: HTMLTextAreaElement | undefined = $state() async function adjustHeight(value: string) { await tick() diff --git a/src/lib/components/lemmy/community/CommunityForm.svelte b/src/lib/components/lemmy/community/CommunityForm.svelte index 9278d15e..1fa1a96d 100644 --- a/src/lib/components/lemmy/community/CommunityForm.svelte +++ b/src/lib/components/lemmy/community/CommunityForm.svelte @@ -15,7 +15,7 @@ import Label from 'mono-svelte/forms/Label.svelte' import { DocumentPlus, Icon } from 'svelte-hero-icons' import ImageUploadModal from '../modal/ImageUploadModal.svelte' - import Select from 'mono-svelte/forms/Select.svelte' + import Select from 'mono-svelte/forms/select/Select.svelte' interface Props { /** diff --git a/src/lib/components/ui/Expandable.svelte b/src/lib/components/ui/Expandable.svelte index 8128dcc0..806ffbed 100644 --- a/src/lib/components/ui/Expandable.svelte +++ b/src/lib/components/ui/Expandable.svelte @@ -22,7 +22,11 @@ }: Props = $props() - + {#snippet summary()}
{@render children?.()} diff --git a/src/lib/mono/forms/Select.svelte b/src/lib/mono/forms/select/Select.svelte similarity index 87% rename from src/lib/mono/forms/Select.svelte rename to src/lib/mono/forms/select/Select.svelte index 2802396b..03ae37e7 100644 --- a/src/lib/mono/forms/Select.svelte +++ b/src/lib/mono/forms/select/Select.svelte @@ -1,4 +1,4 @@ - - {#snippet target()} - {@render target?.()} - {/snippet} {#snippet popover()}
diff --git a/src/routes/saved/+page.svelte b/src/routes/saved/+page.svelte index 26577345..5ec75d2d 100644 --- a/src/routes/saved/+page.svelte +++ b/src/routes/saved/+page.svelte @@ -26,11 +26,7 @@ let { data } = $props() - // svelte being stupid - let type - run(() => { - type = data.type as any - }) + let type = $state(data.type)! const isComment = (item: CommentView | PostView): item is CommentView => 'comment' in item @@ -49,7 +45,7 @@ bind:value={type} on:change={() => searchParam($page.url, 'type', type, 'page')} > - {#snippet label()} + {#snippet customLabel()}
{$t('filter.filter')} From 04b29c14079508e52d6af9a1f93a2e3c4801e319 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Mon, 23 Dec 2024 13:49:11 -0800 Subject: [PATCH 016/161] fix: some errors --- package.json | 4 ++-- .../components/ui/navbar/commands/CommandItem.svelte | 6 +++++- .../components/ui/navbar/commands/Commands.svelte | 3 ++- src/lib/components/ui/sidebar/SidebarButton.svelte | 1 + src/routes/+layout.svelte | 7 +++++++ src/routes/communities/+page.svelte | 1 + .../profile/(local_user)/password/2fa/+page.svelte | 12 ++++-------- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 14b94104..e843c6e9 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "@sveltejs/adapter-auto": "^3.3.1", "@sveltejs/adapter-node": "^5.2.9", "@sveltejs/adapter-vercel": "^5.4.6", - "@sveltejs/kit": "^2.7.3", + "@sveltejs/kit": "^2.15.0", "@sveltejs/vite-plugin-svelte": "^3.1.2", "@tailwindcss/container-queries": "^0.1.1", "@tanstack/svelte-virtual": "^3.8.1", @@ -26,7 +26,7 @@ "prettier": "^3.3.3", "prettier-plugin-svelte": "^3.2.7", "rollup-plugin-visualizer": "^5.9.2", - "svelte": "^5.1.3", + "svelte": "^5.15.0", "svelte-check": "^4.0.0", "svelte-floating-ui": "^1.5.9", "svelte-focus-trap": "^1.2.0", diff --git a/src/lib/components/ui/navbar/commands/CommandItem.svelte b/src/lib/components/ui/navbar/commands/CommandItem.svelte index 540e5002..933ae75e 100644 --- a/src/lib/components/ui/navbar/commands/CommandItem.svelte +++ b/src/lib/components/ui/navbar/commands/CommandItem.svelte @@ -8,14 +8,17 @@ } from 'svelte-hero-icons' import Avatar from '../../Avatar.svelte' import type { Action } from './actions.svelte' + import type { HTMLButtonAttributes } from 'svelte/elements' interface Props { action: Action class?: string children?: import('svelte').Snippet + onclick?: HTMLButtonAttributes['onclick'] + [key: string]: any } - let { action, class: clazz = '', children }: Props = $props() + let { action, class: clazz = '', children, ...rest }: Props = $props() + {$t('routes.communities.title')} +
- import { run, preventDefault } from 'svelte/legacy' - import { goto } from '$app/navigation' import { page } from '$app/stores' import Header from '$lib/components/ui/layout/pages/Header.svelte' @@ -14,11 +12,9 @@ // @ts-ignore let totpLink: string | undefined = $state(undefined) - let totpEnabled - run(() => { - totpEnabled = - data.my_user?.local_user_view.local_user.totp_2fa_enabled ?? totpLink - }) + let totpEnabled = $state( + data.my_user?.local_user_view.local_user.totp_2fa_enabled, + ) let verify_totp = $state('') @@ -83,7 +79,7 @@ {/if} {})} + onsubmit={(e) => e.preventDefault()} > Date: Mon, 23 Dec 2024 13:51:17 -0800 Subject: [PATCH 017/161] fix:update package-lock.json --- package-lock.json | 59 +++++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index 87c09ff2..54d9ff94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@sveltejs/adapter-auto": "^3.3.1", "@sveltejs/adapter-node": "^5.2.9", "@sveltejs/adapter-vercel": "^5.4.6", - "@sveltejs/kit": "^2.7.3", + "@sveltejs/kit": "^2.15.0", "@sveltejs/vite-plugin-svelte": "^3.1.2", "@tailwindcss/container-queries": "^0.1.1", "@tanstack/svelte-virtual": "^3.8.1", @@ -35,7 +35,7 @@ "prettier": "^3.3.3", "prettier-plugin-svelte": "^3.2.7", "rollup-plugin-visualizer": "^5.9.2", - "svelte": "^5.1.3", + "svelte": "^5.15.0", "svelte-check": "^4.0.0", "svelte-floating-ui": "^1.5.9", "svelte-focus-trap": "^1.2.0", @@ -68,6 +68,7 @@ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" @@ -1211,9 +1212,9 @@ } }, "node_modules/@sveltejs/kit": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.7.3.tgz", - "integrity": "sha512-Vx7nq5MJ86I8qXYsVidC5PX6xm+uxt8DydvOdmJoyOK7LvGP18OFEG359yY+aa51t6pENvqZAMqAREQQx1OI2Q==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.15.0.tgz", + "integrity": "sha512-FI1bhfhFNGI2sKg+BhiRyM4eaOvX+KZqRYSQqL5PK3ZZREX2xufZ6MzZAw79N846OnIxYNqcz/3VOUq+FPDd3w==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -1221,7 +1222,7 @@ "@types/cookie": "^0.6.0", "cookie": "^0.6.0", "devalue": "^5.1.0", - "esm-env": "^1.0.0", + "esm-env": "^1.2.1", "import-meta-resolve": "^4.1.0", "kleur": "^4.1.5", "magic-string": "^0.30.5", @@ -1238,9 +1239,9 @@ "node": ">=18.13" }, "peerDependencies": { - "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1", + "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0", "svelte": "^4.0.0 || ^5.0.0-next.0", - "vite": "^5.0.3" + "vite": "^5.0.3 || ^6.0.0" } }, "node_modules/@sveltejs/vite-plugin-svelte": { @@ -2291,20 +2292,20 @@ } }, "node_modules/esm-env": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.0.0.tgz", - "integrity": "sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA==", - "dev": true + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.1.tgz", + "integrity": "sha512-U9JedYYjCnadUlXk7e1Kr+aENQhtUaoaV9+gZm1T8LC/YBAPJx3NSPIAurFOC0U5vrdSevnUJS2/wUVxGwPhng==", + "dev": true, + "license": "MIT" }, "node_modules/esrap": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/esrap/-/esrap-1.2.2.tgz", - "integrity": "sha512-F2pSJklxx1BlQIQgooczXCPHmcWpn6EsP5oo73LQfonG9fIlIENQ8vMmfGXeojP9MrkzUNAfyU5vdFlR9shHAw==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/esrap/-/esrap-1.3.2.tgz", + "integrity": "sha512-C4PXusxYhFT98GjLSmb20k9PREuUdporer50dhzGuJu9IJXktbMddVCMLAERl5dAHyAi73GWWCE4FVHGP1794g==", "dev": true, "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15", - "@types/estree": "^1.0.1" + "@jridgewell/sourcemap-codec": "^1.4.15" } }, "node_modules/estree-walker": { @@ -2958,7 +2959,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz", "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/loupe": { "version": "2.3.7", @@ -4361,9 +4363,9 @@ } }, "node_modules/svelte": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.1.3.tgz", - "integrity": "sha512-Sl8UFHlBvF54aK8MElFvyvaUfPE2REOz6LnhR2pBClCL11MU4qpn4V+KgAggaXxDyrP2iQixvHbtpHqL/zXlSQ==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.15.0.tgz", + "integrity": "sha512-YWl8rAd4hSjERLtLvP6h2pflGtmrJwv+L12BgrOtHYJCpvLS9WKp/YNAdyolw3FymXtcYZqhSWvWlu5O1X7tgQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4374,9 +4376,9 @@ "acorn-typescript": "^1.4.13", "aria-query": "^5.3.1", "axobject-query": "^4.1.0", - "esm-env": "^1.0.0", - "esrap": "^1.2.2", - "is-reference": "^3.0.2", + "esm-env": "^1.2.1", + "esrap": "^1.3.2", + "is-reference": "^3.0.3", "locate-character": "^3.0.0", "magic-string": "^0.30.11", "zimmerframe": "^1.1.2" @@ -4523,12 +4525,13 @@ } }, "node_modules/svelte/node_modules/is-reference": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.2.tgz", - "integrity": "sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz", + "integrity": "sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==", "dev": true, + "license": "MIT", "dependencies": { - "@types/estree": "*" + "@types/estree": "^1.0.6" } }, "node_modules/sveltekit-i18n": { diff --git a/package.json b/package.json index e843c6e9..d58fab64 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "vitest": "^1.0.0" }, "overrides": { - "svelte": "^5.1.3" + "svelte": "^5.15.0" }, "private": true, "scripts": { From f6214b664056006fd0ad06222673f76eccb9cd7e Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sat, 28 Dec 2024 12:30:14 -0800 Subject: [PATCH 018/161] fix: reactive mutable page.ts data now is $state --- src/lib/mono/button/Button.svelte | 3 +++ src/routes/inbox/+page.svelte | 10 +++++---- src/routes/moderation/+page.svelte | 33 ++++++++++++++++------------- src/routes/moderation/Report.svelte | 2 ++ 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/src/lib/mono/button/Button.svelte b/src/lib/mono/button/Button.svelte index ef0980e8..d205c82a 100644 --- a/src/lib/mono/button/Button.svelte +++ b/src/lib/mono/button/Button.svelte @@ -65,6 +65,8 @@
@@ -29,7 +31,7 @@ bind:value={data.type} on:change={() => searchParam($page.url, 'type', data.type, 'page')} > - {#snippet label()} + {#snippet customLabel()} {$t('filter.filter')} @@ -46,22 +48,23 @@ {/snippet}
-{#if data.items && data.items.length > 0} +{#if reports && reports.length > 0}
- {#each data.items as item} -
- -
- - Report from - - - - -
+ {#each reports as item} +
+
+ + Report from + + + + +
- - +
{/each}
diff --git a/src/routes/moderation/Report.svelte b/src/routes/moderation/Report.svelte index dd47874a..15c8cc0f 100644 --- a/src/routes/moderation/Report.svelte +++ b/src/routes/moderation/Report.svelte @@ -138,6 +138,8 @@ : ''}" loading={resolving} disabled={resolving} + rounding="pill" + color="ghost" > {#snippet prefix()} From 104a99f394481659f61abe1b6b57b9286fb85fff Mon Sep 17 00:00:00 2001 From: James Xylight Date: Thu, 23 Jan 2025 07:31:16 -0800 Subject: [PATCH 019/161] misc: modify inboxitem --- src/routes/inbox/InboxItem.svelte | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/routes/inbox/InboxItem.svelte b/src/routes/inbox/InboxItem.svelte index 6e029dd5..25b052ee 100644 --- a/src/routes/inbox/InboxItem.svelte +++ b/src/routes/inbox/InboxItem.svelte @@ -86,20 +86,6 @@ width={28} alt={item.creator.name} /> -
{#if item.type == 'comment_reply'} From 87fba8af0418357a12cffbea1c1989c547c93c6b Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sun, 2 Feb 2025 17:41:46 -0800 Subject: [PATCH 020/161] migrate: fix reactivity issues in data lists --- .../lemmy/post/link/PostLinkSources.svelte | 6 +----- src/routes/communities/+page.svelte | 17 +++++++++++------ src/routes/inbox/+page.svelte | 5 ++++- src/routes/moderation/+page.svelte | 7 ++++++- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/lib/components/lemmy/post/link/PostLinkSources.svelte b/src/lib/components/lemmy/post/link/PostLinkSources.svelte index b9dfc050..2ed98dde 100644 --- a/src/lib/components/lemmy/post/link/PostLinkSources.svelte +++ b/src/lib/components/lemmy/post/link/PostLinkSources.svelte @@ -53,11 +53,7 @@ let { url, type = 'embed', target, ...rest }: Props = $props() - - {#snippet target()} - {@render target?.()} - {/snippet} - + {$t('post.actions.link.title')} {#each sources as source} {#if source.type == type} diff --git a/src/routes/communities/+page.svelte b/src/routes/communities/+page.svelte index 60ac2b58..a566c39f 100644 --- a/src/routes/communities/+page.svelte +++ b/src/routes/communities/+page.svelte @@ -34,6 +34,11 @@ let { data } = $props() + let communities = $state(data.communities) + $effect(() => { + communities = data.communities + }) + let search = $state(data.query || '') let searchElement: HTMLInputElement | undefined = $state() let instance = '' @@ -99,7 +104,7 @@
    - {#if data.communities.length == 0} + {#if communities.length == 0} - {#each data.communities.slice(0, 3) as community, index (community.community.id)} + {#each communities.slice(0, 3) as community, index (community.community.id)}
    {/if} - {#if data.communities.slice(showTop ? 3 : 0).length > 0} + {#if communities.slice(showTop ? 3 : 0).length > 0} {$t('routes.search.other')} {/if} - {#if data.communities} - {@const sliced = data.communities.slice(showTop ? 3 : 0)} + {#if communities} + {@const sliced = communities.slice(showTop ? 3 : 0)}
    {#each sliced as community, index (community.community.id)}
    {/if}
-{#if data.communities.length > 0} +{#if communities.length > 0}
{ + inbox = data.data + }) let markingAsRead = $state(false) @@ -196,7 +199,7 @@ items-center px-2 w-max" > searchParam($page.url, 'page', p.detail.toString())} /> diff --git a/src/routes/moderation/+page.svelte b/src/routes/moderation/+page.svelte index 73afa009..de6215d2 100644 --- a/src/routes/moderation/+page.svelte +++ b/src/routes/moderation/+page.svelte @@ -20,6 +20,9 @@ let { data = $bindable() } = $props() let reports = $state(data.items) + $effect(() => { + reports = data.items + })
@@ -49,7 +52,9 @@
{#if reports && reports.length > 0} -
+
{#each reports as item}
Date: Sun, 2 Feb 2025 17:43:40 -0800 Subject: [PATCH 021/161] cleanup: remove translation --- .../lemmy/comment/CommentActions.svelte | 16 --- .../components/lemmy/post/PostActions.svelte | 21 --- .../components/translate/Translation.svelte | 123 ------------------ src/lib/components/translate/translation.ts | 3 - src/lib/settings.svelte.ts | 2 - src/routes/settings/+page.svelte | 15 --- 6 files changed, 180 deletions(-) delete mode 100644 src/lib/components/translate/Translation.svelte delete mode 100644 src/lib/components/translate/translation.ts diff --git a/src/lib/components/lemmy/comment/CommentActions.svelte b/src/lib/components/lemmy/comment/CommentActions.svelte index ac7c9d69..1b53dbdd 100644 --- a/src/lib/components/lemmy/comment/CommentActions.svelte +++ b/src/lib/components/lemmy/comment/CommentActions.svelte @@ -26,8 +26,6 @@ import { deleteItem, save } from '$lib/lemmy/contentview.js' import { Button, Menu, MenuButton, MenuDivider } from 'mono-svelte' import { t } from '$lib/translations' - import Translation from '$lib/components/translate/Translation.svelte' - import { text } from '$lib/components/translate/translation' import { settings } from '$lib/settings.svelte' interface Props { @@ -101,20 +99,6 @@
{$t('comment.actions.link')}
- {#if settings.translator} - { - // @ts-ignore - text.set(comment.comment.content) - translating = !translating - }} - > - {#snippet prefix()} - - {/snippet} - {$t('post.actions.more.translate')} - - {/if} {#if $profile?.jwt} {#if comment.creator.id == $profile.user?.local_user_view.person.id} dispatcher('edit', comment)}> diff --git a/src/lib/components/lemmy/post/PostActions.svelte b/src/lib/components/lemmy/post/PostActions.svelte index 5e2bccb6..8dd74f24 100644 --- a/src/lib/components/lemmy/post/PostActions.svelte +++ b/src/lib/components/lemmy/post/PostActions.svelte @@ -55,7 +55,6 @@ } from 'mono-svelte' import { fediseer, type Data } from '$lib/fediseer/fediseer' import { t } from '$lib/translations' - import { text } from '$lib/components/translate/translation' import { hidePost, postLink } from './helpers' import { feature } from '$lib/version' import Switch from '$lib/components/input/Switch.svelte' @@ -121,12 +120,6 @@ {/if} -{#if translating} - {#await import('$lib/components/translate/Translation.svelte') then { default: Translation }} - - {/await} -{/if} -
{/if} - {#if post.post.body && settings.translator} - { - // @ts-ignore - text.set(post.post.body) - translating = !translating - }} - > - {#snippet prefix()} - - {/snippet} - {$t('post.actions.more.translate')} - - {/if} {#if $profile?.jwt} { diff --git a/src/lib/components/translate/Translation.svelte b/src/lib/components/translate/Translation.svelte deleted file mode 100644 index 79acae48..00000000 --- a/src/lib/components/translate/Translation.svelte +++ /dev/null @@ -1,123 +0,0 @@ - - - - -
- - - -
- {#if result} - {#await result} -
- -
- {:then result} - - {:catch err} - - {/await} - {:else} - {#if suffix}
- -
    diff --git a/src/lib/components/lemmy/post/form/PostForm.svelte b/src/lib/components/lemmy/post/form/PostForm.svelte index a14a9611..d9913923 100644 --- a/src/lib/components/lemmy/post/form/PostForm.svelte +++ b/src/lib/components/lemmy/post/form/PostForm.svelte @@ -258,8 +258,8 @@ { - if (e.detail) data.url = e.detail[0] + onupload={(e) => { + if (e) data.url = e[0] uploadingImage = false }} /> @@ -282,8 +282,8 @@ listing_type="All" label={$t('form.post.community')} required - on:select={(e) => { - const c = e.detail + onselect={(e) => { + const c = e if (!c) { data.community = null return diff --git a/src/lib/components/lemmy/user/UserAutocomplete.svelte b/src/lib/components/lemmy/user/UserAutocomplete.svelte index 13363b6d..0d5e447b 100644 --- a/src/lib/components/lemmy/user/UserAutocomplete.svelte +++ b/src/lib/components/lemmy/user/UserAutocomplete.svelte @@ -12,6 +12,7 @@ instance?: string | undefined listing_type?: ListingType showWhenEmpty?: boolean + onselect?: (e: any) => void [key: string]: any } @@ -39,9 +40,7 @@ return results.users.map((c) => c.person) }} extractName={(c) => `${c.name}@${new URL(c.actor_id).hostname}`} - on:select bind:query={q} - {showWhenEmpty} {...rest} > {#snippet noresults()} diff --git a/src/lib/components/markdown/MarkdownEditor.svelte b/src/lib/components/markdown/MarkdownEditor.svelte index 45e21f6d..5b30a94e 100644 --- a/src/lib/components/markdown/MarkdownEditor.svelte +++ b/src/lib/components/markdown/MarkdownEditor.svelte @@ -125,8 +125,8 @@ { - e.detail.forEach((i) => { + onupload={(e) => { + e.forEach((i) => { wrapSelection(`![](${i})\n\n`, '') }) }} diff --git a/src/lib/components/ui/list/EditableList.svelte b/src/lib/components/ui/list/EditableList.svelte deleted file mode 100644 index 89cad194..00000000 --- a/src/lib/components/ui/list/EditableList.svelte +++ /dev/null @@ -1,23 +0,0 @@ - - -
      - {@render children?.({ action })} -
    diff --git a/src/lib/components/ui/list/EditableListItem.svelte b/src/lib/components/ui/list/EditableListItem.svelte deleted file mode 100644 index 2253a087..00000000 --- a/src/lib/components/ui/list/EditableListItem.svelte +++ /dev/null @@ -1,13 +0,0 @@ - - -
    - {@render children?.()} -
    diff --git a/src/lib/mono/forms/TextInput.svelte b/src/lib/mono/forms/TextInput.svelte index bcb080e6..2ff0a0a8 100644 --- a/src/lib/mono/forms/TextInput.svelte +++ b/src/lib/mono/forms/TextInput.svelte @@ -12,20 +12,7 @@ sm: 'shadow-sm', none: 'shadow-none', } - - + + @@ -46,7 +48,7 @@ bg-white/50 dark:bg-black/50 box-border p-4" if (!el.contains(e.target)) { open = false - dispatcher('dismissed') + ondismissed?.() } }} > @@ -94,9 +96,9 @@ bg-white/50 dark:bg-black/50 box-border p-4"
- {/each} - {/snippet} - - + +
+ {/each} + + { + e.preventDefault() + addModerator() + }} + class="mt-auto flex gap-2 w-full" +> + onselect={(e) => searchParam( page.url, 'instance', - e.detail?.domain.toString() ?? '', + e?.domain.toString() ?? '', 'page', 'community', 'user', @@ -115,13 +115,8 @@ label="Community" class="flex-1" q={page.url.searchParams.get('community') ? 'Selected' : ''} - on:select={(e) => - searchParam( - page.url, - 'community', - e.detail?.id.toString() ?? '', - 'page', - )} + onselect={(e) => + searchParam(page.url, 'community', e?.id.toString() ?? '', 'page')} /> - searchParam(page.url, 'user', e.detail?.id.toString() ?? '', 'page')} + onselect={(e) => + searchParam(page.url, 'user', e?.id.toString() ?? '', 'page')} /> {#if $profile?.user && isAdmin($profile?.user)} - searchParam( - page.url, - 'mod_id', - e.detail?.id.toString() ?? '', - 'page', - )} + onselect={(e) => + searchParam(page.url, 'mod_id', e?.id.toString() ?? '', 'page')} /> {/if} - -
- {/each} - {/snippet} - + {#snippet prefix()} + + {/snippet} + + +
+ {/each} +
{/if} {#if data.community_blocks?.length > 0}
{$t('content.communities')} - unblockCommunity(i.detail)}> - {#snippet children({ action })} - {#each data.community_blocks as block (block.community.id)} -
+ {#each data.community_blocks as block (block.community.id)} +
+ - -
- {/each} - {/snippet} - + {#snippet prefix()} + + {/snippet} + + +
+ {/each} +
{/if} {#if data.person_blocks?.length > 0}
{$t('content.users')} - unblockUser(i.detail)}> - {#snippet children({ action })} - {#each data.person_blocks as block (block.target.id)} -
+ {#each data.person_blocks as block (block.target.id)} +
+ - -
- {/each} - {/snippet} - + {#snippet prefix()} + + {/snippet} + + +
+ {/each} +
{/if} {:else} diff --git a/src/routes/profile/(local_user)/password/delete/+page.svelte b/src/routes/profile/(local_user)/password/delete/+page.svelte index 117dd817..a7f2ac55 100644 --- a/src/routes/profile/(local_user)/password/delete/+page.svelte +++ b/src/routes/profile/(local_user)/password/delete/+page.svelte @@ -99,9 +99,9 @@ deleteAccount(4)} + onaction={() => deleteAccount(4)} > - {#snippet title()} + {#snippet customTitle()} {$t('form.profile.deleteAccount.label')} {/snippet} { + ondelete={() => { data.images = data.images.toSpliced( data.images.findIndex( (i) => diff --git a/src/routes/profile/media/PictrsImage.svelte b/src/routes/profile/media/PictrsImage.svelte index fcc1ae05..aa3ced11 100644 --- a/src/routes/profile/media/PictrsImage.svelte +++ b/src/routes/profile/media/PictrsImage.svelte @@ -11,8 +11,6 @@ import { createEventDispatcher } from 'svelte' import { ArrowDown, ArrowDownTray, Icon, Trash } from 'svelte-hero-icons' - const dispatch = createEventDispatcher<{ delete: boolean }>() - let loading = $state(false) async function deleteImage(image: LocalImage) { @@ -25,7 +23,7 @@ filename: image.pictrs_alias, }) - dispatch('delete', res) + ondelete?.(res) } catch (e) { toast({ content: e as any, type: 'error' }) } @@ -34,9 +32,10 @@ interface Props { image: LocalImage + ondelete?: (res: boolean) => void } - let { image }: Props = $props() + let { image, ondelete }: Props = $props()
diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte index 5c35ad57..39f49452 100644 --- a/src/routes/search/+page.svelte +++ b/src/routes/search/+page.svelte @@ -139,8 +139,8 @@ jwt={$profile?.jwt} listing_type={'All'} showWhenEmpty={true} - on:select={(c) => - searchParam(page.url, 'community', c.detail?.id || undefined, 'page')} + onselect={(c) => + searchParam(page.url, 'community', c?.id || undefined, 'page')} />
{/if} diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index fd5ad079..9dec4f3a 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -91,7 +91,7 @@ {#if importing} { + onaction={() => { try { if (importText == '') { throw new Error('Import is empty') diff --git a/src/routes/theme/+page.svelte b/src/routes/theme/+page.svelte index 03434c64..0dcbf126 100644 --- a/src/routes/theme/+page.svelte +++ b/src/routes/theme/+page.svelte @@ -34,7 +34,7 @@ {#if importing} { + onaction={() => { try { if (importText == '') { throw new Error('Import is empty') From 95e2dec1390f140cab91c4abbcd50ca5ddcb1b00 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Wed, 5 Feb 2025 19:38:58 -0800 Subject: [PATCH 055/161] cleanup: remove editable list --- src/lib/components/ui/SectionTitle.svelte | 2 +- src/routes/admin/federation/+page.svelte | 2 +- .../(local_user)/blocks/+layout.svelte | 15 -- .../profile/(local_user)/blocks/+page.svelte | 165 ++++++++++-------- 4 files changed, 93 insertions(+), 91 deletions(-) delete mode 100644 src/routes/profile/(local_user)/blocks/+layout.svelte diff --git a/src/lib/components/ui/SectionTitle.svelte b/src/lib/components/ui/SectionTitle.svelte index 4b44474a..d6c64519 100644 --- a/src/lib/components/ui/SectionTitle.svelte +++ b/src/lib/components/ui/SectionTitle.svelte @@ -9,6 +9,6 @@ let { small = false, class: clazz = '', children, ...rest }: Props = $props() - + {@render children?.()} diff --git a/src/routes/admin/federation/+page.svelte b/src/routes/admin/federation/+page.svelte index b6748b79..09417d0c 100644 --- a/src/routes/admin/federation/+page.svelte +++ b/src/routes/admin/federation/+page.svelte @@ -118,7 +118,7 @@ saving = false } - let csv: FileList | null = $state() + let csv = $state() async function parseCsv(files: FileList) { if (!(files.length > 0)) return diff --git a/src/routes/profile/(local_user)/blocks/+layout.svelte b/src/routes/profile/(local_user)/blocks/+layout.svelte deleted file mode 100644 index 56b27f31..00000000 --- a/src/routes/profile/(local_user)/blocks/+layout.svelte +++ /dev/null @@ -1,15 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/routes/profile/(local_user)/blocks/+page.svelte b/src/routes/profile/(local_user)/blocks/+page.svelte index 43b0dbfc..dd091e9d 100644 --- a/src/routes/profile/(local_user)/blocks/+page.svelte +++ b/src/routes/profile/(local_user)/blocks/+page.svelte @@ -20,6 +20,8 @@ import Switch from '$lib/components/input/Switch.svelte' import UserAutocomplete from '$lib/components/lemmy/user/UserAutocomplete.svelte' import { expoOut } from 'svelte/easing' + import Material from 'mono-svelte/materials/Material.svelte' + import Header from '$lib/components/ui/layout/pages/Header.svelte' interface Props { // sveltekit doesn't feel like making types work right now @@ -85,87 +87,102 @@ } +
+ {$t('routes.profile.blocks.title')} +
+ {#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} -
- {$t('content.instances')} -
    - {#each data.my_user?.instance_blocks as block (block.instance.id)} -
    - - -
    - {/each} -
-
- {/if} {#if data.community_blocks?.length > 0} -
+
{$t('content.communities')} -
    - {#each data.community_blocks as block (block.community.id)} -
    - - -
    - {/each} -
+ +
    + {#each data.community_blocks as block (block.community.id)} +
    + + +
    + {/each} +
+
{/if} {#if data.person_blocks?.length > 0} -
+
{$t('content.users')} -
    - {#each data.person_blocks as block (block.target.id)} -
    - - -
    - {/each} -
+ +
    + {#each data.person_blocks as block (block.target.id)} +
    + + +
    + {/each} +
+
+
+ {/if} + {#if data.my_user?.instance_blocks && (data.my_user?.instance_blocks?.length ?? 0) > 0} +
+ + {$t('content.instances')} + + +
    + {#each data.my_user?.instance_blocks as block (block.instance.id)} +
    + + +
    + {/each} +
+
{/if} {:else} From 9383d72e950951cad704667b350f857bb99d55d3 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Wed, 5 Feb 2025 19:41:05 -0800 Subject: [PATCH 056/161] fix: mutable page data --- src/routes/admin/team/+page.svelte | 3 ++- src/routes/c/[name]/settings/team/+page.svelte | 3 ++- src/routes/profile/(local_user)/blocks/+page.svelte | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/routes/admin/team/+page.svelte b/src/routes/admin/team/+page.svelte index 852f8688..a90c7e04 100644 --- a/src/routes/admin/team/+page.svelte +++ b/src/routes/admin/team/+page.svelte @@ -14,7 +14,8 @@ import Header from '$lib/components/ui/layout/pages/Header.svelte' import { t } from '$lib/translations.js' - let { data = $bindable() } = $props() + let { data: pageData } = $props() + let data = $state(pageData) let newAdmin: string = $state(''), adding: boolean = $state(false) diff --git a/src/routes/c/[name]/settings/team/+page.svelte b/src/routes/c/[name]/settings/team/+page.svelte index a28e89a5..dd04eec0 100644 --- a/src/routes/c/[name]/settings/team/+page.svelte +++ b/src/routes/c/[name]/settings/team/+page.svelte @@ -15,7 +15,8 @@ data: PageData } - let { data = $bindable() }: Props = $props() + let { data: pageData }: Props = $props() + let data = $state(pageData) let formData = $state({ newModerator: '', diff --git a/src/routes/profile/(local_user)/blocks/+page.svelte b/src/routes/profile/(local_user)/blocks/+page.svelte index dd091e9d..250875a0 100644 --- a/src/routes/profile/(local_user)/blocks/+page.svelte +++ b/src/routes/profile/(local_user)/blocks/+page.svelte @@ -31,7 +31,8 @@ } } - let { data = $bindable() }: Props = $props() + let { data: pageData }: Props = $props() + let data = $state(pageData) async function unblockUser(item: PersonBlockView) { if (!$profile?.jwt) return From c65801e57493ea0ee24aeda87fb13ec3eb25ac32 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Wed, 5 Feb 2025 19:44:19 -0800 Subject: [PATCH 057/161] misc: move legal info --- src/lib/components/lemmy/SiteCard.svelte | 42 +++++++++--------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/src/lib/components/lemmy/SiteCard.svelte b/src/lib/components/lemmy/SiteCard.svelte index 9eb77b92..a96f74e1 100644 --- a/src/lib/components/lemmy/SiteCard.svelte +++ b/src/lib/components/lemmy/SiteCard.svelte @@ -21,6 +21,7 @@ import Entity from '../ui/Entity.svelte' import { settings } from '$lib/settings.svelte' import { optimizeImageURL } from './post/helpers' + import Link from '../input/Link.svelte' interface Props { site: SiteView @@ -63,33 +64,6 @@ /> {/snippet} -
- - - -
{#if taglines && taglines.length > 0} @@ -160,6 +134,20 @@ {/if} +
+ + {$t('routes.modlog')} + + • + + {$t('routes.legal.title')} + + • + + {$t('routes.instances')} + +
+ {#if version}
From 14ba363c8523b100ed7fffe49d3c64753abe91fa Mon Sep 17 00:00:00 2001 From: James Xylight Date: Wed, 5 Feb 2025 20:28:45 -0800 Subject: [PATCH 058/161] feat: add language options to everywhere that support sit --- .../lemmy/comment/CommentForm.svelte | 39 +++++++++- .../lemmy/community/CommunityForm.svelte | 67 +++++++++++++++-- src/lib/i18n/en.json | 7 +- src/lib/mono/index.ts | 1 + src/routes/admin/config/+page.svelte | 73 +++++++++++++++++-- src/routes/c/[name]/settings/+page.svelte | 1 + .../(local_user)/settings/+page.svelte | 62 +++++++++++++++- src/routes/profile/+layout.ts | 2 +- 8 files changed, 232 insertions(+), 20 deletions(-) diff --git a/src/lib/components/lemmy/comment/CommentForm.svelte b/src/lib/components/lemmy/comment/CommentForm.svelte index b3e4e735..d5672bdc 100644 --- a/src/lib/components/lemmy/comment/CommentForm.svelte +++ b/src/lib/components/lemmy/comment/CommentForm.svelte @@ -1,16 +1,16 @@ + +{#if $profile?.jwt} + {#if !commenting} + + + + {#snippet action()} +
+ + +
+ {/snippet} +
+ {:else} + { + comments.comments = [comment.comment_view, ...comments.comments] + }} + locked={(post.post_view.post.locked && + !( + $profile?.user?.local_user_view.local_user.admin || + $profile?.user?.moderates + .map((c) => c.community.id) + .includes(post.community_view.community.id) + )) || + page.params.instance.toLowerCase() != $instance.toLowerCase()} + banned={post.community_view.banned_from_community} + onfocus={() => (commenting = true)} + tools={commenting} + preview={commenting} + placeholder={commenting ? undefined : $t('routes.post.addComment')} + rows={commenting ? 7 : 1} + oncancel={() => (commenting = false)} + /> + {/if} +{/if} + +{#if commenting || !$profile.jwt} +
+ + +
+{/if} + From 97b6a592d6912ea97cc8b9127fc8ca4d6b658de8 Mon Sep 17 00:00:00 2001 From: Xylight Date: Thu, 6 Feb 2025 06:56:31 -0800 Subject: [PATCH 062/161] fix: comments not expanding --- .../post/[instance]/[id=integer]/CommentProvider.svelte | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte b/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte index 045af9da..7046bef4 100644 --- a/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte +++ b/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte @@ -44,7 +44,10 @@ let comments = $state(passedComments) let commenting = $state(false) - let tree = $derived(buildCommentsTree(comments.comments)) + let tree = $state(buildCommentsTree(comments.comments)) + $effect(() => { + tree = buildCommentsTree(comments.comments) + }) {#if $profile?.jwt} @@ -127,6 +130,6 @@ {/if} From dd07caf5c466d9352d4937001ff210f972927e91 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Thu, 6 Feb 2025 16:19:55 -0800 Subject: [PATCH 063/161] fix: ssr crash --- src/lib/components/ui/layout/Shell.svelte | 22 +++++++++---------- src/lib/components/ui/navbar/NavButton.svelte | 2 +- src/lib/components/ui/navbar/Navbar.svelte | 3 ++- .../[id=integer]/CommentProvider.svelte | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/lib/components/ui/layout/Shell.svelte b/src/lib/components/ui/layout/Shell.svelte index 2f11d3d6..c456b061 100644 --- a/src/lib/components/ui/layout/Shell.svelte +++ b/src/lib/components/ui/layout/Shell.svelte @@ -76,19 +76,11 @@ top: number bottom: number class: string - }>() + }>(contentPadding) let dockPropsStore = writable<{ noGap: boolean top: boolean - }>() - $effect.root(() => { - $effect(() => { - contentPaddingStore.set(contentPadding) - dockPropsStore.set( - calculateDockProperties(settings.dock, innerWidth.current ?? 1000), - ) - }) - }) + }>(dockProps) export { contentPaddingStore as contentPadding, dockPropsStore as dockProps } @@ -97,10 +89,11 @@ import { settings } from '$lib/settings.svelte.js' import { themeVars } from '$lib/ui/colors' import { writable, type Readable, type Writable } from 'svelte/store' + import type { ClassValue } from 'svelte/elements' interface Props { route?: { id: string | null } | undefined - class?: string + class?: ClassValue children?: import('svelte').Snippet navbar?: import('svelte').Snippet<[any]> sidebar?: import('svelte').Snippet<[any]> @@ -124,6 +117,13 @@ calculatePadding(dockProps.noGap, dockProps.top, false), ) let topPanel = $derived(dockProps.noGap && dockProps.top) + + $effect(() => { + contentPaddingStore.set(contentPadding) + dockPropsStore.set( + calculateDockProperties(settings.dock, innerWidth.current ?? 1000), + ) + }) diff --git a/src/lib/components/ui/navbar/NavButton.svelte b/src/lib/components/ui/navbar/NavButton.svelte index 30e95b22..5e26559c 100644 --- a/src/lib/components/ui/navbar/NavButton.svelte +++ b/src/lib/components/ui/navbar/NavButton.svelte @@ -30,7 +30,7 @@ }: Props = $props() let isSelected = $derived(isSelectedFilter(page.url.pathname)) - let isPanel = $derived(adaptive ? $dockProps.noGap : false) + let isPanel = $derived(adaptive ? $dockProps?.noGap : false)
{/each}
diff --git a/src/lib/components/lemmy/comment/Comments.svelte b/src/lib/components/lemmy/comment/Comments.svelte index e9f6075b..eb383034 100644 --- a/src/lib/components/lemmy/comment/Comments.svelte +++ b/src/lib/components/lemmy/comment/Comments.svelte @@ -45,8 +45,9 @@ parent.comment_view.counts.child_count > 0 && parent.children.length == 0 ) - ) + ) { return + } try { parent.loading = true @@ -131,20 +132,22 @@ href="/comment/{page.params.instance}/{node.comment_view.comment.id}" > - {#if $profile?.user && (amMod($profile?.user, comment.community) || isAdmin($profile.user))} + {#if profile.data?.user && (amMod(profile.data?.user, comment.community) || isAdmin(profile.data.user))} {/if}
@@ -92,8 +92,8 @@
{$t('comment.actions.link')}
- {#if $profile?.jwt} - {#if comment.creator.id == $profile.user?.local_user_view.person.id} + {#if profile.data?.jwt} + {#if comment.creator.id == profile.data.user?.local_user_view.person.id} onedit?.(comment)}> {$t('post.actions.more.edit')} @@ -101,8 +101,12 @@ {/if} { - if ($profile?.jwt) - comment.saved = await save(comment, !comment.saved, $profile.jwt) + if (profile.data?.jwt) + comment.saved = await save( + comment, + !comment.saved, + profile.data.jwt, + ) }} > @@ -110,15 +114,15 @@ {comment.saved ? $t('post.actions.unsave') : $t('post.actions.save')} - {#if $profile?.user && $profile.jwt && $profile.user.local_user_view.person.id == comment.creator.id} + {#if profile.data?.user && profile.data.jwt && profile.data.user.local_user_view.person.id == comment.creator.id} { - if ($profile?.jwt) + if (profile.data?.jwt) comment.comment.deleted = await deleteItem( comment, !comment.comment.deleted, - $profile.jwt, + profile.data.jwt, ) }} > @@ -130,7 +134,7 @@ {/if} - {#if $profile.jwt && $profile.user?.local_user_view.person.id != comment.creator.id} + {#if profile.data.jwt && profile.data.user?.local_user_view.person.id != comment.creator.id} report(comment)} color="danger-subtle"> {$t('moderation.report')} diff --git a/src/lib/components/lemmy/comment/CommentForm.svelte b/src/lib/components/lemmy/comment/CommentForm.svelte index d5672bdc..11ff5df6 100644 --- a/src/lib/components/lemmy/comment/CommentForm.svelte +++ b/src/lib/components/lemmy/comment/CommentForm.svelte @@ -49,7 +49,7 @@ let language: number | undefined = $state() async function submit() { - if (!$profile?.user || !$profile?.jwt || value == '') return + if (!profile.data?.user || !profile.data?.jwt || value == '') return loading = true @@ -107,7 +107,7 @@ size="square-md" rounding="pill" color={language != undefined ? 'primary' : 'ghost'} - title={$t('form.profile.languages.title')} + title={$t('form.profile.data.languages.title')} > diff --git a/src/lib/components/lemmy/comment/CommentItem.svelte b/src/lib/components/lemmy/comment/CommentItem.svelte index 76a3444a..92d75644 100644 --- a/src/lib/components/lemmy/comment/CommentItem.svelte +++ b/src/lib/components/lemmy/comment/CommentItem.svelte @@ -2,7 +2,6 @@ import Comment from '$lib/components/lemmy/comment/Comment.svelte' import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte' import { publishedToDate } from '$lib/components/util/date.js' - import { getInstance } from '$lib/lemmy.js' import { settings } from '$lib/settings.svelte.js' import { t } from '$lib/translations' import type { CommentView } from 'lemmy-js-client' diff --git a/src/lib/components/lemmy/comment/CommentVote.svelte b/src/lib/components/lemmy/comment/CommentVote.svelte index 42d8451d..0f64e97d 100644 --- a/src/lib/components/lemmy/comment/CommentVote.svelte +++ b/src/lib/components/lemmy/comment/CommentVote.svelte @@ -33,7 +33,7 @@ }: Props = $props() const castVote = async (newVote: number) => { - if (!$profile?.jwt) { + if (!profile.data?.jwt) { toast({ content: $t('toast.loginVoteGate'), type: 'warning' }) return } diff --git a/src/lib/components/lemmy/community/CommunityCard.svelte b/src/lib/components/lemmy/community/CommunityCard.svelte index b854c037..547ed08a 100644 --- a/src/lib/components/lemmy/community/CommunityCard.svelte +++ b/src/lib/components/lemmy/community/CommunityCard.svelte @@ -117,7 +117,7 @@ }) async function subscribe() { - if (!$profile?.jwt) return + if (!profile.data?.jwt) return loading.subscribing = true const subscribed = community_view.subscribed == 'Subscribed' || @@ -226,7 +226,7 @@
- {#if $profile?.jwt} + {#if profile.data?.jwt} {/snippet} - {#if ($profile?.user && amMod($profile.user, item.community)) || ($profile?.user && isAdmin($profile.user))} + {#if (profile.data?.user && amMod(profile.data.user, item.community)) || (profile.data?.user && isAdmin(profile.data.user))} - {#if !item.community.local && !amMod($profile.user, item.community)} + {#if !item.community.local && !amMod(profile.data.user, item.community)} {$t('moderation.labelInstanceOnly')} {:else} {$t('moderation.label')} @@ -53,7 +53,7 @@ {item.post.removed ? $t('moderation.restore') : $t('moderation.remove')} {/if} - {#if $profile?.user && $profile.user?.local_user_view.person.id != item.creator.id} + {#if profile.data?.user && profile.data.user?.local_user_view.person.id != item.creator.id} { - if (!$profile.jwt) return + if (!profile.data.jwt) return item.comment = ( await feature( !item.comment.distinguished, item.comment, - $profile.jwt, + profile.data.jwt, ) ).comment_view.comment }} @@ -92,7 +92,7 @@ {/if} {/if} - {#if $profile?.user && isAdmin($profile.user)} + {#if profile.data?.user && isAdmin(profile.data.user)} {$t('admin.label')} remove(item, true)}> {#snippet prefix()} diff --git a/src/lib/components/lemmy/moderation/ModerationMenu.svelte b/src/lib/components/lemmy/moderation/ModerationMenu.svelte index 1668b6fc..b1b51114 100644 --- a/src/lib/components/lemmy/moderation/ModerationMenu.svelte +++ b/src/lib/components/lemmy/moderation/ModerationMenu.svelte @@ -31,7 +31,7 @@ let acting = $derived(locking || pinning) async function lock(lock: boolean) { - if (!$profile?.jwt || !isPostView(item)) return + if (!profile.data?.jwt || !isPostView(item)) return locking = true try { @@ -52,7 +52,7 @@ } async function pin(pinned: boolean, toInstance: boolean = false) { - if (!$profile?.jwt || !isPostView(item)) return + if (!profile.data?.jwt || !isPostView(item)) return pinning = true @@ -87,9 +87,9 @@ {/snippet} - {#if ($profile?.user && amMod($profile.user, item.community)) || ($profile?.user && isAdmin($profile.user))} + {#if (profile.data?.user && amMod(profile.data.user, item.community)) || (profile.data?.user && isAdmin(profile.data.user))} - {#if !item.community.local && !amMod($profile.user, item.community)} + {#if !item.community.local && !amMod(profile.data.user, item.community)} {$t('moderation.labelInstanceOnly')} {:else} {$t('moderation.label')} @@ -123,7 +123,7 @@ ? $t('moderation.unfeature') : $t('moderation.feature')} - {#if isAdmin($profile.user)} + {#if isAdmin(profile.data.user)} {$t('form.post.community')} {/if}
@@ -138,7 +138,7 @@ {item.post.removed ? $t('moderation.restore') : $t('moderation.remove')} {/if}
- {#if $profile?.user && $profile.user.local_user_view.person.id != item.creator.id} + {#if profile.data?.user && profile.data.user.local_user_view.person.id != item.creator.id} @@ -151,7 +151,7 @@ {/if} {/if} - {#if $profile?.user && isAdmin($profile.user)} + {#if profile.data?.user && isAdmin(profile.data.user)} {$t('admin.label')} - {#if !removed && $profile?.user && (amMod($profile.user, item.community) || (isAdmin($profile.user) && item.community.local))} + {#if !removed && profile.data?.user && (amMod(profile.data.user, item.community) || (isAdmin(profile.data.user) && item.community.local))} {$t('moderation.removeSubmission.withReason')} diff --git a/src/lib/components/lemmy/moderation/ReportModal.svelte b/src/lib/components/lemmy/moderation/ReportModal.svelte index 54f6cfef..70492da7 100644 --- a/src/lib/components/lemmy/moderation/ReportModal.svelte +++ b/src/lib/components/lemmy/moderation/ReportModal.svelte @@ -41,7 +41,7 @@ let reason = $state('') async function report() { - if (!item || !$profile?.jwt || reason == '') return + if (!item || !profile.data?.jwt || reason == '') return loading = true try { diff --git a/src/lib/components/lemmy/post/Post.svelte b/src/lib/components/lemmy/post/Post.svelte index a800f9b2..fa5903a0 100644 --- a/src/lib/components/lemmy/post/Post.svelte +++ b/src/lib/components/lemmy/post/Post.svelte @@ -1,21 +1,13 @@ - {#snippet title()} + {#snippet customTitle()} {#if title}{@render title()}{:else}Debug{/if} diff --git a/src/lib/lemmy.ts b/src/lib/lemmy.ts index 925e9033..e0b8e1b2 100644 --- a/src/lib/lemmy.ts +++ b/src/lib/lemmy.ts @@ -11,16 +11,6 @@ export const site = writable(undefined) const isURL = (input: RequestInfo | URL): input is URL => typeof input == 'object' && 'searchParams' in input -const toURL = (input: RequestInfo | URL): URL | undefined => { - if (isURL(input)) return input - - try { - return new URL(input.toString()) - } catch (e) { - return - } -} - async function customFetch( func: | (( @@ -67,9 +57,9 @@ export function client({ ) => Promise auth?: string } = {}) { - if (!instanceURL) instanceURL = get(profile).instance + if (!instanceURL) instanceURL = profile.data.instance - let jwt = auth ? auth : get(profile)?.jwt + let jwt = auth ? auth : profile.data?.jwt const headers = jwt ? { authorization: `Bearer ${jwt}` } : {} @@ -91,8 +81,6 @@ export function getClient( return client({ instanceURL, func, auth }) } -export const getInstance = () => encodeURIComponent(get(instance)) - export async function validateInstance(instance: string): Promise { if (instance == '') return false diff --git a/src/lib/lemmy/item.ts b/src/lib/lemmy/item.ts index 73d0f625..28658efc 100644 --- a/src/lib/lemmy/item.ts +++ b/src/lib/lemmy/item.ts @@ -105,7 +105,7 @@ export let resumables = resumableStore() export function addFavorite(item: Community, add: boolean = true) { const pd = get(profileData) - const p = pd.profiles.find((p) => p.id == get(profile)?.id) + const p = pd.profiles.find((p) => p.id == profile.data?.id) if (!p) return let favs = p.favorites ?? [] diff --git a/src/lib/lemmy/user.ts b/src/lib/lemmy/user.ts index 6162d287..a2c5bb8d 100644 --- a/src/lib/lemmy/user.ts +++ b/src/lib/lemmy/user.ts @@ -5,7 +5,7 @@ import type { Community, MyUserInfo, PersonView } from 'lemmy-js-client' import { get } from 'svelte/store' export const blockUser = async (block: boolean, id: number) => { - const auth = get(profile)?.jwt + const auth = profile.data?.jwt if (!auth) throw new Error('Unauthorized') @@ -22,7 +22,7 @@ export const addSubscription = ( community: Community, subscribe: boolean = true, ) => { - const p = get(profile) + const p = profile if (!p.user) return @@ -38,7 +38,7 @@ export const addSubscription = ( p.user.follows.splice(index, 1) } - profile.set(p) + profile.data.set(p) } export const addAdmin = async (handle: string, added: boolean, jwt: string) => @@ -56,4 +56,4 @@ export const addAdmin = async (handle: string, added: boolean, jwt: string) => }) export const hasFavorite = (profile: Profile, id: number): boolean => - profile?.favorites?.map((i) => i.id).includes(id) ?? false + profile.data?.favorites?.map((i) => i.id).includes(id) ?? false diff --git a/src/lib/promise.ts b/src/lib/promise.ts index 820f6a12..1f389eed 100644 --- a/src/lib/promise.ts +++ b/src/lib/promise.ts @@ -2,8 +2,6 @@ import { browser } from '$app/environment' -type AnyFunction = (...args: any[]) => any - export const awaitIfServer = async ( promise: Promise, ): Promise<{ diff --git a/src/lib/session.ts b/src/lib/session.ts index a46accbd..fd4ecfce 100644 --- a/src/lib/session.ts +++ b/src/lib/session.ts @@ -1,6 +1,5 @@ import { browser } from '$app/environment' import type { Community } from 'lemmy-js-client' -import { writable } from 'svelte/store' interface SessionStorage { lastSeenCommunity: Community | undefined @@ -35,9 +34,3 @@ export const getSessionStorage = ( if (!browser) return return JSON.parse(sessionStorage.getItem(key)!) } - -interface Route { - title: string -} - -export const route = writable(undefined) diff --git a/src/routes/accounts/+page.svelte b/src/routes/accounts/+page.svelte index 3d7ef23b..f2bb42a7 100644 --- a/src/routes/accounts/+page.svelte +++ b/src/routes/accounts/+page.svelte @@ -52,7 +52,7 @@ {#if debugging} {#snippet title()} @@ -101,7 +101,7 @@ {/if} -{#if $profileData.profiles.length == 0} +{#if profileData.profiles.length == 0}
From 98cb1992d24ade8165406cd5e7761ae5ad3828b3 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sat, 8 Feb 2025 13:17:39 -0800 Subject: [PATCH 068/161] feat: add better duration selection to ban modal --- src/lib/components/form/Duration.svelte | 70 +++++++++++++++++++ .../lemmy/moderation/BanModal.svelte | 46 ++++-------- src/lib/i18n/en.json | 11 ++- src/lib/mono/forms/TextInput.svelte | 1 - src/lib/mono/forms/select/Select.svelte | 12 ++-- src/routes/modlog/+page.ts | 11 ++- 6 files changed, 110 insertions(+), 41 deletions(-) create mode 100644 src/lib/components/form/Duration.svelte diff --git a/src/lib/components/form/Duration.svelte b/src/lib/components/form/Duration.svelte new file mode 100644 index 00000000..65ca0092 --- /dev/null +++ b/src/lib/components/form/Duration.svelte @@ -0,0 +1,70 @@ + + +
+ {#if duration != 'permanent'} + + {/if} + +
diff --git a/src/lib/components/lemmy/moderation/BanModal.svelte b/src/lib/components/lemmy/moderation/BanModal.svelte index 31e2830f..82c52714 100644 --- a/src/lib/components/lemmy/moderation/BanModal.svelte +++ b/src/lib/components/lemmy/moderation/BanModal.svelte @@ -10,6 +10,8 @@ import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte' import { t } from '$lib/translations' import CommunityLink from '../community/CommunityLink.svelte' + import Duration from '$lib/components/form/Duration.svelte' + import SectionTitle from '$lib/components/ui/SectionTitle.svelte' interface Props { open?: boolean @@ -27,18 +29,17 @@ let reason = $state('') let deleteData = $state(false) - let expires = $state('') - + let expires = $state(-1) let loading = $state(false) // hack due to svelte's reactive declarations const resetReason = () => { reason = '' deleteData = false - expires = '' + expires = -1 } - run(() => { + $effect(() => { if (item) resetReason() }) @@ -50,28 +51,8 @@ try { let date: number | undefined - if (expires != '') { - date = Date.parse(expires) - if (Number.isNaN(date)) { - toast({ - content: $t('toast.invalidDateAbsolute'), - type: 'error', - }) - - loading = false - - return - } - - if (date < Date.now()) { - toast({ - content: $t('toast.invalidDateBeforeCurrent'), - type: 'error', - }) - - loading = false - return - } + if (expires > 0) { + date = Math.floor(Date.now() / 1000) + expires } if (community) { @@ -81,7 +62,7 @@ person_id: item.id, reason: reason || undefined, remove_data: deleteData, - expires: date ? Math.floor(date / 1000) : undefined, + expires: date, }) } else { await getClient().banPerson({ @@ -89,7 +70,7 @@ person_id: item.id, reason: reason || undefined, remove_data: deleteData, - expires: date ? Math.floor(date / 1000) : undefined, + expires: date, }) } @@ -137,11 +118,10 @@ {$t('moderation.ban.warning')} {/snippet} - +
+ {$t('moderation.ban.expires')} + +
{/if} diff --git a/src/lib/components/lemmy/community/CommunityForm.svelte b/src/lib/components/lemmy/community/CommunityForm.svelte index 1f60eedc..b10a4ed8 100644 --- a/src/lib/components/lemmy/community/CommunityForm.svelte +++ b/src/lib/components/lemmy/community/CommunityForm.svelte @@ -249,7 +249,7 @@ {/snippet} - {#each $site.all_languages as language, index} + {#each $site.all_languages.filter((l) => !formData.languages?.includes(l.id)) as language, index} { diff --git a/src/routes/admin/config/+page.svelte b/src/routes/admin/config/+page.svelte index 1b8123ab..4a56922c 100644 --- a/src/routes/admin/config/+page.svelte +++ b/src/routes/admin/config/+page.svelte @@ -33,6 +33,7 @@ ? { ...data.site.site_view.local_site, ...data.site.site_view.site, + discussion_languages: data.site.discussion_languages, } : undefined, ) @@ -245,7 +246,7 @@ {$t('form.profile.data.languages.title')}

{$t('form.profile.data.languages.description')}

- {#if $site && formData.discussion_languages} + {#if $site}
{#snippet target()} @@ -256,7 +257,7 @@ {/snippet} - {#each $site.all_languages as language, index} + {#each $site.all_languages.filter((l) => !formData.discussion_languages?.includes(l.id)) as language, index} { @@ -267,7 +268,7 @@ {/each} - {#each formData.discussion_languages as languageId, index} + {#each formData.discussion_languages ?? [] as languageId, index} {@const language = $site.all_languages.find( (l) => l.id == languageId, )} diff --git a/src/routes/profile/(local_user)/settings/+page.svelte b/src/routes/profile/(local_user)/settings/+page.svelte index e1053574..739456e7 100644 --- a/src/routes/profile/(local_user)/settings/+page.svelte +++ b/src/routes/profile/(local_user)/settings/+page.svelte @@ -149,7 +149,7 @@ {/snippet} - {#each $site.all_languages as language, index} + {#each $site.all_languages.filter((l) => !formData.discussion_languages?.includes(l.id)) as language, index} { From e30788c34eccc08d2f35648624660a7e280576f8 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sat, 8 Feb 2025 13:50:47 -0800 Subject: [PATCH 070/161] fix: remove console.log --- src/lib/components/form/Duration.svelte | 1 - src/lib/components/ui/sidebar/ProfileButton.svelte | 7 +++---- src/lib/mono/modal/Modal.svelte | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/lib/components/form/Duration.svelte b/src/lib/components/form/Duration.svelte index 65ca0092..715c9052 100644 --- a/src/lib/components/form/Duration.svelte +++ b/src/lib/components/form/Duration.svelte @@ -39,7 +39,6 @@ $effect(() => { value = calculateValue(number, duration) - console.log(value) }) diff --git a/src/lib/components/ui/sidebar/ProfileButton.svelte b/src/lib/components/ui/sidebar/ProfileButton.svelte index 6b29728a..ef6996c7 100644 --- a/src/lib/components/ui/sidebar/ProfileButton.svelte +++ b/src/lib/components/ui/sidebar/ProfileButton.svelte @@ -31,10 +31,9 @@ await setUserID(prof.id) } - console.log(page.url) - // await goto(page.url, { - // invalidateAll: true, - // }) + await goto(page.url, { + invalidateAll: true, + }) switching = false }} diff --git a/src/lib/mono/modal/Modal.svelte b/src/lib/mono/modal/Modal.svelte index 9c2c8713..8c5931f6 100644 --- a/src/lib/mono/modal/Modal.svelte +++ b/src/lib/mono/modal/Modal.svelte @@ -74,7 +74,7 @@ bg-white/50 dark:bg-black/50 box-border p-4" size="square-sm" onclick={() => { open = false - dispatcher('dismissed') + ondismissed?.() }} > {#snippet prefix()} From 282320052eccf44cd795bf30cb2b580bd16a0f55 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sat, 8 Feb 2025 13:58:46 -0800 Subject: [PATCH 071/161] fix: use correct view type --- src/lib/components/lemmy/post/media/PostMedia.svelte | 10 +++++----- src/routes/saved/+page.svelte | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/lib/components/lemmy/post/media/PostMedia.svelte b/src/lib/components/lemmy/post/media/PostMedia.svelte index 39fce90f..352e6069 100644 --- a/src/lib/components/lemmy/post/media/PostMedia.svelte +++ b/src/lib/components/lemmy/post/media/PostMedia.svelte @@ -10,7 +10,7 @@ import ExpandableImage, { showImage, } from '$lib/components/ui/ExpandableImage.svelte' - import { settings } from '$lib/settings.svelte.js' + import { settings, type View } from '$lib/settings.svelte.js' import type { Post } from 'lemmy-js-client' import PostIframe from './PostIframe.svelte' import { Button, Material, modal } from 'mono-svelte' @@ -19,7 +19,7 @@ import PostImage from './PostImage.svelte' interface Props { - view?: 'card' | 'cozy' | 'list' | 'compact' + view?: View post: Post type?: MediaType opened?: boolean | undefined @@ -41,9 +41,9 @@ - A media item (pictures, videos) (large form factor posts only) - Embed link/card. --> -{#if type == 'image' && (view == 'cozy' || view == 'card')} +{#if type == 'image' && view == 'cozy'} -{:else if (type == 'iframe' || type == 'video') && (view == 'cozy' || view == 'card') && post.url} +{:else if (type == 'iframe' || type == 'video') && view == 'cozy' && post.url}
{#if !data.data || (data.data?.length ?? 0) == 0} Date: Sat, 8 Feb 2025 14:02:29 -0800 Subject: [PATCH 072/161] fix: incorrect authentication key --- .../lemmy/comment/CommentForm.svelte | 2 +- .../lemmy/community/CommunityForm.svelte | 4 +-- src/routes/admin/config/+page.svelte | 4 +-- .../password_change/[token]/+page.svelte | 4 +-- .../(local_user)/password/+layout.svelte | 2 +- .../(local_user)/password/+page.svelte | 2 +- .../(local_user)/password/2fa/+page.svelte | 4 +-- .../(local_user)/password/change/+page.svelte | 6 ++-- .../(local_user)/password/delete/+page.svelte | 10 +++--- .../(local_user)/settings/+page.svelte | 35 +++++++------------ src/routes/signup/[instance]/+page.svelte | 2 +- 11 files changed, 33 insertions(+), 42 deletions(-) diff --git a/src/lib/components/lemmy/comment/CommentForm.svelte b/src/lib/components/lemmy/comment/CommentForm.svelte index 11ff5df6..e18f1ca5 100644 --- a/src/lib/components/lemmy/comment/CommentForm.svelte +++ b/src/lib/components/lemmy/comment/CommentForm.svelte @@ -107,7 +107,7 @@ size="square-md" rounding="pill" color={language != undefined ? 'primary' : 'ghost'} - title={$t('form.profile.data.languages.title')} + title={$t('form.profile.languages.title')} > diff --git a/src/lib/components/lemmy/community/CommunityForm.svelte b/src/lib/components/lemmy/community/CommunityForm.svelte index b10a4ed8..e1aea6ba 100644 --- a/src/lib/components/lemmy/community/CommunityForm.svelte +++ b/src/lib/components/lemmy/community/CommunityForm.svelte @@ -159,7 +159,7 @@ />
@@ -236,7 +236,7 @@
- {$t('form.profile.data.languages.title')} + {$t('form.profile.languages.title')} {#if $site}
diff --git a/src/routes/admin/config/+page.svelte b/src/routes/admin/config/+page.svelte index 4a56922c..b7fe4f7d 100644 --- a/src/routes/admin/config/+page.svelte +++ b/src/routes/admin/config/+page.svelte @@ -243,8 +243,8 @@
- {$t('form.profile.data.languages.title')} -

{$t('form.profile.data.languages.description')}

+ {$t('form.profile.languages.title')} +

{$t('form.profile.languages.description')}

{#if $site}
diff --git a/src/routes/password_change/[token]/+page.svelte b/src/routes/password_change/[token]/+page.svelte index 9726b1b3..31cfc2c0 100644 --- a/src/routes/password_change/[token]/+page.svelte +++ b/src/routes/password_change/[token]/+page.svelte @@ -73,13 +73,13 @@ {/if} diff --git a/src/routes/profile/(local_user)/password/+layout.svelte b/src/routes/profile/(local_user)/password/+layout.svelte index cfec9ce3..e95b5dd9 100644 --- a/src/routes/profile/(local_user)/password/+layout.svelte +++ b/src/routes/profile/(local_user)/password/+layout.svelte @@ -19,7 +19,7 @@ url: '/profile/password', }, { - name: $t('form.profile.data.2fa.2fa'), + name: $t('form.profile.2fa.2fa'), url: '/profile/password/2fa', }, { diff --git a/src/routes/profile/(local_user)/password/+page.svelte b/src/routes/profile/(local_user)/password/+page.svelte index 59128dc9..0c448ac4 100644 --- a/src/routes/profile/(local_user)/password/+page.svelte +++ b/src/routes/profile/(local_user)/password/+page.svelte @@ -50,7 +50,7 @@ > - {$t('form.profile.data.2fa.2fa')} + {$t('form.profile.2fa.2fa')} {data.my_user?.local_user_view.local_user.totp_2fa_enabled ? $t('common.enabled') diff --git a/src/routes/profile/(local_user)/password/2fa/+page.svelte b/src/routes/profile/(local_user)/password/2fa/+page.svelte index 91074c1a..a7f28037 100644 --- a/src/routes/profile/(local_user)/password/2fa/+page.svelte +++ b/src/routes/profile/(local_user)/password/2fa/+page.svelte @@ -58,7 +58,7 @@ disabled type="password" value={totpLink} - label={$t('form.profile.data.2fa.totp')} + label={$t('form.profile.2fa.totp')} > {#snippet suffix()} {#snippet children({ subscribe, subscribing })} diff --git a/src/lib/components/ui/ExpandableImage.svelte b/src/lib/components/ui/ExpandableImage.svelte index fee46063..a649291d 100644 --- a/src/lib/components/ui/ExpandableImage.svelte +++ b/src/lib/components/ui/ExpandableImage.svelte @@ -52,8 +52,8 @@ use:focusTrap > {#snippet prefix()} - + {/snippet} {$t('profile.profile')} {#snippet prefix()} - + {/snippet} {$t('profile.inbox')} {#if $notifications.inbox > 0} @@ -128,21 +128,27 @@ {#snippet prefix()} - + {/snippet} {$t('profile.saved')} {/if} {#snippet prefix()} - + {/snippet} {$t('account.accounts')} + (showInstance = !showInstance)}> + {#snippet prefix()} + + {/snippet} + {$t('nav.menu.instance')} + {$t('nav.menu.app')} {#snippet prefix()} - + {/snippet} {$t('nav.menu.settings')} @@ -186,7 +192,7 @@ {#if settings.debugInfo} {#snippet prefix()} - + {/snippet} Debug @@ -205,14 +211,6 @@ {__VERSION__}
- {/if} {#if type != 'image'} From a5ba6d66f6e8566fff46b97bdf44df77de16b7db Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sun, 9 Feb 2025 15:34:33 -0800 Subject: [PATCH 114/161] fix: switch max-w-max to max-w-full in expandable images --- src/lib/components/ui/ExpandableImage.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/components/ui/ExpandableImage.svelte b/src/lib/components/ui/ExpandableImage.svelte index a649291d..7320a705 100644 --- a/src/lib/components/ui/ExpandableImage.svelte +++ b/src/lib/components/ui/ExpandableImage.svelte @@ -52,11 +52,11 @@ use:focusTrap > Date: Mon, 10 Feb 2025 17:34:40 -0800 Subject: [PATCH 115/161] cleanup: switch to $state for themes --- .../components/error/ErrorContainer.svelte | 8 +- src/lib/components/input/Slider.svelte | 44 ---- src/lib/components/ui/ProgressBar.svelte | 10 +- src/lib/components/ui/layout/Shell.svelte | 4 +- src/lib/components/ui/navbar/Navbar.svelte | 2 - src/lib/components/ui/navbar/Profile.svelte | 14 +- .../ui/navbar/commands/Commands.svelte | 4 +- .../ui/navbar/commands/actions.svelte.ts | 14 +- src/lib/input/swipe.ts | 91 -------- src/lib/lemmy/inbox.ts | 3 - src/lib/lemmy/item.ts | 9 +- src/lib/lemmy/user.ts | 16 +- src/lib/search/search.ts | 0 src/lib/ui/{colors.ts => colors.svelte.ts} | 197 ++++++++---------- src/lib/ui/presets.ts | 2 +- src/routes/+layout.svelte | 21 +- src/routes/theme/+page.svelte | 51 +++-- src/routes/theme/ColorSwatch.svelte | 5 +- src/routes/theme/ThemePreset.svelte | 23 +- 19 files changed, 169 insertions(+), 349 deletions(-) delete mode 100644 src/lib/components/input/Slider.svelte delete mode 100644 src/lib/input/swipe.ts delete mode 100644 src/lib/search/search.ts rename src/lib/ui/{colors.ts => colors.svelte.ts} (51%) diff --git a/src/lib/components/error/ErrorContainer.svelte b/src/lib/components/error/ErrorContainer.svelte index a5c988bd..3dd861b9 100644 --- a/src/lib/components/error/ErrorContainer.svelte +++ b/src/lib/components/error/ErrorContainer.svelte @@ -6,14 +6,14 @@ message: string } - export let errors = writable([]) + let errors = $state([]) export function pushError(args: { scope: string; message: string }) { - errors.update((e) => [...e, args]) + errors.push(args) } export function clearErrorScope(scope: string | null | undefined) { - errors.update((errors) => errors.filter((error) => error.scope != scope)) + errors = errors.filter((error) => error.scope != scope) } @@ -35,7 +35,7 @@ let { scope = undefined, class: clazz = '' }: Props = $props() let scopedErrors = $derived( - $errors.filter((e) => e.scope == scope || e.scope == 'global'), + errors.filter((e) => e.scope == scope || e.scope == 'global'), ) diff --git a/src/lib/components/input/Slider.svelte b/src/lib/components/input/Slider.svelte deleted file mode 100644 index 354fe1a8..00000000 --- a/src/lib/components/input/Slider.svelte +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/src/lib/components/ui/ProgressBar.svelte b/src/lib/components/ui/ProgressBar.svelte index f20d5521..5d76ed01 100644 --- a/src/lib/components/ui/ProgressBar.svelte +++ b/src/lib/components/ui/ProgressBar.svelte @@ -1,8 +1,6 @@
diff --git a/src/lib/components/ui/layout/Shell.svelte b/src/lib/components/ui/layout/Shell.svelte index cbb8a784..5c019dc8 100644 --- a/src/lib/components/ui/layout/Shell.svelte +++ b/src/lib/components/ui/layout/Shell.svelte @@ -87,7 +87,7 @@ -
- {#if theme.id == $themeData.currentTheme} + {#if theme.id == themeData.data.currentTheme} { - const index = $themeData.themes + const index = themeData.data.themes .map((t) => t.id) .indexOf(theme.id) - $themeData.themes = $themeData.themes.toSpliced(index, 1) - if (theme.id == $themeData.currentTheme) { - $themeData.currentTheme = 0 + themeData.data.themes = themeData.data.themes.toSpliced( + index, + 1, + ) + if (theme.id == themeData.data.currentTheme) { + themeData.data.currentTheme = 0 } }, }), From e9adaf991ba46c4ed9d00e7ea5c17f45460abe63 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Wed, 12 Feb 2025 16:48:35 -0800 Subject: [PATCH 116/161] fix: color schemes not saving/updating --- src/lib/components/ui/navbar/Profile.svelte | 9 +------ src/lib/ui/colors.svelte.ts | 29 +++++++++++---------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/lib/components/ui/navbar/Profile.svelte b/src/lib/components/ui/navbar/Profile.svelte index d8e53dcd..3c1221e5 100644 --- a/src/lib/components/ui/navbar/Profile.svelte +++ b/src/lib/components/ui/navbar/Profile.svelte @@ -40,6 +40,7 @@ import { t } from '$lib/translations' import UserLink from '$lib/components/lemmy/user/UserLink.svelte' import Option from 'mono-svelte/forms/select/Option.svelte' + import { env } from '$env/dynamic/public' let showInstance = $state(false) @@ -217,14 +218,6 @@ > - + + {/if}
{#snippet title()} diff --git a/src/routes/settings/Setting.svelte b/src/routes/settings/Setting.svelte index 2f9e3bb7..b57b5db8 100644 --- a/src/routes/settings/Setting.svelte +++ b/src/routes/settings/Setting.svelte @@ -74,7 +74,7 @@ >

{@render title?.()}

{#if description} -

+

{@render description?.()}

{/if} diff --git a/src/routes/settings/ToggleSetting.svelte b/src/routes/settings/ToggleSetting.svelte index f16d5e58..e2c8f030 100644 --- a/src/routes/settings/ToggleSetting.svelte +++ b/src/routes/settings/ToggleSetting.svelte @@ -71,7 +71,7 @@ >

{title}

{#if description} -

+

{description}

{/if} From bf417a97c4399ba8803640e029f15a4e2820e111 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Wed, 12 Feb 2025 17:28:44 -0800 Subject: [PATCH 118/161] feat: add mark page resolved button to moderation --- src/lib/components/ui/ProgressBar.svelte | 2 +- src/lib/components/ui/navbar/NavButton.svelte | 22 ++++--- src/lib/i18n/en.json | 4 +- src/routes/moderation/+page.svelte | 63 +++++++++++++++++-- 4 files changed, 75 insertions(+), 16 deletions(-) diff --git a/src/lib/components/ui/ProgressBar.svelte b/src/lib/components/ui/ProgressBar.svelte index 5d76ed01..c0dbe5bf 100644 --- a/src/lib/components/ui/ProgressBar.svelte +++ b/src/lib/components/ui/ProgressBar.svelte @@ -17,5 +17,5 @@
diff --git a/src/lib/components/ui/navbar/NavButton.svelte b/src/lib/components/ui/navbar/NavButton.svelte index 5e26559c..720ae88a 100644 --- a/src/lib/components/ui/navbar/NavButton.svelte +++ b/src/lib/components/ui/navbar/NavButton.svelte @@ -47,16 +47,18 @@ title={label} style="transition-property: background-color, filter;" > - {#if icon} - - {:else} - {@render customIcon?.({ size: isPanel ? 16 : 18, isSelected })} - {/if} + {#snippet prefix()} + {#if icon} + + {:else} + {@render customIcon?.({ size: isPanel ? 16 : 18, isSelected })} + {/if} + {/snippet} {@render children?.()} diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index 1236dc4c..c48bd578 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -312,7 +312,9 @@ "resolve": "Resolve", "resolved": "Resolved", "unresolve": "Unresolve", - "resolvedBy": "Resolved by" + "resolvedBy": "Resolved by", + "markAll": "Mark page resolved", + "markAllComplete": "Batch action completed." }, "admin": { "title": "Administration", diff --git a/src/routes/moderation/+page.svelte b/src/routes/moderation/+page.svelte index 222a8140..f5b48ce8 100644 --- a/src/routes/moderation/+page.svelte +++ b/src/routes/moderation/+page.svelte @@ -5,6 +5,7 @@ import MultiSelect from '$lib/components/input/Switch.svelte' import { page } from '$app/state' import { + Check, EnvelopeOpen, Funnel, Icon, @@ -13,11 +14,14 @@ } from 'svelte-hero-icons' import Placeholder from '$lib/components/ui/Placeholder.svelte' import { searchParam } from '$lib/util.svelte.js' - import { Button, Material, Select } from 'mono-svelte' + import { Button, Material, Select, toast } from 'mono-svelte' import { t } from '$lib/translations' import Header from '$lib/components/ui/layout/pages/Header.svelte' import Option from 'mono-svelte/forms/select/Option.svelte' import { tick } from 'svelte' + import ProgressBar from '$lib/components/ui/ProgressBar.svelte' + import { client } from '$lib/lemmy.svelte' + import { goto } from '$app/navigation' let { data = $bindable() } = $props() @@ -26,6 +30,50 @@ $effect(() => { reports = data.items }) + + let batch = $state({ + progress: -1, + }) + async function markAllAsResolved() { + if (!reports) return + batch.progress = 0 + + const promises = await Promise.all( + reports.map((report) => { + switch (report.type) { + case 'comment': { + const promise = client().resolveCommentReport({ + report_id: report.id, + resolved: true, + }) + promise.then(() => (batch.progress += 1 / reports!.length)) + return promise + } + case 'post': { + const promise = client().resolvePostReport({ + report_id: report.id, + resolved: true, + }) + promise.then(() => (batch.progress += 1 / reports!.length)) + return promise + } + case 'message': { + const promise = client().resolvePrivateMessageReport({ + report_id: report.id, + resolved: true, + }) + promise.then(() => (batch.progress += 1 / reports!.length)) + return promise + } + } + }), + ) + + toast({ content: $t('routes.moderation.markAllComplete'), type: 'success' }) + await goto(page.url, { invalidateAll: true }) + + batch.progress = -1 + }
@@ -49,14 +97,21 @@ -
{/snippet}
+ {#if reports && reports.length > 0}
Date: Thu, 13 Feb 2025 16:12:33 -0800 Subject: [PATCH 119/161] fix: ssr crashes --- src/lib/components/ui/layout/Shell.svelte | 10 +++++----- src/lib/lemmy.svelte.ts | 4 ++-- src/lib/ui/colors.svelte.ts | 7 ++++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/lib/components/ui/layout/Shell.svelte b/src/lib/components/ui/layout/Shell.svelte index 5c019dc8..cd17b2b3 100644 --- a/src/lib/components/ui/layout/Shell.svelte +++ b/src/lib/components/ui/layout/Shell.svelte @@ -82,6 +82,11 @@ top: boolean }>(dockProps) + let sidePadding = $derived( + calculatePadding(dockProps.noGap, dockProps.top, false), + ) + let topPanel = $derived(dockProps.noGap && dockProps.top) + export { contentPaddingStore as contentPadding, dockPropsStore as dockProps } @@ -113,11 +118,6 @@ ...rest }: Props = $props() - let sidePadding = $derived( - calculatePadding(dockProps.noGap, dockProps.top, false), - ) - let topPanel = $derived(dockProps.noGap && dockProps.top) - $effect(() => { contentPaddingStore.set(contentPadding) dockPropsStore.set(dockProps) diff --git a/src/lib/lemmy.svelte.ts b/src/lib/lemmy.svelte.ts index 530bf189..0345d07d 100644 --- a/src/lib/lemmy.svelte.ts +++ b/src/lib/lemmy.svelte.ts @@ -1,7 +1,7 @@ import { type GetSiteResponse, LemmyHttp } from 'lemmy-js-client' import { get, writable } from 'svelte/store' import { error } from '@sveltejs/kit' -import { instance } from '$lib/instance.svelte.js' +import { DEFAULT_INSTANCE_URL, instance } from '$lib/instance.svelte.js' import { instanceToURL } from '$lib/util.svelte' import { profile } from '$lib/auth.svelte' import { toast } from 'mono-svelte' @@ -69,7 +69,7 @@ export function client({ ) => Promise auth?: string } = {}) { - if (!instanceURL) instanceURL = profile.data.instance + if (!instanceURL) instanceURL = profile.data.instance || DEFAULT_INSTANCE_URL let jwt = auth ? auth : profile.data?.jwt diff --git a/src/lib/ui/colors.svelte.ts b/src/lib/ui/colors.svelte.ts index bd8e96a8..c67b5e0d 100644 --- a/src/lib/ui/colors.svelte.ts +++ b/src/lib/ui/colors.svelte.ts @@ -111,9 +111,10 @@ const configuredColorScheme = env.PUBLIC_COLORSCHEME ?? 'system' class ThemeState { constructor() { - const localColorScheme: ColorScheme = - (localStorage.getItem('colorScheme') as ColorScheme) || - configuredColorScheme + const localColorScheme: ColorScheme = browser + ? (localStorage.getItem('colorScheme') as ColorScheme) || + configuredColorScheme + : (configuredColorScheme as ColorScheme) this.#colorScheme = localColorScheme } From 77671aaec539e8577be1708d9f0cfb12c90d55ca Mon Sep 17 00:00:00 2001 From: James Xylight Date: Thu, 13 Feb 2025 16:39:16 -0800 Subject: [PATCH 120/161] fix: ssr handoff crash --- src/lib/auth.svelte.ts | 2 +- .../lemmy/post/feed/VirtualFeed.svelte | 164 ++++++++---------- src/lib/instance.svelte.ts | 20 +-- src/lib/mono/popover/Popover.svelte | 10 +- src/routes/accounts/+page.svelte | 5 +- src/routes/login_reset/+page.svelte | 2 +- .../password_change/[token]/+page.svelte | 2 +- src/routes/settings/+page.svelte | 4 +- src/routes/signup/+page.svelte | 2 +- 9 files changed, 98 insertions(+), 113 deletions(-) diff --git a/src/lib/auth.svelte.ts b/src/lib/auth.svelte.ts index 4e66ae16..12faa6fd 100644 --- a/src/lib/auth.svelte.ts +++ b/src/lib/auth.svelte.ts @@ -3,7 +3,7 @@ import { isAdmin, } from '$lib/components/lemmy/moderation/moderation.js' import { toast } from 'mono-svelte' -import { DEFAULT_INSTANCE_URL } from '$lib/instance.svelte.js' +import { DEFAULT_INSTANCE_URL, instance } from '$lib/instance.svelte.js' import { client, getClient } from '$lib/lemmy.svelte.js' import { site } from './lemmy.svelte' import { instanceToURL, moveItem } from '$lib/util.svelte' diff --git a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte index d21acec9..91e9a274 100644 --- a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte +++ b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte @@ -1,44 +1,31 @@ From 1e83e491c216bb92b3f9624980847e62335107a3 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sat, 15 Feb 2025 18:57:45 -0800 Subject: [PATCH 125/161] fix: crossposts aren't working --- src/routes/create/post/+page.svelte | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/routes/create/post/+page.svelte b/src/routes/create/post/+page.svelte index dc4de7bf..ddf5153d 100644 --- a/src/routes/create/post/+page.svelte +++ b/src/routes/create/post/+page.svelte @@ -7,11 +7,7 @@ import { t } from '$lib/translations.js' import Header from '$lib/components/ui/layout/pages/Header.svelte' - let { - data = { - crosspost: false, - }, - } = $props() + let { data } = $props() onMount(() => { if (!profile.data?.jwt) { @@ -27,7 +23,7 @@ setSessionStorage('lastSeenCommunity', undefined) }) - let draft = getSessionStorage('postDraft') as any + let post = getSessionStorage('postDraft') as any @@ -36,8 +32,8 @@
Date: Sun, 16 Feb 2025 14:38:15 -0800 Subject: [PATCH 126/161] fix: commands wont focus, popover cant reverse --- .../ui/navbar/commands/Commands.svelte | 22 ++++++++++++------- src/lib/mono/popover/Popover.svelte | 3 +-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/lib/components/ui/navbar/commands/Commands.svelte b/src/lib/components/ui/navbar/commands/Commands.svelte index a71f2a40..bac8e3cf 100644 --- a/src/lib/components/ui/navbar/commands/Commands.svelte +++ b/src/lib/components/ui/navbar/commands/Commands.svelte @@ -27,7 +27,7 @@ profile.data, profileData.profiles, theme.data, - page.data.contextual?.actions + page.data.contextual?.actions, ) }) @@ -37,6 +37,7 @@ let selectedIndex = $state(0) let filteredGroups: Group[] = $state([]) let breadcrumbs: Action[] = $state([]) + let input = $state() function fuzzySearch(text: string, pattern: string): number { const textLower = text.toLowerCase() @@ -95,7 +96,7 @@ score: Math.max( fuzzySearch(action.name, term), fuzzySearch(group.name, term), - action.detail ? fuzzySearch(action.detail, term) : -1 + action.detail ? fuzzySearch(action.detail, term) : -1, ), })) .filter((action) => action.score > 0) @@ -106,7 +107,7 @@ actions: scoredActions, score: Math.max( fuzzySearch(group.name, term), - ...scoredActions.map((a) => a.score) + ...scoredActions.map((a) => a.score), ), } }) @@ -140,7 +141,7 @@ function flattenActions( actions: Action[], - subaction: boolean = true + subaction: boolean = true, ): Action[] { return actions.flatMap((action) => [ action, @@ -237,13 +238,17 @@ if (open) search = '' }) - let flattenedActions = $derived( - filteredGroups.flatMap((group) => group.actions) - ) - $effect(() => { debouncedSearch(search) }) + + onMount(() => { + if (input) input.focus() + }) + + let flattenedActions = $derived( + filteredGroups.flatMap((group) => group.actions), + ) @@ -253,6 +258,7 @@ class="sticky rounded-none border-t-0 border-x-0 focus-within:dark:border-zinc-800" size="lg" placeholder={$t('nav.commands.prompt')} + bind:element={input} />
{#if breadcrumbs.length > 0} diff --git a/src/lib/mono/popover/Popover.svelte b/src/lib/mono/popover/Popover.svelte index b90b1446..6d80b098 100644 --- a/src/lib/mono/popover/Popover.svelte +++ b/src/lib/mono/popover/Popover.svelte @@ -124,8 +124,7 @@ {#if open}
Date: Sun, 16 Feb 2025 14:59:08 -0800 Subject: [PATCH 127/161] improve: notification count uses Promise.all instead of waterfall --- src/lib/auth.svelte.ts | 58 ++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/src/lib/auth.svelte.ts b/src/lib/auth.svelte.ts index 12faa6fd..bafb8421 100644 --- a/src/lib/auth.svelte.ts +++ b/src/lib/auth.svelte.ts @@ -173,7 +173,10 @@ $effect.root(() => { }) $effect(() => { - if (profile.data.id || profileData) fetchUserData(profile).then((res) => {}) + if (profile.data.id || profileData) + fetchUserData(profile).then((res) => { + checkInbox() + }) }) }) @@ -319,37 +322,38 @@ export function moveProfile(id: number, up: boolean) { } async function getNotificationCount(jwt: string, mod: boolean, admin: boolean) { - const unreads = await getClient().getUnreadCount() + const unreadsPromise = getClient() + .getUnreadCount() + .then((res) => res.mentions + res.private_messages + res.replies) + .catch(() => 0) - let reports: number = 0 - let applications: number = 0 + const reportsPromise = mod + ? getClient() + .getReportCount({}) + .then( + (res) => + res.comment_reports + + res.post_reports + + (res.private_message_reports ?? 0), + ) + .catch(() => 0) + : new Promise((res) => res(0)) - if (mod) { - try { - const reportRes = await getClient().getReportCount({}) + const applicationsPromise = admin + ? getClient() + .getUnreadRegistrationApplicationCount() + .then((res) => res.registration_applications) + .catch(() => 0) + : new Promise((res) => res(0)) - reports = - reportRes.comment_reports + - reportRes.post_reports + - (reportRes.private_message_reports ?? 0) - } catch (e) { - // doesn't matter - } - } - - if (admin) { - try { - const applicationRes = - await getClient().getUnreadRegistrationApplicationCount() - - applications = applicationRes.registration_applications - } catch (e) { - // doesn't matter - } - } + const [unreads, reports, applications] = await Promise.all([ + unreadsPromise, + reportsPromise, + applicationsPromise, + ]) return { - unreads: unreads.mentions + unreads.private_messages + unreads.replies, + unreads: unreads, reports: reports, applications: applications, } From b5ce17308a597a2e63024991e2d7fce0c9dd019c Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sun, 16 Feb 2025 19:12:02 -0800 Subject: [PATCH 128/161] fix: unreactive sort options --- src/routes/search/+page.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte index 9153644b..a397eaf1 100644 --- a/src/routes/search/+page.svelte +++ b/src/routes/search/+page.svelte @@ -45,7 +45,8 @@ type Result = PostView | CommentView | PersonView | CommunityView - let { data = $bindable() } = $props() + let { data: passedData } = $props() + let data = $state(passedData) let query = $state(data.query || '') let searchElement: HTMLInputElement | undefined = $state() From 10f0ed208f436dde7a7a514b6e064b14eb354877 Mon Sep 17 00:00:00 2001 From: Xylight <80978739+Xyphyn@users.noreply.github.com> Date: Sun, 16 Feb 2025 19:12:58 -0800 Subject: [PATCH 129/161] cleanup: switch to a css-based navbar (#491) * cleanup: remove dock options and make adaptive by default * cleanup: switch to css-based navbar * feat: add auto hide option --- src/lib/components/ui/layout/Shell.svelte | 156 ++++-------------- .../components/ui/layout/pages/Header.svelte | 22 ++- src/lib/components/ui/navbar/NavButton.svelte | 42 ++--- src/lib/components/ui/navbar/Navbar.svelte | 2 +- src/lib/i18n/en.json | 4 + src/lib/mono/button/Button.svelte | 30 ++-- src/lib/settings.svelte.ts | 6 +- src/routes/admin/+layout.svelte | 6 +- src/routes/c/[name]/settings/+layout.svelte | 7 +- src/routes/communities/+page.svelte | 11 +- src/routes/inbox/+page.svelte | 7 +- .../post/[instance]/[id=integer]/+page.svelte | 8 +- src/routes/profile/+layout.svelte | 4 +- src/routes/saved/+page.svelte | 6 +- src/routes/search/+page.svelte | 6 +- src/routes/settings/+page.svelte | 50 +----- src/routes/util/+layout.svelte | 4 +- 17 files changed, 110 insertions(+), 261 deletions(-) diff --git a/src/lib/components/ui/layout/Shell.svelte b/src/lib/components/ui/layout/Shell.svelte index cd17b2b3..f6360570 100644 --- a/src/lib/components/ui/layout/Shell.svelte +++ b/src/lib/components/ui/layout/Shell.svelte @@ -1,100 +1,8 @@ - - + +
{@render children?.()}
{@render navbar?.({ - class: ` - ${ - dockProps.noGap - ? dockProps.top - ? 'border-b shadow-none rounded-none' - : 'border-t rounded-none' - : 'border rounded-full' - } - - dark:bg-transparent transition-colors duration-500 - pointer-events-auto backdrop-blur-xl ${ - topPanel - ? 'bg-slate-50/50 dark:bg-zinc-950/90 border-slate-100 dark:border-zinc-900' - : `border-slate-200 dark:border-zinc-800 shadow-2xl - bg-white/50 dark:bg-zinc-950/70` - }`, - style: 'transition: border-radius 250ms;', + class: `bg-slate-50/50 dark:bg-zinc-950/90 border-slate-100 dark:border-zinc-900 + pointer-events-auto backdrop-blur-xl border lg:border-t-0 lg:border-x-0 + rounded-full lg:rounded-none`, })}
{@render sidebar?.({ class: `hidden md:flex sticky top-0 left-0 h-max bg-slate-50 dark:bg-zinc-950 - z-40 - ${sidePadding.class}`, + z-40 lg:top-16`, style: 'grid-area: sidebar; width: 100% !important;', })} {@render main?.({ - class: `w-full bg-slate-25 dark:bg-zinc-925 justify-self-center shadow-sm z-0 - ${contentPadding.class} main`, + class: `w-full bg-slate-25 dark:bg-zinc-925 justify-self-center shadow-sm z-0 main !pb-22 lg:!pb-0`, style: 'grid-area: main', })} {@render suffix?.({ - class: `max-xl:hidden w-full sticky top-0 left-0 max-h-screen bg-slate-50 dark:bg-zinc-950 z-40 ${sidePadding.class}`, + class: `max-xl:hidden w-full sticky top-0 left-0 max-h-screen bg-slate-50 dark:bg-zinc-950 + z-40 lg:top-16`, style: 'grid-area: suffix;', })}
diff --git a/src/lib/components/ui/layout/pages/Header.svelte b/src/lib/components/ui/layout/pages/Header.svelte index e725fbec..c11644b9 100644 --- a/src/lib/components/ui/layout/pages/Header.svelte +++ b/src/lib/components/ui/layout/pages/Header.svelte @@ -1,6 +1,5 @@ diff --git a/src/lib/components/ui/navbar/Navbar.svelte b/src/lib/components/ui/navbar/Navbar.svelte index ac654f3f..73a58039 100644 --- a/src/lib/components/ui/navbar/Navbar.svelte +++ b/src/lib/components/ui/navbar/Navbar.svelte @@ -50,7 +50,7 @@ }} href="/" label={$t('nav.home')} - class="ml-2 logo" + class="ml-2 lg:ml-2 logo border-0 lg:rounded-full lg:w-10 lg:h-10 lg:!p-0" adaptive={false} > {#snippet customIcon()} diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index 5ffabe1b..e66cae1e 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -698,6 +698,10 @@ "pins": { "title": "Pins", "description": "Click a pin to send it to the top of the sidebar. Right click a pinned item to remove it." + }, + "autoHide": { + "title": "Auto hide dock", + "description": "Hides the dock on mobile when you scroll down, re-appears when you scroll up." } }, "app": { diff --git a/src/lib/mono/button/Button.svelte b/src/lib/mono/button/Button.svelte index 6bb2cfdf..4d7315db 100644 --- a/src/lib/mono/button/Button.svelte +++ b/src/lib/mono/button/Button.svelte @@ -121,7 +121,7 @@ animations?: any loaderWidth?: number | undefined href?: string | undefined - class?: string + class?: ClassValue prefix?: Snippet children?: Snippet suffix?: Snippet @@ -133,7 +133,7 @@ @@ -342,8 +341,7 @@

diff --git a/src/routes/profile/+layout.svelte b/src/routes/profile/+layout.svelte index a2ace3c0..413c0c9e 100644 --- a/src/routes/profile/+layout.svelte +++ b/src/routes/profile/+layout.svelte @@ -4,7 +4,6 @@ import MultiSelect from '$lib/components/input/Switch.svelte' import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte' - import { contentPadding } from '$lib/components/ui/layout/Shell.svelte' import { site } from '$lib/lemmy.svelte' import { t } from '$lib/translations' import { feature } from '$lib/version' @@ -31,8 +30,7 @@

-
+
`?page=${page}`} page={data.page} /> diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte index a397eaf1..02d1f8d5 100644 --- a/src/routes/search/+page.svelte +++ b/src/routes/search/+page.svelte @@ -38,7 +38,6 @@ import { t } from '$lib/translations.js' import Header from '$lib/components/ui/layout/pages/Header.svelte' import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte' - import { contentPadding } from '$lib/components/ui/layout/Shell.svelte' import { goto } from '$app/navigation' import Option from 'mono-svelte/forms/select/Option.svelte' import Skeleton from '$lib/components/ui/generic/Skeleton.svelte' @@ -71,10 +70,7 @@ {$t('routes.search.title')} -
+
{$t('settings.app.title')} -
-
Date: Sun, 16 Feb 2025 19:36:59 -0800 Subject: [PATCH 130/161] fix: unreactive search page --- src/routes/search/+page.svelte | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte index 02d1f8d5..e4528dd2 100644 --- a/src/routes/search/+page.svelte +++ b/src/routes/search/+page.svelte @@ -47,6 +47,10 @@ let { data: passedData } = $props() let data = $state(passedData) + $effect(() => { + passedData = data + }) + let query = $state(data.query || '') let searchElement: HTMLInputElement | undefined = $state() let form = $state() From 2edc48b44cacffee0640c9202c1a3cee12c41907 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sun, 16 Feb 2025 21:02:45 -0800 Subject: [PATCH 131/161] feat: add community header back on press --- src/lib/components/lemmy/post/PostMeta.svelte | 30 +++++++++++++++---- src/lib/components/ui/navbar/Profile.svelte | 6 ++-- .../ui/sidebar/ProfileButton.svelte | 2 +- .../ui/sidebar/SidebarButton.svelte | 6 +--- src/lib/lemmy/ProfileAvatar.svelte | 10 ++++--- src/lib/mono/popover/Popover.svelte | 12 +++++++- 6 files changed, 46 insertions(+), 20 deletions(-) diff --git a/src/lib/components/lemmy/post/PostMeta.svelte b/src/lib/components/lemmy/post/PostMeta.svelte index ada3e47a..dd13601f 100644 --- a/src/lib/components/lemmy/post/PostMeta.svelte +++ b/src/lib/components/lemmy/post/PostMeta.svelte @@ -129,12 +129,30 @@ {style} > {#if showCommunity && community} - + + {#snippet target()} + + {/snippet} + {#snippet popover()} + {#if community && subscribed} +
+ +
+ {/if} + {/snippet} +
{/if} {#if showCommunity && community} {#if profile.data?.user}
diff --git a/src/lib/components/ui/sidebar/ProfileButton.svelte b/src/lib/components/ui/sidebar/ProfileButton.svelte index ff39cb0d..001dc54a 100644 --- a/src/lib/components/ui/sidebar/ProfileButton.svelte +++ b/src/lib/components/ui/sidebar/ProfileButton.svelte @@ -22,7 +22,7 @@ color="tertiary" alignment="left" loading={switching} - loaderWidth={20} + loaderWidth={22} selected={profile.data?.id == prof.id} onclick={async () => { switching = true diff --git a/src/lib/components/ui/sidebar/SidebarButton.svelte b/src/lib/components/ui/sidebar/SidebarButton.svelte index a3487b1c..d05cabbd 100644 --- a/src/lib/components/ui/sidebar/SidebarButton.svelte +++ b/src/lib/components/ui/sidebar/SidebarButton.svelte @@ -1,11 +1,7 @@ {#if profile} -
+
{#if profile.avatar} {profile.username} {:else} { @@ -128,6 +137,7 @@ class="z-[150] {popoverClass}" use:customFloatingContent use:focusTrap + bind:this={popoverEl} > {#if popover}{@render popover()}{:else} From 754e4b3a03d019c4e1e571f39bd718d3d33250ba Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sun, 16 Feb 2025 21:04:08 -0800 Subject: [PATCH 132/161] fix: autoclose -> true --- src/lib/components/ui/navbar/Navbar.svelte | 2 +- src/lib/mono/popover/Popover.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/components/ui/navbar/Navbar.svelte b/src/lib/components/ui/navbar/Navbar.svelte index 73a58039..6822f359 100644 --- a/src/lib/components/ui/navbar/Navbar.svelte +++ b/src/lib/components/ui/navbar/Navbar.svelte @@ -50,7 +50,7 @@ }} href="/" label={$t('nav.home')} - class="ml-2 lg:ml-2 logo border-0 lg:rounded-full lg:w-10 lg:h-10 lg:!p-0" + class="ml-2 lg:ml-2 logo border-0 lg:!rounded-full lg:w-10 lg:h-10 lg:!p-0" adaptive={false} > {#snippet customIcon()} diff --git a/src/lib/mono/popover/Popover.svelte b/src/lib/mono/popover/Popover.svelte index be1235da..8b98d0b7 100644 --- a/src/lib/mono/popover/Popover.svelte +++ b/src/lib/mono/popover/Popover.svelte @@ -47,7 +47,7 @@ let { openOnHover = false, open = $bindable(false), - autoClose = false, + autoClose = true, placement = 'bottom-start', middleware = [offset(6), shift(), flip()], strategy = 'fixed', From d9b45e179b16663eaacc087d295e034e45e4ba47 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sun, 16 Feb 2025 21:09:35 -0800 Subject: [PATCH 133/161] fix: headers too large --- src/lib/components/ui/layout/pages/Header.svelte | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/lib/components/ui/layout/pages/Header.svelte b/src/lib/components/ui/layout/pages/Header.svelte index c11644b9..b8fc5159 100644 --- a/src/lib/components/ui/layout/pages/Header.svelte +++ b/src/lib/components/ui/layout/pages/Header.svelte @@ -19,14 +19,12 @@