misc: add some new data to message inboxes
This commit is contained in:
1 parent
fef0df76ce
commit
d39aa9d4d2
5 files changed
+60
-32
No files matched your search
@@ -9,7 +9,7 @@
|
|||||||
let { children } = $props()
|
let { children } = $props()
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<p class="leading-[1.5] {options.inline ? '' : 'max-w'}">
|
<p class="leading-[1.5] break-words {options.inline ? '' : 'max-w'}">
|
||||||
{@render children?.()}
|
{@render children?.()}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|||||||
@@ -282,6 +282,10 @@
|
|||||||
"reply": "{{user}} replied to you in {{post}}",
|
"reply": "{{user}} replied to you in {{post}}",
|
||||||
"mention": "{{user}} mentioned you in {{post}}",
|
"mention": "{{user}} mentioned you in {{post}}",
|
||||||
"message": "{{user}} messaged {{recipient}}"
|
"message": "{{user}} messaged {{recipient}}"
|
||||||
|
},
|
||||||
|
"messages": {
|
||||||
|
"conversation": "This is the beginning of your conversation with {{user}}",
|
||||||
|
"indicator": "Messaging {{user}}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"moderation": {
|
"moderation": {
|
||||||
|
|||||||
@@ -16,15 +16,20 @@
|
|||||||
import { onMount, tick } from 'svelte'
|
import { onMount, tick } from 'svelte'
|
||||||
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 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({
|
let textbox = $state({
|
||||||
message: '',
|
message: '',
|
||||||
loading: false,
|
loading: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
let chatWindow: HTMLDivElement = $state()
|
let chatWindow = $state<HTMLDivElement>()
|
||||||
|
|
||||||
async function sendMessage(
|
async function sendMessage(
|
||||||
message: string,
|
message: string,
|
||||||
@@ -36,7 +41,7 @@
|
|||||||
try {
|
try {
|
||||||
const res = await client().createPrivateMessage({
|
const res = await client().createPrivateMessage({
|
||||||
content: message,
|
content: message,
|
||||||
recipient_id: data.creator,
|
recipient_id: data.creator.person_view.person.id,
|
||||||
})
|
})
|
||||||
|
|
||||||
textbox.loading = false
|
textbox.loading = false
|
||||||
@@ -52,10 +57,10 @@
|
|||||||
textbox.loading = false
|
textbox.loading = false
|
||||||
}
|
}
|
||||||
|
|
||||||
run(() => {
|
$effect(() => {
|
||||||
if (browser && data.message && chatWindow) {
|
if (browser && data.message && chatWindow) {
|
||||||
tick().then(() =>
|
tick().then(() =>
|
||||||
chatWindow.scrollTo({
|
chatWindow?.scrollTo({
|
||||||
top: chatWindow.scrollHeight,
|
top: chatWindow.scrollHeight,
|
||||||
behavior: 'smooth',
|
behavior: 'smooth',
|
||||||
}),
|
}),
|
||||||
@@ -82,6 +87,9 @@
|
|||||||
|
|
||||||
<Header pageHeader>
|
<Header pageHeader>
|
||||||
{$t('filter.inbox.messages')}
|
{$t('filter.inbox.messages')}
|
||||||
|
{#snippet extended()}
|
||||||
|
<UserLink avatar user={data.creator.person_view.person} />
|
||||||
|
{/snippet}
|
||||||
</Header>
|
</Header>
|
||||||
<Material
|
<Material
|
||||||
color="transparent"
|
color="transparent"
|
||||||
@@ -91,11 +99,21 @@
|
|||||||
w-full overflow-auto mt-6 relative max-h-[32rem] h-full"
|
w-full overflow-auto mt-6 relative max-h-[32rem] h-full"
|
||||||
>
|
>
|
||||||
<div class="h-full overflow-auto" bind:this={chatWindow}>
|
<div class="h-full overflow-auto" bind:this={chatWindow}>
|
||||||
<ul id="chat-window" class="flex flex-col gap-1 flex-1 px-4 py-4">
|
<ul id="chat-window" class=" h-full flex flex-col gap-1 flex-1 px-4 py-4">
|
||||||
<div class="mt-auto"></div>
|
<div class="mt-auto"></div>
|
||||||
|
<p class="mx-auto mt-auto text-slate-400 dark:text-zinc-600">
|
||||||
|
{$t('routes.inbox.messages.conversation', {
|
||||||
|
// @ts-ignore
|
||||||
|
user:
|
||||||
|
data.creator.person_view.person.name +
|
||||||
|
'@' +
|
||||||
|
new URL(data.creator.person_view.person.actor_id).hostname,
|
||||||
|
})}
|
||||||
|
</p>
|
||||||
{#each data.message.private_messages.toReversed() as private_message, index (private_message.private_message.id)}
|
{#each data.message.private_messages.toReversed() as private_message, index (private_message.private_message.id)}
|
||||||
<div
|
<div
|
||||||
class={private_message.creator.id == data.creator
|
class={private_message.creator.id ==
|
||||||
|
data.creator.person_view.person.id
|
||||||
? 'self-start'
|
? 'self-start'
|
||||||
: 'self-end'}
|
: 'self-end'}
|
||||||
in:fly|global={{
|
in:fly|global={{
|
||||||
@@ -107,10 +125,11 @@
|
|||||||
animate:flip={{ duration: 500, easing: expoOut }}
|
animate:flip={{ duration: 500, easing: expoOut }}
|
||||||
>
|
>
|
||||||
<Message
|
<Message
|
||||||
on:delete={() => deleteMessage(private_message.private_message.id)}
|
ondelete={() => deleteMessage(private_message.private_message.id)}
|
||||||
on:report={() => report(private_message)}
|
onreport={() => report(private_message)}
|
||||||
message={private_message}
|
message={private_message}
|
||||||
primary={private_message.creator.id != data.creator}
|
primary={private_message.creator.id !=
|
||||||
|
data.creator.person_view.person.id}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{/each}
|
{/each}
|
||||||
@@ -124,7 +143,9 @@
|
|||||||
border-slate-200 dark:border-zinc-800
|
border-slate-200 dark:border-zinc-800
|
||||||
p-2 gap-2 backdrop-blur-xl
|
p-2 gap-2 backdrop-blur-xl
|
||||||
bg-white/50 dark:bg-zinc-950/50 border rounded-2xl"
|
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)
|
const res = await sendMessage(textbox.message)
|
||||||
if (!res) return
|
if (!res) return
|
||||||
|
|
||||||
@@ -136,7 +157,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
textbox.message = ''
|
textbox.message = ''
|
||||||
})}
|
}}
|
||||||
>
|
>
|
||||||
<TextInput
|
<TextInput
|
||||||
bind:value={textbox.message}
|
bind:value={textbox.message}
|
||||||
|
|||||||
@@ -2,12 +2,23 @@ import { client } from '$lib/lemmy.js'
|
|||||||
import { awaitIfServer } from '$lib/promise.js'
|
import { awaitIfServer } from '$lib/promise.js'
|
||||||
|
|
||||||
export async function load({ fetch, params }) {
|
export async function load({ fetch, params }) {
|
||||||
return {
|
const creator = Number(params.user_id)
|
||||||
message: await client().getPrivateMessages({
|
|
||||||
|
const userPromise = client({ func: fetch }).getPersonDetails({
|
||||||
|
person_id: creator,
|
||||||
|
limit: 1,
|
||||||
|
})
|
||||||
|
|
||||||
|
const messagePromise = client({ func: fetch }).getPrivateMessages({
|
||||||
creator_id: Number(params.user_id),
|
creator_id: Number(params.user_id),
|
||||||
limit: 50,
|
limit: 50,
|
||||||
page: 1,
|
page: 1,
|
||||||
}),
|
})
|
||||||
creator: Number(params.user_id),
|
|
||||||
|
const [message, user] = await Promise.all([messagePromise, userPromise])
|
||||||
|
|
||||||
|
return {
|
||||||
|
message: message,
|
||||||
|
creator: user,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,20 +1,18 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import Markdown from '$lib/components/markdown/Markdown.svelte'
|
import Markdown from '$lib/components/markdown/Markdown.svelte'
|
||||||
import { client } from '$lib/lemmy'
|
|
||||||
import { t } from '$lib/translations'
|
import { t } from '$lib/translations'
|
||||||
import type { PrivateMessageView } from 'lemmy-js-client'
|
import type { PrivateMessageView } from 'lemmy-js-client'
|
||||||
import { Button, Menu, MenuButton, MenuDivider, Popover } from 'mono-svelte'
|
import { Button, Menu, MenuButton, MenuDivider, Popover } from 'mono-svelte'
|
||||||
import { createEventDispatcher } from 'svelte'
|
|
||||||
import { EllipsisVertical, Flag, Icon, Trash } from 'svelte-hero-icons'
|
import { EllipsisVertical, Flag, Icon, Trash } from 'svelte-hero-icons'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
message: PrivateMessageView
|
message: PrivateMessageView
|
||||||
primary?: boolean
|
primary?: boolean
|
||||||
|
ondelete?: (shouldDelete: boolean) => void
|
||||||
|
onreport?: (report: boolean) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
let { message, primary = false }: Props = $props()
|
let { message, primary = false, ondelete, onreport }: Props = $props()
|
||||||
|
|
||||||
const dispatch = createEventDispatcher<{ delete: boolean; report: boolean }>()
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@@ -26,10 +24,10 @@
|
|||||||
<div
|
<div
|
||||||
class="{primary
|
class="{primary
|
||||||
? 'bg-primary-900 dark:bg-primary-100 text-slate-50 dark:text-zinc-900 hover:brightness-75'
|
? 'bg-primary-900 dark:bg-primary-100 text-slate-50 dark:text-zinc-900 hover:brightness-75'
|
||||||
: 'bg-slate-100 dark:bg-zinc-900 hover:brightness-125'} rounded-2xl w-max p-1.5 px-3
|
: 'bg-slate-100 dark:bg-zinc-900 hover:brightness-125'} rounded-2xl w-full p-1.5 px-3
|
||||||
font-medium cursor-pointer transition-all"
|
font-medium cursor-pointer transition-all"
|
||||||
>
|
>
|
||||||
<Markdown source={message.private_message.content} inline />
|
<Markdown source={message.private_message.content} class="w-full" />
|
||||||
</div>
|
</div>
|
||||||
<Menu>
|
<Menu>
|
||||||
{#snippet target()}
|
{#snippet target()}
|
||||||
@@ -45,20 +43,14 @@
|
|||||||
{/snippet}
|
{/snippet}
|
||||||
<MenuDivider>{$t('post.actions.more.actions')}</MenuDivider>
|
<MenuDivider>{$t('post.actions.more.actions')}</MenuDivider>
|
||||||
{#if primary}
|
{#if primary}
|
||||||
<MenuButton
|
<MenuButton color="danger-subtle" onclick={() => ondelete?.(true)}>
|
||||||
color="danger-subtle"
|
|
||||||
onclick={() => dispatch('delete', true)}
|
|
||||||
>
|
|
||||||
{#snippet prefix()}
|
{#snippet prefix()}
|
||||||
<Icon src={Trash} size="16" micro />
|
<Icon src={Trash} size="16" micro />
|
||||||
{/snippet}
|
{/snippet}
|
||||||
{$t('post.actions.more.delete')}
|
{$t('post.actions.more.delete')}
|
||||||
</MenuButton>
|
</MenuButton>
|
||||||
{:else}
|
{:else}
|
||||||
<MenuButton
|
<MenuButton color="danger-subtle" onclick={() => onreport?.(true)}>
|
||||||
color="danger-subtle"
|
|
||||||
onclick={() => dispatch('report', true)}
|
|
||||||
>
|
|
||||||
{#snippet prefix()}
|
{#snippet prefix()}
|
||||||
<Icon src={Flag} size="16" micro />
|
<Icon src={Flag} size="16" micro />
|
||||||
{/snippet}
|
{/snippet}
|
||||||
|
|||||||
Reference in new issue
Block a user