From c0aaf08a9f0ec248320e64c017f0f03253f3dd50 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Thu, 27 Jul 2023 12:25:26 -0700 Subject: [PATCH] feat: add sorts to user pages --- .../lemmy/comment/CommentActions.svelte | 6 ++-- .../components/lemmy/post/PostActions.svelte | 6 ++-- src/lib/components/ui/Navbar.svelte | 9 +++-- src/lib/lemmy.ts | 6 ++-- src/lib/lemmy/inbox.ts | 18 ++++++++++ src/lib/lemmy/item.ts | 26 ++++++++++++++ src/lib/lemmy/user.ts | 18 ++++++++++ src/routes/inbox/+page.svelte | 19 +--------- src/routes/inbox/InboxItem.svelte | 6 ++-- src/routes/search/+page.ts | 24 ++----------- src/routes/u/[name]/+page.svelte | 25 ++++++++++++- src/routes/u/[name]/+page.ts | 35 ++++++++++++------- 12 files changed, 129 insertions(+), 69 deletions(-) create mode 100644 src/lib/lemmy/item.ts create mode 100644 src/lib/lemmy/user.ts diff --git a/src/lib/components/lemmy/comment/CommentActions.svelte b/src/lib/components/lemmy/comment/CommentActions.svelte index 399822be..9d1e7219 100644 --- a/src/lib/components/lemmy/comment/CommentActions.svelte +++ b/src/lib/components/lemmy/comment/CommentActions.svelte @@ -79,7 +79,7 @@ Comment actions {#if $authData?.token} - {#if comment.creator.id == $user?.person.id} + {#if comment.creator.id == $user?.local_user_view.person.id} dispatcher('edit', comment)}> Edit @@ -89,7 +89,7 @@ {comment.saved ? 'Unsave' : 'Save'} - {#if $user && $authData && isCommentMutable(comment, $user)} + {#if $user && $authData && isCommentMutable(comment, $user.local_user_view)} { @@ -116,7 +116,7 @@ Delete {/if} - {#if $authData && $user?.person.id != comment.creator.id} + {#if $authData && $user?.local_user_view.person.id != comment.creator.id} report(comment)} color={Color.dangerSecondary} diff --git a/src/lib/components/lemmy/post/PostActions.svelte b/src/lib/components/lemmy/post/PostActions.svelte index a8b9f259..cfe3482b 100644 --- a/src/lib/components/lemmy/post/PostActions.svelte +++ b/src/lib/components/lemmy/post/PostActions.svelte @@ -126,7 +126,7 @@
  • Actions
  • - {#if $user && $user.person.id == post.creator.id} + {#if $user && $user.local_user_view.person.id == post.creator.id} (editing = true)}> Edit @@ -147,13 +147,13 @@ {post.saved ? 'Unsave' : 'Save'} - {#if $user && isMutable(post, $user)} + {#if $user && isMutable(post, $user.local_user_view)} Delete {/if} - {#if $user?.person.id != post.creator.id} + {#if $user?.local_user_view.person.id != post.creator.id} report(post)} color={Color.dangerSecondary}> Report diff --git a/src/lib/components/ui/Navbar.svelte b/src/lib/components/ui/Navbar.svelte index c9c29aa8..1a1faf14 100644 --- a/src/lib/components/ui/Navbar.svelte +++ b/src/lib/components/ui/Navbar.svelte @@ -100,7 +100,7 @@ {/if} {#if $user}
  • - {$user ? $user.person.name : 'Profile'} + {$user ? $user.local_user_view.person.name : 'Profile'}
  • {#if $user && $authData} - + Profile diff --git a/src/lib/lemmy.ts b/src/lib/lemmy.ts index b69ae42e..417bb253 100644 --- a/src/lib/lemmy.ts +++ b/src/lib/lemmy.ts @@ -1,4 +1,4 @@ -import { LemmyHttp, type PersonView } from 'lemmy-js-client' +import { LemmyHttp, type MyUserInfo, type PersonView } from 'lemmy-js-client' import { get, writable } from 'svelte/store' import { ToastType, toast } from '$lib/components/ui/toasts/toasts.js' import { userSettings } from '$lib/settings.js' @@ -42,7 +42,7 @@ export interface UserData { } export const authData = writable() -export const user = writable<(PersonView & UserData) | undefined | null>( +export const user = writable<(MyUserInfo & UserData) | undefined | null>( undefined ) @@ -86,7 +86,7 @@ authData.subscribe(async (data) => { user.set(null) throw Error('Missing user') } - user.set({ ...site.my_user.local_user_view, unreads: 0 }) + user.set({ ...site.my_user, unreads: 0 }) if (typeof localStorage != 'undefined') { localStorage.setItem('user', JSON.stringify(data)) } diff --git a/src/lib/lemmy/inbox.ts b/src/lib/lemmy/inbox.ts index a1a73310..882d9834 100644 --- a/src/lib/lemmy/inbox.ts +++ b/src/lib/lemmy/inbox.ts @@ -20,3 +20,21 @@ export function getInboxItemPublished(item: InboxItemView): string { return item.person_mention.published } + +export 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 +} diff --git a/src/lib/lemmy/item.ts b/src/lib/lemmy/item.ts new file mode 100644 index 00000000..a2e8e43e --- /dev/null +++ b/src/lib/lemmy/item.ts @@ -0,0 +1,26 @@ +import type { + CommentView, + CommunityView, + PersonView, + PostView, +} from 'lemmy-js-client' + +export function getItemPublished( + 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 '' +} diff --git a/src/lib/lemmy/user.ts b/src/lib/lemmy/user.ts new file mode 100644 index 00000000..35f9a773 --- /dev/null +++ b/src/lib/lemmy/user.ts @@ -0,0 +1,18 @@ +import { authData, getClient } from '$lib/lemmy.js' +import type { MyUserInfo, PersonView } from 'lemmy-js-client' +import { get } from 'svelte/store' + +export const blockUser = async (block: boolean, id: number) => { + const auth = get(authData)?.token + + if (!auth) throw new Error('Unauthorized') + + const response = await getClient().blockPerson({ + auth: auth, + block: block, + person_id: id, + }) +} + +export const isBlocked = (me: MyUserInfo, user: number) => + me.person_blocks.map((b) => b.target.id).includes(user) diff --git a/src/routes/inbox/+page.svelte b/src/routes/inbox/+page.svelte index fbc4c0f3..fccc33be 100644 --- a/src/routes/inbox/+page.svelte +++ b/src/routes/inbox/+page.svelte @@ -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() { diff --git a/src/routes/inbox/InboxItem.svelte b/src/routes/inbox/InboxItem.svelte index 483f1674..33d828df 100644 --- a/src/routes/inbox/InboxItem.svelte +++ b/src/routes/inbox/InboxItem.svelte @@ -101,7 +101,7 @@ overflow-hidden flex flex-row items-center gap-1 {read ? 'opacity-80' : ''}" > - {#if item.creator.id == $user?.person.id} + {#if item.creator.id == $user?.local_user_view.person.id} You {:else} @@ -109,7 +109,7 @@ messaged - {#if item.recipient.id == $user?.person.id} + {#if item.recipient.id == $user?.local_user_view.person.id} You {:else} @@ -120,7 +120,7 @@

    - {#if item.recipient.id == $user?.person.id} + {#if item.recipient.id == $user?.local_user_view.person.id}
    +
    + {/if}

    {data.person_view.person.display_name ?? data.person_view.person.name} diff --git a/src/routes/u/[name]/+page.ts b/src/routes/u/[name]/+page.ts index f344fbec..94b3b87f 100644 --- a/src/routes/u/[name]/+page.ts +++ b/src/routes/u/[name]/+page.ts @@ -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, } }