revert: re-merge page.ts posts/comments in user pages
This commit is contained in:
2 files changed
+20
-5
No files matched your search
@@ -325,6 +325,7 @@
|
|||||||
{$t('filter.type')}
|
{$t('filter.type')}
|
||||||
</span>
|
</span>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
|
<Option value="all">{$t('content.all')}</Option>
|
||||||
<Option value="posts">{$t('content.posts')}</Option>
|
<Option value="posts">{$t('content.posts')}</Option>
|
||||||
<Option value="comments">{$t('content.comments')}</Option>
|
<Option value="comments">{$t('content.comments')}</Option>
|
||||||
</Select>
|
</Select>
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
import { getClient } from '$lib/lemmy.svelte.js'
|
import { getClient } from '$lib/lemmy.svelte.js'
|
||||||
|
import { getItemPublished } from '$lib/lemmy/item.js'
|
||||||
import { ReactiveState } from '$lib/promise.svelte.js'
|
import { ReactiveState } from '$lib/promise.svelte.js'
|
||||||
import type { CommentView, PostView, SortType } from 'lemmy-js-client'
|
import type { SortType } from 'lemmy-js-client'
|
||||||
|
|
||||||
export async function load({ params, url, fetch }) {
|
export async function load({ params, url, fetch }) {
|
||||||
const page = Number(url.searchParams.get('page')) || 1
|
const page = Number(url.searchParams.get('page')) || 1
|
||||||
const type: 'comments' | 'posts' =
|
const type: 'comments' | 'posts' | 'all' =
|
||||||
(url.searchParams.get('type') as 'comments' | 'posts') || 'posts'
|
(url.searchParams.get('type') as 'comments' | 'posts' | 'all') || 'all'
|
||||||
const sort: SortType = (url.searchParams.get('sort') as SortType) || 'New'
|
const sort: SortType = (url.searchParams.get('sort') as SortType) || 'New'
|
||||||
|
|
||||||
const user = await getClient(undefined, fetch).getPersonDetails({
|
const user = await getClient(undefined, fetch).getPersonDetails({
|
||||||
@@ -15,8 +16,21 @@ export async function load({ params, url, fetch }) {
|
|||||||
sort: sort,
|
sort: sort,
|
||||||
})
|
})
|
||||||
|
|
||||||
const items: (PostView | CommentView)[] =
|
const items = [...user.posts, ...user.comments]
|
||||||
type == 'posts' ? 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 {
|
return {
|
||||||
filters: new ReactiveState({
|
filters: new ReactiveState({
|
||||||
|
|||||||
Reference in new issue
Block a user