feat: Add private messages
This commit is contained in:
1 parent
1a0881f9ce
commit
7113dc8463
9 files changed
+176
-46
No files matched your search
@@ -22,7 +22,7 @@
|
||||
export let data
|
||||
</script>
|
||||
|
||||
<div class="flex flex-row gap-4 justify-between">
|
||||
<div class="flex flex-row gap-4 w-full">
|
||||
<div class="flex flex-col gap-4 max-w-full w-full">
|
||||
<div class="flex flex-col sm:flex-row gap-4 max-w-full w-full">
|
||||
<MultiSelect
|
||||
|
||||
@@ -1,18 +1,23 @@
|
||||
<script lang="ts">
|
||||
import type { CommentReplyView, PersonMentionView } from 'lemmy-js-client'
|
||||
import type {
|
||||
CommentReplyView,
|
||||
PersonMentionView,
|
||||
PrivateMessageView,
|
||||
} from 'lemmy-js-client'
|
||||
import InboxItem from './InboxItem.svelte'
|
||||
import Button from '$lib/components/input/Button.svelte'
|
||||
import { Check, Icon } from 'svelte-hero-icons'
|
||||
import { authData, getClient } from '$lib/lemmy.js'
|
||||
import { authData, getClient, user } from '$lib/lemmy.js'
|
||||
import { goto } from '$app/navigation'
|
||||
import { page } from '$app/stores'
|
||||
|
||||
export let data: {
|
||||
data: PersonMentionView[] | CommentReplyView[]
|
||||
data: PersonMentionView[] | CommentReplyView[] | PrivateMessageView[]
|
||||
}
|
||||
|
||||
function isRead(item: PersonMentionView | CommentReplyView) {
|
||||
console.log('running...')
|
||||
function isRead(
|
||||
item: PersonMentionView | CommentReplyView | PrivateMessageView
|
||||
) {
|
||||
if ('person_mention' in item) {
|
||||
return (item as PersonMentionView).person_mention.read
|
||||
}
|
||||
@@ -21,6 +26,10 @@
|
||||
return (item as CommentReplyView).comment_reply.read
|
||||
}
|
||||
|
||||
if ('private_message' in item) {
|
||||
return (item as PrivateMessageView).private_message.read
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -29,6 +38,8 @@
|
||||
auth: $authData!.token,
|
||||
})
|
||||
|
||||
$user.unreads = 0
|
||||
|
||||
goto($page.url, {
|
||||
invalidateAll: true,
|
||||
})
|
||||
|
||||
@@ -26,7 +26,11 @@ export async function load() {
|
||||
client.getPrivateMessages(params),
|
||||
])
|
||||
|
||||
const data = [...replies.replies, ...mentions.mentions].sort(
|
||||
const data = [
|
||||
...replies.replies,
|
||||
...mentions.mentions,
|
||||
...privateMessages.private_messages,
|
||||
].sort(
|
||||
(a, b) =>
|
||||
Date.parse(getInboxItemPublished(b)) -
|
||||
Date.parse(getInboxItemPublished(a))
|
||||
|
||||
@@ -1,45 +1,154 @@
|
||||
<script lang="ts">
|
||||
import { goto } from '$app/navigation'
|
||||
import Button from '$lib/components/input/Button.svelte'
|
||||
import Link from '$lib/components/input/Link.svelte'
|
||||
import TextArea from '$lib/components/input/TextArea.svelte'
|
||||
import Comment from '$lib/components/lemmy/comment/Comment.svelte'
|
||||
import Markdown from '$lib/components/markdown/Markdown.svelte'
|
||||
import Card from '$lib/components/ui/Card.svelte'
|
||||
import { ToastType, addToast } from '$lib/components/ui/toasts/toasts.js'
|
||||
import UserLink from '$lib/components/user/UserLink.svelte'
|
||||
import { authData, getClient, user } from '$lib/lemmy.js'
|
||||
import { Color } from '$lib/ui/colors.js'
|
||||
import type {
|
||||
CommentReplyView,
|
||||
PersonMentionView,
|
||||
PrivateMessageView,
|
||||
} from 'lemmy-js-client'
|
||||
import { ChatBubbleOvalLeft, Icon } from 'svelte-hero-icons'
|
||||
import { page } from '$app/stores'
|
||||
|
||||
export let item: CommentReplyView | PersonMentionView
|
||||
export let item: CommentReplyView | PersonMentionView | PrivateMessageView
|
||||
export let read: boolean
|
||||
|
||||
function isPrivateMessage(
|
||||
item: CommentReplyView | PersonMentionView | PrivateMessageView
|
||||
) {
|
||||
return 'private_message' in item
|
||||
}
|
||||
|
||||
// I hate how you can't type cast in Svelte easily
|
||||
const replyItem = item as CommentReplyView | PersonMentionView
|
||||
const messageItem = item as PrivateMessageView
|
||||
|
||||
let replying = false
|
||||
let reply = ''
|
||||
let loading = false
|
||||
|
||||
async function replyToMessage() {
|
||||
if (!$authData) return
|
||||
|
||||
loading = true
|
||||
|
||||
try {
|
||||
await getClient().createPrivateMessage({
|
||||
auth: $authData.token,
|
||||
content: reply,
|
||||
recipient_id: messageItem.creator.id,
|
||||
})
|
||||
|
||||
addToast(
|
||||
'Success',
|
||||
'Successfully replied to that message.',
|
||||
ToastType.success
|
||||
)
|
||||
|
||||
replying = false
|
||||
|
||||
goto($page.url, {
|
||||
invalidateAll: true,
|
||||
replaceState: true,
|
||||
})
|
||||
} catch (error) {
|
||||
addToast('Error', error as any, ToastType.error)
|
||||
}
|
||||
|
||||
loading = false
|
||||
}
|
||||
</script>
|
||||
|
||||
<Card class="flex flex-col bg-white rounded-md p-4 max-w-full">
|
||||
<div class="flex flex-row items-center">
|
||||
<div
|
||||
class="text-sm max-w-[80ch] whitespace-nowrap text-ellipsis
|
||||
{#if !isPrivateMessage(item)}
|
||||
<div class="flex flex-row items-center">
|
||||
<div
|
||||
class="text-sm max-w-[80ch] whitespace-nowrap text-ellipsis
|
||||
overflow-hidden {read ? 'opacity-50' : ''}"
|
||||
>
|
||||
<span class="font-bold">
|
||||
{item.creator.display_name ?? item.creator.name}
|
||||
</span>
|
||||
replied to you in
|
||||
<a
|
||||
href="/post/{item.post.id}"
|
||||
class="font-bold max-w-[48ch] overflow-hidden text-ellipsis
|
||||
whitespace-nowrap inline hover:underline"
|
||||
>
|
||||
{item.post.name}
|
||||
</a>
|
||||
</div>
|
||||
<span class="font-bold">
|
||||
{replyItem.creator.display_name ?? replyItem.creator.name}
|
||||
</span>
|
||||
replied to you in
|
||||
<a
|
||||
href="/post/{replyItem.post.id}"
|
||||
class="font-bold max-w-[48ch] overflow-hidden text-ellipsis
|
||||
whitespace-nowrap inline hover:underline"
|
||||
>
|
||||
{replyItem.post.name}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="w-max ml-auto">
|
||||
<Link href="/post/{item.post.id}#{item.comment.id}">Jump</Link>
|
||||
<div class="w-max ml-auto">
|
||||
<Link href="/post/{replyItem.post.id}#{replyItem.comment.id}">
|
||||
Jump
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<Comment
|
||||
postId={item.post.id}
|
||||
node={{ children: [], comment_view: item, depth: 1 }}
|
||||
replying={false}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<Comment
|
||||
postId={replyItem.post.id}
|
||||
node={{ children: [], comment_view: replyItem, depth: 1 }}
|
||||
replying={false}
|
||||
/>
|
||||
</div>
|
||||
{:else}
|
||||
<div class="flex flex-row items-center">
|
||||
<div
|
||||
class="text-sm max-w-[80ch] whitespace-nowrap text-ellipsis
|
||||
overflow-hidden flex flex-row items-center gap-1 {read ? 'opacity-80' : ''}"
|
||||
>
|
||||
<span class="font-bold">
|
||||
{#if messageItem.creator.id == $user?.person_view.person.id}
|
||||
You
|
||||
{:else}
|
||||
<UserLink avatar user={messageItem.creator} />
|
||||
{/if}
|
||||
</span>
|
||||
<span>messaged</span>
|
||||
<span class="font-bold">
|
||||
{#if messageItem.recipient.id == $user?.person_view.person.id}
|
||||
You
|
||||
{:else}
|
||||
<UserLink avatar user={messageItem.recipient} />
|
||||
{/if}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<p class="text-sm py-2">
|
||||
<Markdown source={messageItem.private_message.content} />
|
||||
</p>
|
||||
{#if messageItem.recipient.id == $user?.person_view.person.id}
|
||||
<div class="flex flex-row gap-2">
|
||||
<Button color={Color.ghost} on:click={() => (replying = !replying)}>
|
||||
<Icon mini src={ChatBubbleOvalLeft} width={16} />
|
||||
Reply
|
||||
</Button>
|
||||
</div>
|
||||
{/if}
|
||||
{#if replying}
|
||||
<div class="mt-2 flex flex-col gap-2">
|
||||
<TextArea placeholder="Message" bind:value={reply} rows={3} />
|
||||
<div class="ml-auto w-24">
|
||||
<Button
|
||||
disabled={loading}
|
||||
{loading}
|
||||
large
|
||||
on:click={replyToMessage}
|
||||
color={Color.accent}
|
||||
>
|
||||
Submit
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
</Card>
|
||||
@@ -60,8 +60,8 @@
|
||||
<title>{data.user.person_view.person.name}</title>
|
||||
</svelte:head>
|
||||
|
||||
<div class="flex flex-row gap-4 max-w-full">
|
||||
<div class="flex flex-col gap-4 max-w-full">
|
||||
<div class="flex flex-row gap-4 max-w-full w-full">
|
||||
<div class="flex flex-col gap-4 max-w-full w-full">
|
||||
{#each items as item}
|
||||
{#if item.post}
|
||||
<Post post={item.item} />
|
||||
@@ -92,7 +92,7 @@
|
||||
{/each}
|
||||
</div>
|
||||
|
||||
<div class="max-w-sm w-full hidden xl:block">
|
||||
<div class="max-w-sm w-full hidden lg:block">
|
||||
<StickyCard>
|
||||
<Avatar
|
||||
width={64}
|
||||
|
||||
Reference in new issue
Block a user