From 04a9b37c6f232d4e2fffccb3cacdf9144fbd6f8d Mon Sep 17 00:00:00 2001 From: Xylight <80978739+Xyphyn@users.noreply.github.com> Date: Fri, 20 Jun 2025 15:28:20 -0700 Subject: [PATCH] feat: add a full markdown editor to messages page, close #578 (#592) --- src/lib/settings.svelte.ts | 8 +- .../messages/[user_id=integer]/+page.svelte | 95 ++++++++++++++----- .../messages/[user_id=integer]/Message.svelte | 20 ++-- 3 files changed, 93 insertions(+), 30 deletions(-) diff --git a/src/lib/settings.svelte.ts b/src/lib/settings.svelte.ts index 81ca372a..fb29422e 100644 --- a/src/lib/settings.svelte.ts +++ b/src/lib/settings.svelte.ts @@ -100,10 +100,13 @@ interface Settings { logoColorMonth: number | null absoluteDates: boolean + messages: { + fullMarkdown: boolean + } } export const defaultSettings: Settings = { - settingsVer: 5, + settingsVer: 6, expandableImages: toBool(env.PUBLIC_EXPANDABLE_IMAGES) ?? true, markReadPosts: toBool(env.PUBLIC_MARK_READ_POSTS) ?? true, showInstances: { @@ -176,6 +179,9 @@ export const defaultSettings: Settings = { parseTags: true, logoColorMonth: null, absoluteDates: false, + messages: { + fullMarkdown: toBool(env.PUBLIC_FULL_MARKDOWN) ?? false, + }, } function createSettingsState(initial: Settings): Settings { diff --git a/src/routes/inbox/messages/[user_id=integer]/+page.svelte b/src/routes/inbox/messages/[user_id=integer]/+page.svelte index be834627..c86fd05e 100644 --- a/src/routes/inbox/messages/[user_id=integer]/+page.svelte +++ b/src/routes/inbox/messages/[user_id=integer]/+page.svelte @@ -2,14 +2,22 @@ import { browser } from '$app/environment' import { report } from '$lib/components/lemmy/moderation/moderation' import UserLink from '$lib/components/lemmy/user/UserLink.svelte' + import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte' import Header from '$lib/components/ui/layout/pages/Header.svelte' import { t } from '$lib/i18n/translations' import { client } from '$lib/lemmy.svelte' import { errorMessage } from '$lib/lemmy/error' + import { settings } from '$lib/settings.svelte' import type { PrivateMessageResponse } from 'lemmy-js-client' import { Button, Material, TextInput, toast } from 'mono-svelte' import { tick } from 'svelte' - import { ArrowLeft, Icon, PaperAirplane } from 'svelte-hero-icons' + import { + ArrowLeft, + Icon, + Minus, + PaperAirplane, + Plus, + } from 'svelte-hero-icons' import { flip } from 'svelte/animate' import { backOut, expoOut } from 'svelte/easing' import { fly } from 'svelte/transition' @@ -110,6 +118,13 @@ })}

{#each data.message.value.private_messages.toReversed() as private_message, index (private_message.private_message.id)} + {@const messages = data.message.value.private_messages.toReversed()} + {@const showTimestamp = + index == 0 || + new Date(private_message.private_message.published).getTime() - + new Date(messages[index - 1].private_message.published).getTime() > + 5 * 60 * 1000} +
{/each} @@ -138,10 +154,15 @@ {#await data.message.value then message}
{ e.preventDefault() @@ -158,25 +179,53 @@ textbox.message = '' }} > - + {#if settings.messages.fullMarkdown} + + {:else} + + + {/if} - +
+ {#if settings.messages.fullMarkdown} + + {/if} + +
{/await} diff --git a/src/routes/inbox/messages/[user_id=integer]/Message.svelte b/src/routes/inbox/messages/[user_id=integer]/Message.svelte index 8c2106fb..acb600c3 100644 --- a/src/routes/inbox/messages/[user_id=integer]/Message.svelte +++ b/src/routes/inbox/messages/[user_id=integer]/Message.svelte @@ -12,9 +12,16 @@ primary?: boolean ondelete?: (shouldDelete: boolean) => void onreport?: (report: boolean) => void + showTimestamp?: boolean } - let { message, primary = false, ondelete, onreport }: Props = $props() + let { + message, + primary = false, + ondelete, + onreport, + showTimestamp = true, + }: Props = $props()
- - + {#if showTimestamp} + + {/if} {#snippet target()}