fix: /inbox/messages: show chats without response (#567)

* fix: inbox list chats without response

* misc: only show username if it's you

---------

Co-authored-by: James Xylight <james@xylight.dev>
This commit is contained in:
sevonjandJames Xylight authored and GitHub committed 2025-06-15 09:57:53 -07:00
1 parent 01a1d44be5
commit e57caa2cab
1 file changed
+28 -12
+28 -12
View File
@@ -13,10 +13,17 @@
user: Person user: Person
message: { message: {
date: Date date: Date
last_sender: number
content: string content: string
} }
} }
function getOtherPartyId(message: PrivateMessageView): number {
return message.creator.id == profile.data.user?.local_user_view.person.id
? message.recipient.id
: message.creator.id
}
function filterDuplicates<T, K>(array: T[], predicate: (item: T) => K): T[] { function filterDuplicates<T, K>(array: T[], predicate: (item: T) => K): T[] {
const seen = new Set() const seen = new Set()
return array.filter(element => { return array.filter(element => {
@@ -33,15 +40,23 @@
function conversationPreviews( function conversationPreviews(
conversations: PrivateMessageView[], conversations: PrivateMessageView[],
): ConversationPreview[] { ): ConversationPreview[] {
const deduplicated = filterDuplicates(conversations, i => i.creator.id) const deduplicated = filterDuplicates(conversations, i =>
getOtherPartyId(i),
)
return deduplicated.map(i => ({ return deduplicated
user: i.creator, .filter(c => c.creator.id != c.recipient.id) // you messaged yourself
message: { .map(i => ({
date: publishedToDate(i.private_message.published), user:
content: i.private_message.content, i.creator.id != profile.data.user?.local_user_view.person.id
}, ? i.creator
})) : i.recipient,
message: {
date: publishedToDate(i.private_message.published),
last_sender: i.creator.id,
content: i.private_message.content,
},
}))
} }
let { data } = $props() let { data } = $props()
@@ -56,9 +71,7 @@
</div> </div>
{:then data} {:then data}
{@const conversations = data.private_messages} {@const conversations = data.private_messages}
{@const previews = conversationPreviews(conversations).filter( {@const previews = conversationPreviews(conversations)}
c => c.user.id != profile.data?.user?.local_user_view.person.id,
)}
<ul <ul
class="flex flex-col divide-y divide-slate-200 dark:divide-zinc-800 w-full mt-6" class="flex flex-col divide-y divide-slate-200 dark:divide-zinc-800 w-full mt-6"
@@ -66,7 +79,7 @@
{#each previews as preview, index (preview)} {#each previews as preview, index (preview)}
<a <a
href="/inbox/messages/{preview.user.id}" href="/inbox/messages/{preview.user.id}"
class="flex flex-row gap-2 py-3 -mx-4 px-4 sm:-mx-6 sm:px-6 w-full min-w-0 class="flex flex-row gap-2 py-3 -mx-4 sm:-mx-6 px-4 sm:px-6 min-w-0
hover:bg-slate-100 dark:hover:bg-zinc-900 transition-colors" hover:bg-slate-100 dark:hover:bg-zinc-900 transition-colors"
in:fly|global={{ in:fly|global={{
duration: 700, duration: 700,
@@ -83,6 +96,9 @@
bg-linear-to-r from-slate-700 via-slate-700 to-slate-700/0 dark:from-zinc-300 dark:via-zinc-300 dark:to-zinc-300/0 bg-linear-to-r from-slate-700 via-slate-700 to-slate-700/0 dark:from-zinc-300 dark:via-zinc-300 dark:to-zinc-300/0
text-transparent bg-clip-text" text-transparent bg-clip-text"
> >
{#if preview.message.last_sender == profile.data.user?.local_user_view.person.id}
{profile.data.user?.local_user_view.person.name}:
{/if}
{preview.message.content} {preview.message.content}
</div> </div>
</div> </div>