diff --git a/src/lib/components/markdown/renderers/MdParagraph.svelte b/src/lib/components/markdown/renderers/MdParagraph.svelte index aaaeac4c..199fa58e 100644 --- a/src/lib/components/markdown/renderers/MdParagraph.svelte +++ b/src/lib/components/markdown/renderers/MdParagraph.svelte @@ -9,7 +9,7 @@ let { children } = $props() -
diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index 68ae6271..b43ae299 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -282,6 +282,10 @@ "reply": "{{user}} replied to you in {{post}}", "mention": "{{user}} mentioned you in {{post}}", "message": "{{user}} messaged {{recipient}}" + }, + "messages": { + "conversation": "This is the beginning of your conversation with {{user}}", + "indicator": "Messaging {{user}}" } }, "moderation": { diff --git a/src/routes/inbox/messages/[user_id=integer]/+page.svelte b/src/routes/inbox/messages/[user_id=integer]/+page.svelte index bff9d798..f1483ed9 100644 --- a/src/routes/inbox/messages/[user_id=integer]/+page.svelte +++ b/src/routes/inbox/messages/[user_id=integer]/+page.svelte @@ -16,15 +16,20 @@ import { onMount, tick } from 'svelte' import { report } from '$lib/components/lemmy/moderation/moderation' import UserLink from '$lib/components/lemmy/user/UserLink.svelte' + import Placeholder from 'mono-svelte/placeholder/Placeholder.svelte' - let { data = $bindable() } = $props() + let { data: pageData } = $props() + let data = $state(pageData) + $effect(() => { + data = pageData + }) let textbox = $state({ message: '', loading: false, }) - let chatWindow: HTMLDivElement = $state() + let chatWindow = $state+ {$t('routes.inbox.messages.conversation', { + // @ts-ignore + user: + data.creator.person_view.person.name + + '@' + + new URL(data.creator.person_view.person.actor_id).hostname, + })} +
{#each data.message.private_messages.toReversed() as private_message, index (private_message.private_message.id)} {/each} @@ -124,7 +143,9 @@ border-slate-200 dark:border-zinc-800 p-2 gap-2 backdrop-blur-xl bg-white/50 dark:bg-zinc-950/50 border rounded-2xl" - onsubmit={preventDefault(async () => { + onsubmit={async (e) => { + e.preventDefault() + const res = await sendMessage(textbox.message) if (!res) return @@ -136,7 +157,7 @@ } textbox.message = '' - })} + }} >