From 7f9d8c6f864175e6e4ee012b0c16680f4631cca6 Mon Sep 17 00:00:00 2001 From: Xylight Date: Sun, 21 Sep 2025 20:51:48 -0700 Subject: [PATCH 1/3] fix: piefed page cursor types won't work --- bun.lockb | Bin 186370 -> 186370 bytes src/lib/client/piefed/rewrite.ts | 4 +- src/lib/client/piefed/schema.d.ts | 520 ++++++++++++++++-- .../client/types/schemas/GetPostsResponse.ts | 2 +- src/lib/lemmy/feeds/feed.svelte.ts | 8 +- src/routes/+page.ts | 13 +- src/routes/c/[name]/+page.svelte | 6 +- src/routes/c/[name]/+page.ts | 2 +- src/routes/f/[id]/+page.svelte | 2 +- src/routes/f/[id]/+page.ts | 7 +- src/routes/topic/[id]/+page.ts | 6 +- 11 files changed, 504 insertions(+), 66 deletions(-) diff --git a/bun.lockb b/bun.lockb index ffd0b54b86f27732a80f776ab6541bb851228bd6..5b2b015c3d9264001f04c7d72d827299d1e32f20 100755 GIT binary patch delta 396 zcmZqLz}>WgyI~7s``dIQ1_mhx1_mJphK7BDlj~pT$y#zS##!hY=mBMPfHHhQ876Vf z2FnWjML-!tJ!6oJ6;Or?C?m!iDeEWOd=e;Qsb_4aXTabB)pPF9$*T7qSI+}wjPwkr zzkADQEDP3J2UH*d)H=m$@!>^b_a_1s7z3@doNo7yQJlrZNY7|`YO3@`}R4YT0=dM+9@9x z8zq4bC@Id#OaeN>ZT{U=i^O;T04gxjvzV^;kx|kDXcPm36B7f2Akc+}iWls-Ztrs$ vsK7$c!~_@)!9W=vpv(emqd%%`XRX0z8|axBPOtySD8Xc8uzlu7#>{5``v7nt delta 396 zcmZqLz}>WgyI~7s``dIw1_mhx1_mJphK7BDlj~pT$y#zS##!hY=mBMPfHHhQ876Vf z2FnWjML-!tJtI9!1_mpj3>Q#Fj5Si$Pqz6aP{vZv2&j$01*+%Vp_5hbJFcDw${6Vx zOn>*5(O4F&wGOC20;qM0*W$yA!tPH5Dli6GXEELG9iuplp}C&n^vHLNKGGHp3?G3? z1%OIBGxYo~{WS>zDm4JwZ!rD9J4SCNBa7+0?-?bT4S@oh?-|d?n&=rDFccJ}mXu_s z7Tt+62->8*vlncu`w|4f`KwTK$!*BMt@Y>&RT=bHqbM+m|p*pQG&_PWc$pIjG4~> export interface components { @@ -3696,12 +4049,16 @@ export interface components { /** Format: html */ about_html?: string /** Format: url */ - avatar?: string + avatar?: string | null /** Format: url */ - banner?: string + banner?: string | null flair?: string - published: string - title?: string + /** + * Format: datetime + * @example 2025-06-07T02:29:07.980084Z + */ + published?: string + title?: string | null } PersonView: { activity_alert: boolean @@ -3762,12 +4119,12 @@ export interface components { title: string banned?: boolean /** Format: url */ - banner?: string + banner?: string | null /** Format: markdown */ description?: string /** Format: url */ - icon?: string - posting_warning?: string + icon?: string | null + posting_warning?: string | null /** * Format: datetime * @example 2025-06-07T02:29:07.980084Z @@ -3775,8 +4132,8 @@ export interface components { updated?: string } CommunityBlockView: { - community: components['schemas']['Community'] - person: components['schemas']['Person'] + community?: components['schemas']['Community'] + person?: components['schemas']['Person'] } CommunityFollowerView: { community: components['schemas']['Community'] @@ -3813,8 +4170,9 @@ export interface components { | 'Subscribed' | 'Popular' | 'Moderating' + | 'ModeratorView' /** @enum {string} */ - default_sort_type: + default_sort_type?: | 'Active' | 'Hot' | 'New' @@ -3830,6 +4188,7 @@ export interface components { | 'TopYear' | 'TopAll' | 'Scaled' + | 'Old' show_bot_accounts: boolean show_nsfl: boolean show_nsfw: boolean @@ -3948,7 +4307,7 @@ export interface components { * Format: url * @description Legacy tags that existed prior to 1.2 and some tags for remote communities might not have a defined ap_id */ - ap_id: string + ap_id: string | null } CommunityView: { activity_alert: boolean @@ -3975,6 +4334,16 @@ export interface components { published: string score: number upvotes: number + cross_posts: number + } + WidthHeight: { + width?: number + height?: number + } + MiniCrossPosts: { + post_id?: number + reply_count?: number + community_name?: string } Post: { /** Format: url */ @@ -4009,6 +4378,8 @@ export interface components { updated?: string /** Format: url */ url?: string + image_details?: components['schemas']['WidthHeight'] + cross_posts?: components['schemas']['MiniCrossPosts'][] } PostView: { banned_from_community: boolean @@ -4130,7 +4501,7 @@ export interface components { } ListCommunitiesResponse: { communities: components['schemas']['CommunityView'][] - next_page?: string + next_page?: string | null } FollowCommunityRequest: { community_id: number @@ -4152,12 +4523,12 @@ export interface components { name: string title: string /** Format: url */ - banner_url?: string + banner_url?: string | null /** Format: markdown */ description?: string discussion_languages?: number[] /** Format: url */ - icon_url?: string + icon_url?: string | null local_only?: boolean nsfw?: boolean restricted_to_mods?: boolean @@ -4167,12 +4538,12 @@ export interface components { community_id: number title?: string /** Format: url */ - banner_url?: string + banner_url?: string | null /** Format: markdown */ description?: string discussion_languages?: number[] /** Format: url */ - icon_url?: string + icon_url?: string | null local_only?: boolean nsfw?: boolean restricted_to_mods?: boolean @@ -4203,17 +4574,17 @@ export interface components { * Format: datetime * @example 2025-06-07T02:29:07.980084Z, null=permanent ban */ - expired_at?: string + expired_at?: string | null /** * Format: datetime * @example 2025-06-07T02:29:07.980084Z, null=permanent ban */ - expires_at?: string + expires_at?: string | null reason?: string } CommunityModerationBansListResponse: { items?: components['schemas']['CommunityModerationBanItem'][] - next_page?: string + next_page?: string | null } CommunityModerationUnbanRequest: { community_id: number @@ -4271,7 +4642,7 @@ export interface components { * Format: url * @description Legacy tags that existed prior to 1.2 and some tags for remote communities might not have a defined ap_id */ - ap_id: string + ap_id: string | null } CommunityFlairEditRequest: { flair_id: number @@ -4307,7 +4678,7 @@ export interface components { * Format: url * @description Legacy tags that existed prior to 1.2 and some tags for remote communities might not have a defined ap_id */ - ap_id: string + ap_id: string | null } CommunityFlairDeleteRequest: { flair_id: number @@ -4351,14 +4722,14 @@ export interface components { /** @description user_id of the feed creator/owner */ user_id: number /** Format: url */ - banner?: string + banner?: string | null /** Format: markdown */ - description?: string + description?: string | null /** Format: html */ - description_html?: string + description_html?: string | null /** Format: url */ - icon?: string - parent_feed_id?: number + icon?: string | null + parent_feed_id?: number | null } FeedListResponse: { feeds: components['schemas']['FeedView'][] @@ -4371,7 +4742,7 @@ export interface components { name: string show_posts_from_children: boolean title: string - parent_topic_id?: number + parent_topic_id?: number | null } TopicListResponse: { topics: components['schemas']['TopicView'][] @@ -4429,11 +4800,11 @@ export interface components { subscribed: 'Subscribed' | 'NotSubscribed' | 'Pending' } UserRepliesResponse: { - next_page: number + next_page?: string | null replies: components['schemas']['CommentReplyView'][] } UserMentionsResponse: { - next_page: number + next_page?: string | null replies: components['schemas']['CommentReplyView'][] } UserBlockRequest: { @@ -4461,14 +4832,14 @@ export interface components { * Format: url * @description Pass a null value to remove the image */ - avatar?: string + avatar?: string | null /** Format: markdown */ bio?: string /** * Format: url * @description Pass a null value to remove the image */ - cover?: string + cover?: string | null /** @enum {string} */ default_comment_sort_type?: 'Hot' | 'Top' | 'New' | 'Old' /** @enum {string} */ @@ -4518,7 +4889,7 @@ export interface components { /** @enum {string} */ status: 'All' | 'Unread' | 'Read' username: string - next_page: number + next_page?: string | null } UserNotificationStateRequest: { notif_id: number @@ -4535,14 +4906,14 @@ export interface components { UserSetFlairRequest: { community_id: number /** @description Either omit or set to null to remove existing flair */ - flair_text?: string + flair_text?: string | null } UserSetFlairResponse: { person_view: components['schemas']['PersonView'] } ListCommentsResponse: { comments: components['schemas']['CommentView'][] - next_page?: string + next_page?: string | null } LikeCommentRequest: { comment_id: number @@ -4578,7 +4949,11 @@ export interface components { body: string comment_id: number language_id?: number - distinguished?: boolean + /** + * @description Visibly mark reply as from a moderator in the web UI + * @default false + */ + distinguished: boolean } DeleteCommentRequest: { comment_id: number @@ -4598,7 +4973,7 @@ export interface components { id: number creator_id: number comment_id: number - original_comment_text: string + original_comment_text?: string reason?: string resolved: boolean /** @@ -4657,12 +5032,12 @@ export interface components { creator: components['schemas']['Person'] } ListCommentLikesResponse: { - comment_likes?: components['schemas']['CommentLikeView'][] - next_page?: string + comment_likes: components['schemas']['CommentLikeView'][] + next_page?: string | null } ListPostsResponse: { posts: components['schemas']['PostView'][] - next_page?: string + next_page?: string | null } GetPostResponse: { post_view: components['schemas']['PostView'] @@ -4690,12 +5065,13 @@ export interface components { } GetPostRepliesResponse: { comments?: components['schemas']['PostReplyView'][] - next_page?: string + next_page?: string | null } LikePostRequest: { post_id: number score: number private?: boolean + auth?: string } SavePostRequest: { post_id: number @@ -4739,7 +5115,11 @@ export interface components { original_post_body: string reason: string resolved: boolean - published: string + /** + * Format: datetime + * @example 2025-06-07T02:29:07.980084Z + */ + published?: string } PostReportView: { post_report: components['schemas']['PostReport'] @@ -4788,13 +5168,13 @@ export interface components { creator: components['schemas']['Person'] } ListPostLikesResponse: { - post_likes?: components['schemas']['PostLikeView'][] - next_page?: string + post_likes: components['schemas']['PostLikeView'][] + next_page?: string | null } PostSetFlairRequest: { post_id: number /** @description A list of all the flair id to assign to the post. Either pass an empty list or null to remove flair */ - flair_id_list?: number[] + flair_id_list?: number[] | null } PostSetFlairResponse: { banned_from_community: boolean @@ -4826,6 +5206,56 @@ export interface components { saved_only?: boolean q?: string } + PrivateMessage: { + id: number + creator_id: number + recipient_id: number + content: string + deleted: boolean + read: boolean + /** + * Format: datetime + * @example 2025-06-07T02:29:07.980084Z + */ + published: string + /** Format: url */ + ap_id: string + local: boolean + } + PrivateMessageView: { + private_message: components['schemas']['PrivateMessage'] + creator: components['schemas']['Person'] + recipient: components['schemas']['Person'] + } + ListPrivateMessagesResponse: { + private_messages: components['schemas']['PrivateMessageView'][] + } + GetPrivateMessageConversationResponse: { + private_messages: components['schemas']['PrivateMessageView'][] + } + CreatePrivateMessageRequest: { + content: string + recipient_id: number + } + PrivateMessageResponse: { + private_message_view: components['schemas']['PrivateMessageView'] + } + EditPrivateMessageRequest: { + private_message_id: number + content: string + } + MarkPrivateMessageAsReadRequest: { + private_message_id: number + read: boolean + } + DeletePrivateMessageRequest: { + private_message_id: number + deleted: boolean + } + ReportPrivateMessageRequest: { + private_message_id: number + reason: string + } } responses: { /** @description Unprocessable Content */ diff --git a/src/lib/client/types/schemas/GetPostsResponse.ts b/src/lib/client/types/schemas/GetPostsResponse.ts index d055fb80..3348090b 100644 --- a/src/lib/client/types/schemas/GetPostsResponse.ts +++ b/src/lib/client/types/schemas/GetPostsResponse.ts @@ -2,5 +2,5 @@ import type { PaginationCursor } from './schemas' import type { PostView } from './schemas' export interface GetPostsResponse { posts: Array - next_page?: PaginationCursor + next_page: PaginationCursor } diff --git a/src/lib/lemmy/feeds/feed.svelte.ts b/src/lib/lemmy/feeds/feed.svelte.ts index 400ac527..4a2e642c 100644 --- a/src/lib/lemmy/feeds/feed.svelte.ts +++ b/src/lib/lemmy/feeds/feed.svelte.ts @@ -56,7 +56,7 @@ export interface FeedTypes { { posts: PostView[] next_page?: string - params: GetPosts + params: GetPostss & { page_cursor: string } client: { itemHeights?: (number | null)[] lastSeen?: number @@ -69,7 +69,7 @@ export interface FeedTypes { posts: PostView[] community: GetCommunityResponse next_page?: string - params: GetPosts + params: GetPosts & { page_cursor: string } client: { itemHeights?: (number | null)[]; lastSeen?: number } }, ] @@ -110,7 +110,7 @@ export interface FeedTypes { { posts: PostView[] next_page?: string - params: GetPosts + params: GetPosts & { page_cursor: string } feed: Promise client: { itemHeights?: (number | null)[] @@ -123,7 +123,7 @@ export interface FeedTypes { { posts: PostView[] next_page?: string - params: GetPosts + params: GetPosts & { page_cursor: string } topic: Promise client: { itemHeights?: (number | null)[] diff --git a/src/routes/+page.ts b/src/routes/+page.ts index 29bb728f..f5650f97 100644 --- a/src/routes/+page.ts +++ b/src/routes/+page.ts @@ -14,11 +14,14 @@ export async function load({ url, fetch, route }) { const listingType: ListingType = (url.searchParams.get('type') as ListingType) || settings.defaultSort.feed - const feedData = feed(route.id, async (params) => ({ - ...(await client({ func: fetch }).getPosts(params)), - params: params, - client: {}, - })).load({ + const feedData = feed(route.id, async (params) => { + const posts = await client({ func: fetch }).getPosts(params) + return { + ...posts, + params: { ...params, page_cursor: posts.next_page }, + client: {}, + } + }).load({ page_cursor: cursor, sort: sort, type_: listingType, diff --git a/src/routes/c/[name]/+page.svelte b/src/routes/c/[name]/+page.svelte index 4856b2a8..229beb33 100644 --- a/src/routes/c/[name]/+page.svelte +++ b/src/routes/c/[name]/+page.svelte @@ -51,13 +51,13 @@ {#snippet extended()} i.feeds.find((j) => j.id.toString() == p.feed_id!), ) + const postPromise = piefed.getPosts(p) + return { - ...(await piefed.getPosts(p)), + posts: (await postPromise).posts, + next_page: (await postPromise).next_page, feed: piefedFeedData, - params: p, + params: { ...p, page_cursor: (await postPromise).next_page }, client: {}, } }).load({ diff --git a/src/routes/topic/[id]/+page.ts b/src/routes/topic/[id]/+page.ts index cf9b9203..e77ff772 100644 --- a/src/routes/topic/[id]/+page.ts +++ b/src/routes/topic/[id]/+page.ts @@ -19,10 +19,12 @@ export async function load({ url, fetch, route, params }) { include_communities: true, }).then((i) => i.topics.find((j) => j.id.toString() == p.topic_id!)) + const posts = await piefed.getPosts(p) + return { - ...(await piefed.getPosts(p)), + ...posts, topic: piefedTopicData, - params: p, + params: { ...p, page_cursor: posts.next_page }, client: {}, } }).load({ From 1345e2cba8e5d29567ef67ab35ac22d092ab4c10 Mon Sep 17 00:00:00 2001 From: Xylight Date: Mon, 22 Sep 2025 18:18:01 -0700 Subject: [PATCH 2/3] refactor: remove svelte-markdown and replace with lighter one, de-barrel exports --- bun.lockb | Bin 186370 -> 185258 bytes package.json | 3 +- src/app.d.ts | 2 +- src/lib/auth.svelte.ts | 5 +- .../components/form/ImageAttachForm.svelte | 2 +- .../lemmy/ObjectAutocomplete.svelte | 2 +- src/lib/components/lemmy/PictrsImage.svelte | 6 +- .../components/lemmy/comment/Comment.svelte | 11 ++-- .../lemmy/comment/CommentActions.svelte | 10 +--- .../lemmy/comment/CommentForm.svelte | 4 +- .../lemmy/comment/CommentItem.svelte | 4 +- .../comment/CommentListVirtualizer.svelte | 2 +- .../lemmy/comment/CommentVote.svelte | 2 +- src/lib/components/lemmy/comment/index.ts | 9 --- .../lemmy/community/CommunityCard.svelte | 19 +++--- .../lemmy/community/CommunityForm.svelte | 6 +- .../lemmy/community/CommunityHeader.svelte | 8 +-- .../lemmy/community/CommunityItem.svelte | 6 +- .../lemmy/community/CommunityLink.svelte | 2 +- .../lemmy/community/CommunityTitle.svelte | 2 +- src/lib/components/lemmy/community/index.ts | 7 --- .../components/lemmy/generic/ItemList.svelte | 4 +- .../lemmy/inbox/PrivateMessage.svelte | 4 +- .../lemmy/instance/InstanceCard.svelte | 2 +- .../lemmy/modal/ApplicationDenyModal.svelte | 4 +- .../lemmy/moderation/BanModal.svelte | 8 +-- .../moderation/CommentModerationMenu.svelte | 2 +- .../lemmy/moderation/Moderation.svelte | 10 ++-- .../lemmy/moderation/RemoveModal.svelte | 8 +-- .../lemmy/moderation/ReportModal.svelte | 4 +- src/lib/components/lemmy/moderation/report.ts | 2 +- src/lib/components/lemmy/post/Post.svelte | 2 +- src/lib/components/lemmy/post/PostBody.svelte | 6 +- src/lib/components/lemmy/post/PostMeta.svelte | 12 ++-- src/lib/components/lemmy/post/PostVote.svelte | 2 +- .../lemmy/post/actions/PostActions.svelte | 13 ++--- .../lemmy/post/feed/PostFeed.svelte | 2 +- .../lemmy/post/feed/VirtualFeed.svelte | 6 +- .../lemmy/post/form/PostForm.svelte | 14 ++--- src/lib/components/lemmy/post/index.ts | 3 - .../lemmy/post/link/PostLink.svelte | 2 +- .../lemmy/post/media/PostImage.svelte | 2 +- .../lemmy/post/media/PostMediaCompact.svelte | 2 +- .../lemmy/user/UserAutocomplete.svelte | 2 +- src/lib/components/lemmy/user/UserItem.svelte | 4 +- src/lib/components/lemmy/user/UserLink.svelte | 4 +- src/lib/components/markdown/Markdown.svelte | 52 ++++++----------- .../components/markdown/MarkdownEditor.svelte | 4 +- src/lib/components/markdown/MdTree.svelte | 54 ++++++++++++++++++ .../markdown/renderers/MdImage.svelte | 4 +- .../markdown/renderers/MdParagraph.svelte | 9 +-- .../markdown/renderers/MdSpoiler.svelte | 12 ++-- .../ui/layout/pages/PostListShell.svelte | 13 +++-- .../components/ui/layout/pages/Tabs.svelte | 2 +- src/lib/components/ui/navbar/Navbar.svelte | 7 +-- src/lib/components/ui/navbar/Profile.svelte | 7 +-- .../ui/navbar/commands/actions.svelte.ts | 5 +- .../ui/sidebar/CommunityList.svelte | 4 +- .../ui/sidebar/ProfileButton.svelte | 2 +- src/lib/components/ui/sidebar/Sidebar.svelte | 8 +-- .../components/util/debug/DebugObject.svelte | 2 +- src/lib/lemmy/ProfileAvatar.svelte | 2 +- src/lib/mono/toast/Toast.svelte | 2 +- src/routes/+layout.svelte | 12 ++-- src/routes/+page.svelte | 13 +++-- src/routes/about/+page.svelte | 4 +- src/routes/accounts/+page.svelte | 12 ++-- .../externalInteraction/+page.svelte | 8 +-- src/routes/admin/+layout.svelte | 2 +- src/routes/admin/applications/+page.svelte | 6 +- .../admin/applications/Application.svelte | 8 +-- src/routes/admin/config/+page.svelte | 6 +- src/routes/admin/federation/+page.svelte | 8 +-- src/routes/admin/media/+page.svelte | 6 +- src/routes/admin/taglines/+page.svelte | 8 +-- src/routes/admin/team/+page.svelte | 8 +-- src/routes/c/[name]/+page.svelte | 4 +- src/routes/c/[name]/+page.ts | 2 +- src/routes/c/[name]/settings/+layout.svelte | 2 +- src/routes/c/[name]/settings/+layout.ts | 2 +- src/routes/c/[name]/settings/+page.svelte | 8 +-- .../c/[name]/settings/team/+page.svelte | 8 +-- .../[instance]/[id]/confirm/+page.svelte | 6 +- src/routes/create/+layout.svelte | 4 +- src/routes/create/community/+page.svelte | 2 +- src/routes/create/post/+page.svelte | 2 +- src/routes/explore/+layout.svelte | 6 +- src/routes/explore/communities/+page.svelte | 14 ++--- src/routes/explore/feeds/+page.svelte | 2 +- src/routes/explore/feeds/FeedItem.svelte | 8 +-- src/routes/explore/topics/+page.svelte | 2 +- src/routes/explore/topics/TopicItem.svelte | 2 +- src/routes/f/[id]/+page.svelte | 8 +-- src/routes/inbox/+layout.svelte | 2 +- src/routes/inbox/+page.svelte | 10 ++-- src/routes/inbox/+page.ts | 2 +- src/routes/inbox/InboxItem.svelte | 12 ++-- src/routes/inbox/messages/+page.svelte | 18 +++--- .../messages/[user_id=integer]/+page.svelte | 8 +-- .../messages/[user_id=integer]/Message.svelte | 6 +- src/routes/instances/+layout.svelte | 4 +- src/routes/instances/blocked/+page.svelte | 8 +-- src/routes/instances/linked/+page.svelte | 8 +-- src/routes/legal/+page.svelte | 4 +- src/routes/login/+page.svelte | 4 +- src/routes/login/guest/+page.svelte | 2 +- src/routes/login_reset/+page.svelte | 2 +- src/routes/moderation/+layout.svelte | 2 +- src/routes/moderation/+page.svelte | 14 ++--- src/routes/moderation/+page.ts | 4 +- src/routes/moderation/Report.svelte | 12 ++-- .../moderation/c/[id=integer]/+page.svelte | 12 ++-- .../moderation/communities/+page.svelte | 6 +- src/routes/modlog/+page.svelte | 18 +++--- src/routes/modlog/+page.ts | 2 +- src/routes/modlog/item/ModlogItemCard.svelte | 8 +-- src/routes/modlog/item/ModlogItemTable.svelte | 6 +- .../password_change/[token]/+page.svelte | 2 +- .../post/[instance]/[id=integer]/+page.svelte | 16 +++--- .../post/[instance]/[id=integer]/+page.ts | 2 +- .../[id=integer]/CommentProvider.svelte | 12 ++-- .../[id=integer]/confirm/+page.svelte | 6 +- .../profile/(local_user)/blocks/+page.svelte | 14 ++--- .../(local_user)/password/+layout.svelte | 4 +- .../(local_user)/password/+page.svelte | 2 +- .../(local_user)/password/2fa/+page.svelte | 2 +- .../(local_user)/password/logins/+page.svelte | 4 +- .../(local_user)/settings/+page.svelte | 6 +- src/routes/profile/+layout.svelte | 2 +- src/routes/profile/media/+page.svelte | 6 +- src/routes/profile/voted/[type]/+page.svelte | 8 +-- src/routes/saved/+page.svelte | 10 ++-- src/routes/search/+page.svelte | 20 +++---- src/routes/settings/+layout.svelte | 8 +-- src/routes/settings/Section.svelte | 4 +- src/routes/settings/app/+page.svelte | 10 ++-- src/routes/settings/embeds/+page.svelte | 2 +- src/routes/settings/lemmy/+page.svelte | 2 +- src/routes/settings/moderation/+page.svelte | 8 +-- src/routes/settings/other/+page.svelte | 2 +- src/routes/signup/+page.svelte | 6 +- src/routes/signup/[instance]/+page.svelte | 14 ++--- src/routes/theme/+page.svelte | 2 +- src/routes/topic/[id]/+page.svelte | 8 +-- src/routes/translators/+page.svelte | 2 +- src/routes/u/[name]/+page.svelte | 22 +++---- src/routes/u/[name]/UserActions.svelte | 2 +- src/routes/util/+layout.svelte | 2 +- src/routes/util/instance/+page.svelte | 2 +- src/routes/util/photonify/+page.svelte | 2 +- svelte.config.js | 1 + 151 files changed, 490 insertions(+), 507 deletions(-) delete mode 100644 src/lib/components/lemmy/comment/index.ts delete mode 100644 src/lib/components/lemmy/community/index.ts create mode 100644 src/lib/components/markdown/MdTree.svelte diff --git a/bun.lockb b/bun.lockb index 5b2b015c3d9264001f04c7d72d827299d1e32f20..69fe178db60aadf183ff4323a3abdf049dafc539 100755 GIT binary patch delta 29217 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 delta 29942 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 Ir^?a)2g>-=%K!iX diff --git a/package.json b/package.json index c43a8754..3957adbb 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "jsdom": "^22.1.0", "lemmy-js-client": "0.19.11-donation-dialog.1", "linkify-it": "^5.0.0", - "marked": "7.0.5", + "marked": "^16.3.0", "marked-linkify-it": "^3.1.13", "nprogress": "^0.2.0", "openapi-fetch": "^0.14.0", @@ -36,7 +36,6 @@ "svelte-floating-ui": "^1.6.2", "svelte-focus-trap": "^1.2.0", "svelte-infinite-scroll": "^2.0.1", - "svelte-markdown": "^0.4.1", "sveltekit-i18n": "^2.4.2", "tailwindcss": "^4.1.13", "tslib": "^2.8.1", diff --git a/src/app.d.ts b/src/app.d.ts index 3201e590..2c93e142 100644 --- a/src/app.d.ts +++ b/src/app.d.ts @@ -1,6 +1,6 @@ // See https://kit.svelte.dev/docs/types#app -import type { Action } from '$lib/components/ui/navbar/commands/actions.svelte' +import type { Action } from '$comp/ui/navbar/commands/actions.svelte' // for information about these interfaces declare global { diff --git a/src/lib/auth.svelte.ts b/src/lib/auth.svelte.ts index cf0c94e8..b1d160bb 100644 --- a/src/lib/auth.svelte.ts +++ b/src/lib/auth.svelte.ts @@ -1,9 +1,6 @@ import { browser } from '$app/environment' import { env } from '$env/dynamic/public' -import { - amModOfAny, - isAdmin, -} from '$lib/components/lemmy/moderation/moderation.js' +import { amModOfAny, isAdmin } from '$comp/lemmy/moderation/moderation.js' import { DEFAULT_INSTANCE_URL } from '$lib/instance.svelte.js' import { client, getClient, site } from '$lib/client/lemmy.svelte' import { instanceToURL, moveItem } from '$lib/util.svelte' diff --git a/src/lib/components/form/ImageAttachForm.svelte b/src/lib/components/form/ImageAttachForm.svelte index f9b4c936..255ec71d 100644 --- a/src/lib/components/form/ImageAttachForm.svelte +++ b/src/lib/components/form/ImageAttachForm.svelte @@ -1,6 +1,6 @@ {#if $modals.reporting.open} - {#await import('$lib/components/lemmy/moderation/ReportModal.svelte') then { default: ReportModal }} + {#await import('$comp/lemmy/moderation/ReportModal.svelte') then { default: ReportModal }} {/await} {/if} diff --git a/src/lib/components/lemmy/moderation/RemoveModal.svelte b/src/lib/components/lemmy/moderation/RemoveModal.svelte index c859fad2..0deb8ef4 100644 --- a/src/lib/components/lemmy/moderation/RemoveModal.svelte +++ b/src/lib/components/lemmy/moderation/RemoveModal.svelte @@ -1,12 +1,12 @@ {#if uploadingImage} - {#await import('$lib/components/form/ImageInputModal.svelte') then { default: UploadModal }} + {#await import('$comp/form/ImageInputModal.svelte') then { default: UploadModal }} '', (v) => (data.url = v)} diff --git a/src/lib/components/lemmy/post/index.ts b/src/lib/components/lemmy/post/index.ts index 782db59f..280dd095 100644 --- a/src/lib/components/lemmy/post/index.ts +++ b/src/lib/components/lemmy/post/index.ts @@ -8,9 +8,6 @@ export { default as PostMediaCompact } from './media/PostMediaCompact.svelte' export { default as PostImage } from './media/PostImage.svelte' export { default as PostIframe } from './media/PostIframe.svelte' export { default as PostLink } from './link/PostLink.svelte' -export { default as VirtualFeed } from './feed/VirtualFeed.svelte' -export { default as PostFeed } from './feed/PostFeed.svelte' -export { default as PostForm } from './form/PostForm.svelte' export { default as PostActions } from './actions/PostActions.svelte' export { diff --git a/src/lib/components/lemmy/post/link/PostLink.svelte b/src/lib/components/lemmy/post/link/PostLink.svelte index 232e8ed3..e4786ef8 100644 --- a/src/lib/components/lemmy/post/link/PostLink.svelte +++ b/src/lib/components/lemmy/post/link/PostLink.svelte @@ -1,5 +1,5 @@ - - - + + diff --git a/src/lib/components/markdown/MarkdownEditor.svelte b/src/lib/components/markdown/MarkdownEditor.svelte index fd1c5fce..919dde0d 100644 --- a/src/lib/components/markdown/MarkdownEditor.svelte +++ b/src/lib/components/markdown/MarkdownEditor.svelte @@ -1,6 +1,6 @@ + +{#if type} + {#if renderers[type]} + {@const Renderer = renderers[type]} + + {#each tokens as token} + {#if token.tokens && token.tokens.length > 0} + + {:else if token.text} + {decodeHtmlEntities(token.text)} + {:else if text} + {text} + {/if} + {/each} + + {/if} +{:else} + {#each tokens as token} + + {/each} +{/if} diff --git a/src/lib/components/markdown/renderers/MdImage.svelte b/src/lib/components/markdown/renderers/MdImage.svelte index 7b75d742..7e74386b 100644 --- a/src/lib/components/markdown/renderers/MdImage.svelte +++ b/src/lib/components/markdown/renderers/MdImage.svelte @@ -4,8 +4,8 @@ mediaType, optimizeImageURL, PostIframe, - } from '$lib/components/lemmy/post' - import { showImage } from '$lib/components/ui/ExpandableImage.svelte' + } from '$comp/lemmy/post' + import { showImage } from '$comp/ui/ExpandableImage.svelte' import { t } from '$lib/i18n/translations' import { getContext } from 'svelte' import { ArrowDownTray, Icon } from 'svelte-hero-icons' diff --git a/src/lib/components/markdown/renderers/MdParagraph.svelte b/src/lib/components/markdown/renderers/MdParagraph.svelte index fb102bc6..9ede12d0 100644 --- a/src/lib/components/markdown/renderers/MdParagraph.svelte +++ b/src/lib/components/markdown/renderers/MdParagraph.svelte @@ -1,15 +1,8 @@ -

