diff --git a/src/lib/components/lemmy/post/helpers.ts b/src/lib/components/lemmy/post/helpers.ts
index cf7bea88..76c33292 100644
--- a/src/lib/components/lemmy/post/helpers.ts
+++ b/src/lib/components/lemmy/post/helpers.ts
@@ -6,3 +6,6 @@ export const isMutable = (post: PostView, me: PersonView) =>
export const isCommentMutable = (comment: CommentView, me: PersonView) =>
(me.person.admin && comment.comment.local) ||
me.person.id == comment.creator.id
+
+export const isComment = (item: CommentView | PostView): item is CommentView =>
+ 'comment' in item
diff --git a/src/routes/u/[name]/+page.svelte b/src/routes/u/[name]/+page.svelte
index e2667385..6be2bd54 100644
--- a/src/routes/u/[name]/+page.svelte
+++ b/src/routes/u/[name]/+page.svelte
@@ -21,83 +21,74 @@
} from 'svelte-hero-icons'
import Button from '$lib/components/input/Button.svelte'
import CommentItem from '$lib/components/lemmy/comment/CommentItem.svelte'
+ import Pageination from '$lib/components/ui/Pageination.svelte'
+ import { page } from '$app/stores'
+ import { goto } from '$app/navigation'
+ import { isComment } from '$lib/components/lemmy/post/helpers.js'
- export let data: {
- user: GetPersonDetailsResponse
- }
-
- const isComment = (item: CommentView | PostView): item is CommentView =>
- 'comment' in item
-
- function getDateOfItem(item: CommentView | PostView): number {
- if (isComment(item)) {
- return Date.parse(item.comment.published)
- } else {
- return Date.parse(item.post.published)
- }
- }
-
- const items = [...data.user.comments, ...data.user.posts].sort(
- (a, b) => getDateOfItem(b) - getDateOfItem(a)
- )
+ export let data
- {data.user.person_view.person.name}
+ {data.person_view.person.name}
- {#each items as item}
- {#if isComment(item)}
+ {#each data.items as item}
+ {#if isComment(item) && (data.type == 'all' || data.type == 'comments')}
- {:else}
+ {:else if !isComment(item) && (data.type == 'all' || data.type == 'posts')}
{/if}
{/each}
+
{
+ $page.url.searchParams.set('page', p.detail.toString())
+ goto($page.url.toString(), {
+ invalidateAll: true,
+ })
+ }}
+ />
-
+
-
+
-
+
- {data.user.person_view.person.display_name ??
- data.user.person_view.person.name}
+ {data.person_view.person.display_name ?? data.person_view.person.name}
- {#if data.user.person_view.person.display_name}
- {data.user.person_view.person.name}@
+ {#if data.person_view.person.display_name}
+ {data.person_view.person.name}@
{/if}
- {new URL(data.user.person_view.person.actor_id).hostname}
+ {new URL(data.person_view.person.actor_id).hostname}
- {#if data.user.person_view.person.bio}
-
+ {#if data.person_view.person.bio}
+
{/if}
diff --git a/src/routes/u/[name]/+page.ts b/src/routes/u/[name]/+page.ts
index db6371b3..f344fbec 100644
--- a/src/routes/u/[name]/+page.ts
+++ b/src/routes/u/[name]/+page.ts
@@ -1,14 +1,35 @@
+import { isComment } from '$lib/components/lemmy/post/helpers.js'
import { authData, getClient } from '$lib/lemmy.js'
+import type { CommentView, PostView } from 'lemmy-js-client'
import { get } from 'svelte/store'
-export async function load({ params }) {
+function getDateOfItem(item: CommentView | PostView): number {
+ if (isComment(item)) {
+ return Date.parse(item.comment.published)
+ } else {
+ return Date.parse(item.post.published)
+ }
+}
+
+export async function load({ params, url }) {
+ const page = Number(url.searchParams.get('page')) || 1
+ const type: 'comments' | 'posts' | 'all' =
+ (url.searchParams.get('type') as 'comments' | 'posts' | 'all') || 'all'
+
+ const user = await getClient().getPersonDetails({
+ limit: 20,
+ page: page,
+ username: params.name,
+ sort: 'New',
+ auth: get(authData)?.token,
+ })
+
return {
- user: await getClient().getPersonDetails({
- limit: 40,
- page: 1,
- username: params.name,
- sort: 'New',
- auth: get(authData)?.token,
- }),
+ type: type,
+ page: page,
+ person_view: user.person_view,
+ items: [...user.posts, ...user.comments].sort(
+ (a, b) => getDateOfItem(b) - getDateOfItem(a)
+ ),
}
}