1 parent
56ac2631b5
commit
04a9b37c6f
3 files changed
+93
-30
No files matched your search
@@ -100,10 +100,13 @@ interface Settings {
|
|||||||
logoColorMonth: number | null
|
logoColorMonth: number | null
|
||||||
|
|
||||||
absoluteDates: boolean
|
absoluteDates: boolean
|
||||||
|
messages: {
|
||||||
|
fullMarkdown: boolean
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const defaultSettings: Settings = {
|
export const defaultSettings: Settings = {
|
||||||
settingsVer: 5,
|
settingsVer: 6,
|
||||||
expandableImages: toBool(env.PUBLIC_EXPANDABLE_IMAGES) ?? true,
|
expandableImages: toBool(env.PUBLIC_EXPANDABLE_IMAGES) ?? true,
|
||||||
markReadPosts: toBool(env.PUBLIC_MARK_READ_POSTS) ?? true,
|
markReadPosts: toBool(env.PUBLIC_MARK_READ_POSTS) ?? true,
|
||||||
showInstances: {
|
showInstances: {
|
||||||
@@ -176,6 +179,9 @@ export const defaultSettings: Settings = {
|
|||||||
parseTags: true,
|
parseTags: true,
|
||||||
logoColorMonth: null,
|
logoColorMonth: null,
|
||||||
absoluteDates: false,
|
absoluteDates: false,
|
||||||
|
messages: {
|
||||||
|
fullMarkdown: toBool(env.PUBLIC_FULL_MARKDOWN) ?? false,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
function createSettingsState(initial: Settings): Settings {
|
function createSettingsState(initial: Settings): Settings {
|
||||||
|
|||||||
@@ -2,14 +2,22 @@
|
|||||||
import { browser } from '$app/environment'
|
import { browser } from '$app/environment'
|
||||||
import { report } from '$lib/components/lemmy/moderation/moderation'
|
import { report } from '$lib/components/lemmy/moderation/moderation'
|
||||||
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
|
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 Header from '$lib/components/ui/layout/pages/Header.svelte'
|
||||||
import { t } from '$lib/i18n/translations'
|
import { t } from '$lib/i18n/translations'
|
||||||
import { client } from '$lib/lemmy.svelte'
|
import { client } from '$lib/lemmy.svelte'
|
||||||
import { errorMessage } from '$lib/lemmy/error'
|
import { errorMessage } from '$lib/lemmy/error'
|
||||||
|
import { settings } from '$lib/settings.svelte'
|
||||||
import type { PrivateMessageResponse } from 'lemmy-js-client'
|
import type { PrivateMessageResponse } from 'lemmy-js-client'
|
||||||
import { Button, Material, TextInput, toast } from 'mono-svelte'
|
import { Button, Material, TextInput, toast } from 'mono-svelte'
|
||||||
import { tick } from '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 { flip } from 'svelte/animate'
|
||||||
import { backOut, expoOut } from 'svelte/easing'
|
import { backOut, expoOut } from 'svelte/easing'
|
||||||
import { fly } from 'svelte/transition'
|
import { fly } from 'svelte/transition'
|
||||||
@@ -110,6 +118,13 @@
|
|||||||
})}
|
})}
|
||||||
</p>
|
</p>
|
||||||
{#each data.message.value.private_messages.toReversed() as private_message, index (private_message.private_message.id)}
|
{#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}
|
||||||
|
|
||||||
<div
|
<div
|
||||||
class={private_message.creator.id ==
|
class={private_message.creator.id ==
|
||||||
data.creator.value.person_view.person.id
|
data.creator.value.person_view.person.id
|
||||||
@@ -129,6 +144,7 @@
|
|||||||
message={private_message}
|
message={private_message}
|
||||||
primary={private_message.creator.id !=
|
primary={private_message.creator.id !=
|
||||||
data.creator.value.person_view.person.id}
|
data.creator.value.person_view.person.id}
|
||||||
|
{showTimestamp}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{/each}
|
{/each}
|
||||||
@@ -138,10 +154,15 @@
|
|||||||
{#await data.message.value then message}
|
{#await data.message.value then message}
|
||||||
<div class="sticky bottom-4 p-4">
|
<div class="sticky bottom-4 p-4">
|
||||||
<form
|
<form
|
||||||
class="flex flex-row h-14 items-center w-full
|
class={[
|
||||||
border-slate-200 dark:border-zinc-800
|
'flex w-full',
|
||||||
p-2 gap-2 backdrop-blur-xl
|
'border-slate-200 dark:border-zinc-800',
|
||||||
bg-white/50 dark:bg-zinc-950/50 border rounded-2xl"
|
'p-2 gap-2 backdrop-blur-xl',
|
||||||
|
'bg-white/50 dark:bg-zinc-950/50 border rounded-2xl',
|
||||||
|
settings.messages.fullMarkdown
|
||||||
|
? 'flex flex-col'
|
||||||
|
: 'flex-row h-14 items-center',
|
||||||
|
]}
|
||||||
onsubmit={async e => {
|
onsubmit={async e => {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
|
|
||||||
@@ -158,25 +179,53 @@
|
|||||||
textbox.message = ''
|
textbox.message = ''
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<TextInput
|
{#if settings.messages.fullMarkdown}
|
||||||
bind:value={textbox.message}
|
<MarkdownEditor
|
||||||
class="rounded-xl! h-full flex-1 dark:bg-zinc-925!"
|
previewButton={false}
|
||||||
/>
|
bind:value={textbox.message}
|
||||||
|
class="flex-1"
|
||||||
|
></MarkdownEditor>
|
||||||
|
{:else}
|
||||||
|
<Button
|
||||||
|
onclick={() => (settings.messages.fullMarkdown = true)}
|
||||||
|
size="custom"
|
||||||
|
class="h-9 w-9"
|
||||||
|
rounding="xl"
|
||||||
|
>
|
||||||
|
<Icon src={Plus} mini size="18" />
|
||||||
|
</Button>
|
||||||
|
<TextInput
|
||||||
|
bind:value={textbox.message}
|
||||||
|
class="rounded-xl! h-full flex-1 dark:bg-zinc-925!"
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<Button
|
<div class="flex flex-row gap-2">
|
||||||
title={$t('common.send')}
|
{#if settings.messages.fullMarkdown}
|
||||||
size="custom"
|
<Button
|
||||||
rounding="xl"
|
onclick={() => (settings.messages.fullMarkdown = false)}
|
||||||
class="aspect-square h-9"
|
size="custom"
|
||||||
color="primary"
|
class="h-9 w-9"
|
||||||
submit
|
rounding="xl"
|
||||||
loading={textbox.loading}
|
>
|
||||||
disabled={textbox.loading}
|
<Icon src={Minus} mini size="18" />
|
||||||
>
|
</Button>
|
||||||
{#snippet prefix()}
|
{/if}
|
||||||
<Icon src={PaperAirplane} size="18" micro />
|
<Button
|
||||||
{/snippet}
|
title={$t('common.send')}
|
||||||
</Button>
|
size="custom"
|
||||||
|
rounding="xl"
|
||||||
|
class="aspect-square h-9 flex-1"
|
||||||
|
color="primary"
|
||||||
|
submit
|
||||||
|
loading={textbox.loading}
|
||||||
|
disabled={textbox.loading}
|
||||||
|
>
|
||||||
|
{#snippet prefix()}
|
||||||
|
<Icon src={PaperAirplane} size="18" micro />
|
||||||
|
{/snippet}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
{/await}
|
{/await}
|
||||||
|
|||||||
@@ -12,9 +12,16 @@
|
|||||||
primary?: boolean
|
primary?: boolean
|
||||||
ondelete?: (shouldDelete: boolean) => void
|
ondelete?: (shouldDelete: boolean) => void
|
||||||
onreport?: (report: 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()
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@@ -36,11 +43,12 @@
|
|||||||
class="w-full"
|
class="w-full"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
{#if showTimestamp}
|
||||||
<RelativeDate
|
<RelativeDate
|
||||||
class="text-xs block -mt-0.5 ml-1 text-slate-600 dark:text-zinc-400"
|
class="text-xs block -mt-0.5 ml-1 text-slate-600 dark:text-zinc-400"
|
||||||
date={publishedToDate(message.private_message.published)}
|
date={publishedToDate(message.private_message.published)}
|
||||||
/>
|
/>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
<Menu>
|
<Menu>
|
||||||
{#snippet target()}
|
{#snippet target()}
|
||||||
|
|||||||
Reference in new issue
Block a user