feat: add sorts to user pages
This commit is contained in:
1 parent
d427d4b2fc
commit
c0aaf08a9f
12 files changed
+129
-69
No files matched your search
@@ -10,29 +10,12 @@
|
||||
import { authData, getClient, user } from '$lib/lemmy.js'
|
||||
import { goto } from '$app/navigation'
|
||||
import { page } from '$app/stores'
|
||||
import { isRead } from '$lib/lemmy/inbox.js'
|
||||
|
||||
export let data: {
|
||||
data: PersonMentionView[] | CommentReplyView[] | PrivateMessageView[]
|
||||
}
|
||||
|
||||
function isRead(
|
||||
item: PersonMentionView | CommentReplyView | PrivateMessageView
|
||||
) {
|
||||
if ('person_mention' in item) {
|
||||
return (item as PersonMentionView).person_mention.read
|
||||
}
|
||||
|
||||
if ('comment_reply' in item) {
|
||||
return (item as CommentReplyView).comment_reply.read
|
||||
}
|
||||
|
||||
if ('private_message' in item) {
|
||||
return (item as PrivateMessageView).private_message.read
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
let markingAsRead = false
|
||||
|
||||
async function markAllAsRead() {
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
overflow-hidden flex flex-row items-center gap-1 {read ? 'opacity-80' : ''}"
|
||||
>
|
||||
<span class="font-bold">
|
||||
{#if item.creator.id == $user?.person.id}
|
||||
{#if item.creator.id == $user?.local_user_view.person.id}
|
||||
You
|
||||
{:else}
|
||||
<UserLink avatar user={item.creator} />
|
||||
@@ -109,7 +109,7 @@
|
||||
</span>
|
||||
<span>messaged</span>
|
||||
<span class="font-bold">
|
||||
{#if item.recipient.id == $user?.person.id}
|
||||
{#if item.recipient.id == $user?.local_user_view.person.id}
|
||||
You
|
||||
{:else}
|
||||
<UserLink avatar user={item.recipient} />
|
||||
@@ -120,7 +120,7 @@
|
||||
<p class="text-sm py-2">
|
||||
<Markdown source={item.private_message.content} />
|
||||
</p>
|
||||
{#if item.recipient.id == $user?.person.id}
|
||||
{#if item.recipient.id == $user?.local_user_view.person.id}
|
||||
<div class="flex flex-row gap-2">
|
||||
<Button color="ghost" on:click={() => (replying = !replying)}>
|
||||
<Icon mini src={ChatBubbleOvalLeft} width={16} />
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { authData, getClient } from '$lib/lemmy.js'
|
||||
import { getItemPublished } from '$lib/lemmy/item.js'
|
||||
import type {
|
||||
CommentView,
|
||||
CommunityView,
|
||||
@@ -10,26 +11,6 @@ import type {
|
||||
} from 'lemmy-js-client'
|
||||
import { get } from 'svelte/store'
|
||||
|
||||
function getSearchItemPublished(
|
||||
item: PostView | CommentView | PersonView | CommunityView
|
||||
) {
|
||||
if ('comment' in item) {
|
||||
return item.comment.published
|
||||
} else if ('post' in item) {
|
||||
return item.post.published
|
||||
}
|
||||
|
||||
if ('person' in item) {
|
||||
return item.person.published
|
||||
}
|
||||
|
||||
if ('community' in item) {
|
||||
return item.community.published
|
||||
}
|
||||
|
||||
return ''
|
||||
}
|
||||
|
||||
export async function load({ url }) {
|
||||
const query = url.searchParams.get('q')
|
||||
const page = Number(url.searchParams.get('page')) || 1
|
||||
@@ -58,8 +39,7 @@ export async function load({ url }) {
|
||||
|
||||
const everything = [...posts, ...comments, ...users, ...communities].sort(
|
||||
(a, b) =>
|
||||
Date.parse(getSearchItemPublished(b)) -
|
||||
Date.parse(getSearchItemPublished(a))
|
||||
Date.parse(getItemPublished(b)) - Date.parse(getItemPublished(a))
|
||||
)
|
||||
|
||||
return {
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
Calendar,
|
||||
ChatBubbleOvalLeftEllipsis,
|
||||
Icon,
|
||||
NoSymbol,
|
||||
PencilSquare,
|
||||
} from 'svelte-hero-icons'
|
||||
import Button from '$lib/components/input/Button.svelte'
|
||||
@@ -25,6 +26,9 @@
|
||||
import { page } from '$app/stores'
|
||||
import { goto } from '$app/navigation'
|
||||
import { isComment } from '$lib/components/lemmy/post/helpers.js'
|
||||
import { authData, user } from '$lib/lemmy.js'
|
||||
import { isBlocked } from '$lib/lemmy/user.js'
|
||||
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
|
||||
|
||||
export let data
|
||||
</script>
|
||||
@@ -35,7 +39,18 @@
|
||||
|
||||
<div class="flex flex-col-reverse lg:flex-row gap-4 max-w-full w-full">
|
||||
<div class="flex flex-col gap-4 max-w-full w-full">
|
||||
{#each data.items as item}
|
||||
<MultiSelect
|
||||
options={['New', 'TopAll']}
|
||||
optionNames={['New', 'Top']}
|
||||
selected={data.sort}
|
||||
on:select={(e) => {
|
||||
$page.url.searchParams.set('sort', e.detail)
|
||||
goto($page.url.toString(), {
|
||||
invalidateAll: true,
|
||||
})
|
||||
}}
|
||||
/>
|
||||
{#each data.items as item (item.counts.id)}
|
||||
{#if isComment(item) && (data.type == 'all' || data.type == 'comments')}
|
||||
<CommentItem comment={item} />
|
||||
{:else if !isComment(item) && (data.type == 'all' || data.type == 'posts')}
|
||||
@@ -76,6 +91,14 @@
|
||||
<FormattedNumber number={data.person_view.counts.comment_count} />
|
||||
</span>
|
||||
</div>
|
||||
{#if $user && $authData && data.person_view.person.id != $user.local_user_view.person.id}
|
||||
<div class="flex flex-col gap-2">
|
||||
<Button size="lg" color="danger">
|
||||
<Icon slot="icon" mini size="16" src={NoSymbol} />
|
||||
{isBlocked($user, data.person_view.person.id) ? 'Unblock' : 'Block'}
|
||||
</Button>
|
||||
</div>
|
||||
{/if}
|
||||
<div>
|
||||
<h1 class="font-bold text-lg">
|
||||
{data.person_view.person.display_name ?? data.person_view.person.name}
|
||||
|
||||
@@ -1,35 +1,44 @@
|
||||
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 { getItemPublished } from '$lib/lemmy/item.js'
|
||||
import type { CommentView, PostView, SortType } from 'lemmy-js-client'
|
||||
import { get } from 'svelte/store'
|
||||
|
||||
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 sort: SortType = (url.searchParams.get('sort') as SortType) || 'New'
|
||||
|
||||
const user = await getClient().getPersonDetails({
|
||||
limit: 20,
|
||||
page: page,
|
||||
username: params.name,
|
||||
sort: 'New',
|
||||
sort: sort,
|
||||
auth: get(authData)?.token,
|
||||
})
|
||||
|
||||
const items = [...user.posts, ...user.comments]
|
||||
|
||||
if (sort == 'TopAll') {
|
||||
items.sort(
|
||||
(a, b) =>
|
||||
b.counts.upvotes -
|
||||
b.counts.downvotes -
|
||||
(a.counts.upvotes - a.counts.downvotes)
|
||||
)
|
||||
} else if (sort == 'New') {
|
||||
items.sort(
|
||||
(a, b) =>
|
||||
Date.parse(getItemPublished(b)) - Date.parse(getItemPublished(a))
|
||||
)
|
||||
}
|
||||
|
||||
return {
|
||||
type: type,
|
||||
page: page,
|
||||
sort: sort,
|
||||
person_view: user.person_view,
|
||||
items: [...user.posts, ...user.comments].sort(
|
||||
(a, b) => getDateOfItem(b) - getDateOfItem(a)
|
||||
),
|
||||
items,
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user