From e8fff535ca07ab9d7bc8d4ab5318f48fa94d206c Mon Sep 17 00:00:00 2001 From: Xylight Date: Thu, 27 Nov 2025 21:57:42 -0800 Subject: [PATCH] fix: improve messages with proper diffing and pageination, fix -1 inbox --- src/lib/ui/sidebar/Sidebar.svelte | 2 +- src/routes/inbox/+page.svelte | 7 +- src/routes/inbox/+page.ts | 8 ++- src/routes/inbox/InboxItem.svelte | 31 ++++++++- .../messages/[user_id=integer]/+page.svelte | 67 ++++++++++++++++--- .../inbox/messages/[user_id=integer]/+page.ts | 4 +- 6 files changed, 96 insertions(+), 23 deletions(-) diff --git a/src/lib/ui/sidebar/Sidebar.svelte b/src/lib/ui/sidebar/Sidebar.svelte index e2659f77..101acf68 100644 --- a/src/lib/ui/sidebar/Sidebar.svelte +++ b/src/lib/ui/sidebar/Sidebar.svelte @@ -59,7 +59,7 @@ label={$t('profile.profile')} /> - {#if notifications.inbox} + {#if notifications.inbox > 0} {#each data.inbox.value as item} -
  • +
  • {/each} diff --git a/src/routes/inbox/+page.ts b/src/routes/inbox/+page.ts index a1916f08..72133434 100644 --- a/src/routes/inbox/+page.ts +++ b/src/routes/inbox/+page.ts @@ -52,7 +52,13 @@ export async function load({ url, fetch }) { const data = [ ...replies.replies.map(generalizeCommentReply), ...mentions.mentions.map(generalizePersonMention), - ...privateMessages.private_messages.map(generalizePrivateMessage), + ...privateMessages.private_messages + .filter( + (i) => + i.private_message.creator_id != + profile.current.user?.local_user_view.person.id, + ) + .map(generalizePrivateMessage), ].sort( (a, b) => publishedToDate(b.published).getTime() - diff --git a/src/routes/inbox/InboxItem.svelte b/src/routes/inbox/InboxItem.svelte index f5d34b7b..cb2db19b 100644 --- a/src/routes/inbox/InboxItem.svelte +++ b/src/routes/inbox/InboxItem.svelte @@ -9,9 +9,16 @@ import PrivateMessage from '$lib/feature/inbox/PrivateMessage.svelte' import Avatar from '$lib/ui/generic/Avatar.svelte' import { publishedToDate } from '$lib/ui/util/date' - import { Button, ButtonGroup, Expandable } from 'mono-svelte' + import { Button, ButtonGroup, Expandable, Material } from 'mono-svelte' import RelativeDate from 'mono-svelte/util/RelativeDate.svelte' - import { Eye, EyeSlash } from 'svelte-hero-icons/dist' + import { + AtSymbol, + ChatBubbleOvalLeftEllipsis, + Eye, + EyeSlash, + Icon, + PaperAirplane, + } from 'svelte-hero-icons/dist' interface Props { item: InboxItem @@ -92,7 +99,25 @@ {#snippet title()}
    - +
    + + + + +
    {#if item.type == 'comment_reply'} diff --git a/src/routes/inbox/messages/[user_id=integer]/+page.svelte b/src/routes/inbox/messages/[user_id=integer]/+page.svelte index 5bf7184a..c519e3de 100644 --- a/src/routes/inbox/messages/[user_id=integer]/+page.svelte +++ b/src/routes/inbox/messages/[user_id=integer]/+page.svelte @@ -10,10 +10,12 @@ import { report } from '$lib/feature/moderation/moderation' import UserLink from '$lib/feature/user/UserLink.svelte' import { Header } from '$lib/ui/layout' + import { publishedToDate } from '$lib/ui/util/date' import { Button, Material, TextInput, toast } from 'mono-svelte' import { onDestroy, onMount, tick } from 'svelte' import { ArrowLeft, + ChevronUp, Icon, Minus, PaperAirplane, @@ -87,8 +89,33 @@ } let interval: number = -1 + let page: number = 1 - onMount(() => { + async function loadMore(page: number = 1) { + const res = await client().getPrivateMessages({ + creator_id: Number(data.creator.value.person_view.person.id), + limit: 50, + page: page, + }) + + const messageSet = new Set( + data.message!.value.private_messages.map((i) => i.private_message.id), + ) + const newMessages = res.private_messages.filter( + (i) => !messageSet.has(i.private_message.id), + ) + + data.message.value.private_messages.push(...newMessages) + data.message.value.private_messages.sort( + (a, b) => + publishedToDate(b.private_message.published).getTime() - + publishedToDate(a.private_message.published).getTime(), + ) + + markRead() + } + + async function markRead() { data.message.value.private_messages .filter( (i) => @@ -102,15 +129,11 @@ read: true, }), ) + } - interval = setInterval(async () => { - const res = await client().getPrivateMessages({ - creator_id: Number(data.creator.value.person_view.person.id), - limit: 50, - page: 1, - }) - data.message.value = res - }, 15 * 1000) as unknown as number + onMount(() => { + markRead() + interval = setInterval(loadMore, 10 * 1000) as unknown as number return () => clearInterval(interval) }) @@ -120,6 +143,14 @@ }) + + + {$t('routes.inbox.messages.indicator', { + user: data.creator.value.person_view.person.name, + })} + + +
    {$t('filter.inbox.messages')} {#snippet extended()} @@ -134,6 +165,7 @@
    {/snippet} +
    -
      +

        {$t('routes.inbox.messages.conversation', { @@ -151,6 +183,16 @@ new URL(data.creator.value.person_view.person.actor_id).hostname, })}

        + {#if data.message.value.private_messages.length % data.limit == 0} +