+

{@render children?.()}

diff --git a/src/lib/components/markdown/renderers/MdSpoiler.svelte b/src/lib/components/markdown/renderers/MdSpoiler.svelte index ed6fe266..d8c22550 100644 --- a/src/lib/components/markdown/renderers/MdSpoiler.svelte +++ b/src/lib/components/markdown/renderers/MdSpoiler.svelte @@ -1,13 +1,13 @@ diff --git a/src/routes/accounts/+page.svelte b/src/routes/accounts/+page.svelte index 1367c853..1183d145 100644 --- a/src/routes/accounts/+page.svelte +++ b/src/routes/accounts/+page.svelte @@ -1,9 +1,9 @@ diff --git a/src/routes/c/[name]/settings/team/+page.svelte b/src/routes/c/[name]/settings/team/+page.svelte index bc91286c..fad1b673 100644 --- a/src/routes/c/[name]/settings/team/+page.svelte +++ b/src/routes/c/[name]/settings/team/+page.svelte @@ -1,9 +1,9 @@ diff --git a/src/routes/create/post/+page.svelte b/src/routes/create/post/+page.svelte index dd730541..4a3469ee 100644 --- a/src/routes/create/post/+page.svelte +++ b/src/routes/create/post/+page.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/instances/blocked/+page.svelte b/src/routes/instances/blocked/+page.svelte index 0fd57d7f..6d3c6b22 100644 --- a/src/routes/instances/blocked/+page.svelte +++ b/src/routes/instances/blocked/+page.svelte @@ -1,8 +1,8 @@
diff --git a/src/routes/modlog/+page.svelte b/src/routes/modlog/+page.svelte index 8e5383be..c54afdc7 100644 --- a/src/routes/modlog/+page.svelte +++ b/src/routes/modlog/+page.svelte @@ -3,15 +3,14 @@ import { page } from '$app/state' import { profile } from '$lib/auth.svelte.js' import { client } from '$lib/client/lemmy.svelte' - import { CommunityLink } from '$lib/components/lemmy/community' - import { isAdmin } from '$lib/components/lemmy/moderation/moderation.js' - import ObjectAutocomplete from '$lib/components/lemmy/ObjectAutocomplete.svelte' - import { postLink } from '$lib/components/lemmy/post' - import UserAutocomplete from '$lib/components/lemmy/user/UserAutocomplete.svelte' - import UserLink from '$lib/components/lemmy/user/UserLink.svelte' - import { Header } from '$lib/components/ui/layout' - import Pageination from '$lib/components/ui/layout/Pageination.svelte' - import Placeholder from '$lib/components/ui/Placeholder.svelte' + import { isAdmin } from '$comp/lemmy/moderation/moderation.js' + import ObjectAutocomplete from '$comp/lemmy/ObjectAutocomplete.svelte' + import { postLink } from '$comp/lemmy/post' + import UserAutocomplete from '$comp/lemmy/user/UserAutocomplete.svelte' + import UserLink from '$comp/lemmy/user/UserLink.svelte' + import { Header } from '$comp/ui/layout' + import Pageination from '$comp/ui/layout/Pageination.svelte' + import Placeholder from '$comp/ui/Placeholder.svelte' import { t } from '$lib/i18n/translations' import { settings } from '$lib/settings.svelte.js' import { searchParam } from '$lib/util.svelte.js' @@ -27,6 +26,7 @@ } from 'svelte-hero-icons' import ModlogItemCard from './item/ModlogItemCard.svelte' import ModlogItemTable from './item/ModlogItemTable.svelte' + import CommunityLink from '$comp/lemmy/community/CommunityLink.svelte' let { data = $bindable() } = $props() diff --git a/src/routes/modlog/+page.ts b/src/routes/modlog/+page.ts index 8bd45208..d69a6416 100644 --- a/src/routes/modlog/+page.ts +++ b/src/routes/modlog/+page.ts @@ -18,7 +18,7 @@ import type { ModlogActionType, Person, } from '$lib/client/types' -import { publishedToDate } from '$lib/components/util/date.js' +import { publishedToDate } from '$comp/util/date.js' export type ActionName = | 'ban' diff --git a/src/routes/modlog/item/ModlogItemCard.svelte b/src/routes/modlog/item/ModlogItemCard.svelte index a6e3992e..8451363b 100644 --- a/src/routes/modlog/item/ModlogItemCard.svelte +++ b/src/routes/modlog/item/ModlogItemCard.svelte @@ -1,11 +1,11 @@ diff --git a/src/routes/profile/(local_user)/password/2fa/+page.svelte b/src/routes/profile/(local_user)/password/2fa/+page.svelte index b12a56eb..f58853c0 100644 --- a/src/routes/profile/(local_user)/password/2fa/+page.svelte +++ b/src/routes/profile/(local_user)/password/2fa/+page.svelte @@ -7,7 +7,7 @@ import { Button, Material, Modal, TextInput, toast } from 'mono-svelte' import { ClipboardDocument, Icon, Key } from 'svelte-hero-icons' import { errorMessage } from '$lib/lemmy/error.js' - import Placeholder from '$lib/components/ui/Placeholder.svelte' + import Placeholder from '$comp/ui/Placeholder.svelte' let { data } = $props() diff --git a/src/routes/profile/(local_user)/password/logins/+page.svelte b/src/routes/profile/(local_user)/password/logins/+page.svelte index 326adc2a..e4b25d47 100644 --- a/src/routes/profile/(local_user)/password/logins/+page.svelte +++ b/src/routes/profile/(local_user)/password/logins/+page.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/profile/voted/[type]/+page.svelte b/src/routes/profile/voted/[type]/+page.svelte index e68e2c1f..b545a875 100644 --- a/src/routes/profile/voted/[type]/+page.svelte +++ b/src/routes/profile/voted/[type]/+page.svelte @@ -1,8 +1,8 @@ diff --git a/src/routes/settings/lemmy/+page.svelte b/src/routes/settings/lemmy/+page.svelte index c52343e4..ab32ad2e 100644 --- a/src/routes/settings/lemmy/+page.svelte +++ b/src/routes/settings/lemmy/+page.svelte @@ -15,7 +15,7 @@ } from 'svelte-hero-icons' import Setting from '../Setting.svelte' import ToggleSetting from '../ToggleSetting.svelte' - import CommonList from '$lib/components/ui/layout/CommonList.svelte' + import CommonList from '$comp/ui/layout/CommonList.svelte' diff --git a/src/routes/settings/moderation/+page.svelte b/src/routes/settings/moderation/+page.svelte index 64622e6b..c7689390 100644 --- a/src/routes/settings/moderation/+page.svelte +++ b/src/routes/settings/moderation/+page.svelte @@ -1,13 +1,13 @@ diff --git a/src/routes/settings/other/+page.svelte b/src/routes/settings/other/+page.svelte index 46ac70a5..9ea747b1 100644 --- a/src/routes/settings/other/+page.svelte +++ b/src/routes/settings/other/+page.svelte @@ -1,5 +1,5 @@ diff --git a/src/routes/u/[name]/+page.svelte b/src/routes/u/[name]/+page.svelte index 14bb94b9..2548b0f1 100644 --- a/src/routes/u/[name]/+page.svelte +++ b/src/routes/u/[name]/+page.svelte @@ -1,15 +1,15 @@