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() -

+

{@render children?.()}

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() async function sendMessage( message: string, @@ -36,7 +41,7 @@ try { const res = await client().createPrivateMessage({ content: message, - recipient_id: data.creator, + recipient_id: data.creator.person_view.person.id, }) textbox.loading = false @@ -52,10 +57,10 @@ textbox.loading = false } - run(() => { + $effect(() => { if (browser && data.message && chatWindow) { tick().then(() => - chatWindow.scrollTo({ + chatWindow?.scrollTo({ top: chatWindow.scrollHeight, behavior: 'smooth', }), @@ -82,6 +87,9 @@
{$t('filter.inbox.messages')} + {#snippet extended()} + + {/snippet}
-
    +
      +

      + {$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)}
      deleteMessage(private_message.private_message.id)} - on:report={() => report(private_message)} + ondelete={() => deleteMessage(private_message.private_message.id)} + onreport={() => report(private_message)} message={private_message} - primary={private_message.creator.id != data.creator} + primary={private_message.creator.id != + data.creator.person_view.person.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 = '' - })} + }} > import Markdown from '$lib/components/markdown/Markdown.svelte' - import { client } from '$lib/lemmy' import { t } from '$lib/translations' import type { PrivateMessageView } from 'lemmy-js-client' import { Button, Menu, MenuButton, MenuDivider, Popover } from 'mono-svelte' - import { createEventDispatcher } from 'svelte' import { EllipsisVertical, Flag, Icon, Trash } from 'svelte-hero-icons' interface Props { message: PrivateMessageView primary?: boolean + ondelete?: (shouldDelete: boolean) => void + onreport?: (report: boolean) => void } - let { message, primary = false }: Props = $props() - - const dispatch = createEventDispatcher<{ delete: boolean; report: boolean }>() + let { message, primary = false, ondelete, onreport }: Props = $props()
      - +
      {#snippet target()} @@ -45,20 +43,14 @@ {/snippet} {$t('post.actions.more.actions')} {#if primary} - dispatch('delete', true)} - > + ondelete?.(true)}> {#snippet prefix()} {/snippet} {$t('post.actions.more.delete')} {:else} - dispatch('report', true)} - > + onreport?.(true)}> {#snippet prefix()} {/snippet}