diff --git a/src/routes/inbox/messages/+page.svelte b/src/routes/inbox/messages/+page.svelte index b01c42ca..ce56a5f3 100644 --- a/src/routes/inbox/messages/+page.svelte +++ b/src/routes/inbox/messages/+page.svelte @@ -13,10 +13,17 @@ user: Person message: { date: Date + last_sender: number 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(array: T[], predicate: (item: T) => K): T[] { const seen = new Set() return array.filter(element => { @@ -33,15 +40,23 @@ function conversationPreviews( conversations: PrivateMessageView[], ): ConversationPreview[] { - const deduplicated = filterDuplicates(conversations, i => i.creator.id) + const deduplicated = filterDuplicates(conversations, i => + getOtherPartyId(i), + ) - return deduplicated.map(i => ({ - user: i.creator, - message: { - date: publishedToDate(i.private_message.published), - content: i.private_message.content, - }, - })) + return deduplicated + .filter(c => c.creator.id != c.recipient.id) // you messaged yourself + .map(i => ({ + user: + 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() @@ -56,9 +71,7 @@ {:then data} {@const conversations = data.private_messages} - {@const previews = conversationPreviews(conversations).filter( - c => c.user.id != profile.data?.user?.local_user_view.person.id, - )} + {@const previews = conversationPreviews(conversations)}