From a77b3b3b7850e9953a013ec8e51a5886b12926a6 Mon Sep 17 00:00:00 2001 From: Xylight Date: Wed, 21 Aug 2024 17:00:59 -0700 Subject: [PATCH] feat: add new messages ui --- .../lemmy/moderation/ReportModal.svelte | 31 +++- .../components/lemmy/moderation/moderation.ts | 14 +- .../components/ui/layout/pages/Tabs.svelte | 5 +- src/lib/lemmy/report.ts | 2 + src/routes/inbox/+page.svelte | 42 +++-- src/routes/inbox/messages/+page.svelte | 93 +++++++++++ src/routes/inbox/messages/+page.ts | 14 ++ .../messages/[user_id=integer]/+page.svelte | 158 ++++++++++++++++++ .../inbox/messages/[user_id=integer]/+page.ts | 13 ++ .../messages/[user_id=integer]/Message.svelte | 60 +++++++ 10 files changed, 409 insertions(+), 23 deletions(-) create mode 100644 src/routes/inbox/messages/+page.svelte create mode 100644 src/routes/inbox/messages/+page.ts create mode 100644 src/routes/inbox/messages/[user_id=integer]/+page.svelte create mode 100644 src/routes/inbox/messages/[user_id=integer]/+page.ts create mode 100644 src/routes/inbox/messages/[user_id=integer]/Message.svelte diff --git a/src/lib/components/lemmy/moderation/ReportModal.svelte b/src/lib/components/lemmy/moderation/ReportModal.svelte index 130a18d7..cf59812e 100644 --- a/src/lib/components/lemmy/moderation/ReportModal.svelte +++ b/src/lib/components/lemmy/moderation/ReportModal.svelte @@ -3,22 +3,34 @@ import Post from '$lib/components/lemmy/post/Post.svelte' import { toast } from 'mono-svelte' import { getClient } from '$lib/lemmy.js' - import type { CommentView, PostView } from 'lemmy-js-client' + import type { + CommentView, + PostView, + PrivateMessageView, + } from 'lemmy-js-client' import { profile } from '$lib/auth.js' import { Button, Modal } from 'mono-svelte' import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte' import { onMount } from 'svelte' import Header from '$lib/components/ui/layout/pages/Header.svelte' import { t } from '$lib/translations' + import PrivateMessage from '../inbox/PrivateMessage.svelte' export let open: boolean - export let item: PostView | CommentView | undefined = undefined + export let item: PostView | CommentView | PrivateMessageView | undefined = + undefined - const isComment = (item: PostView | CommentView): item is CommentView => - 'comment' in item + const isComment = ( + item: PostView | CommentView | PrivateMessageView + ): item is CommentView => 'comment' in item - const isPost = (item: PostView | CommentView): item is PostView => - !isComment(item) + const isPost = ( + item: PostView | CommentView | PrivateMessageView + ): item is PostView => !isComment(item) && 'post' in item + + const isPrivateMessage = ( + item: PostView | CommentView | PrivateMessageView + ): item is PrivateMessageView => !isComment(item) && 'private_message' in item let loading = false let reason = '' @@ -38,6 +50,11 @@ post_id: item.post.id, reason: reason, }) + } else if (isPrivateMessage(item)) { + await getClient().createPrivateMessageReport({ + private_message_id: item.private_message.id, + reason: reason, + }) } open = false toast({ @@ -77,6 +94,8 @@ /> {:else if isPost(item)} + {:else} + {/if} {/if} diff --git a/src/lib/components/lemmy/moderation/moderation.ts b/src/lib/components/lemmy/moderation/moderation.ts index 7e1fa1b4..94e3e5c1 100644 --- a/src/lib/components/lemmy/moderation/moderation.ts +++ b/src/lib/components/lemmy/moderation/moderation.ts @@ -1,12 +1,20 @@ import { client } from '$lib/lemmy' import type { SubmissionView } from '$lib/lemmy/contentview.js' -import type { Comment, Community, MyUserInfo, Person } from 'lemmy-js-client' +import type { + Comment, + CommentView, + Community, + MyUserInfo, + Person, + PostView, + PrivateMessageView, +} from 'lemmy-js-client' import { get, writable } from 'svelte/store' interface Modals { reporting: { open: boolean - item: SubmissionView | undefined + item: PostView | CommentView | PrivateMessageView | undefined } removing: { open: boolean @@ -39,7 +47,7 @@ export let modals = writable({ }, }) -export function report(item: SubmissionView) { +export function report(item: PostView | CommentView | PrivateMessageView) { modals.update((m) => ({ ...m, reporting: { diff --git a/src/lib/components/ui/layout/pages/Tabs.svelte b/src/lib/components/ui/layout/pages/Tabs.svelte index dba8a0b7..7ddd5758 100644 --- a/src/lib/components/ui/layout/pages/Tabs.svelte +++ b/src/lib/components/ui/layout/pages/Tabs.svelte @@ -1,4 +1,5 @@