diff --git a/src/lib/components/lemmy/comment/CommentItem.svelte b/src/lib/components/lemmy/comment/CommentItem.svelte
index 3f506532..2902942e 100644
--- a/src/lib/components/lemmy/comment/CommentItem.svelte
+++ b/src/lib/components/lemmy/comment/CommentItem.svelte
@@ -21,21 +21,26 @@
padding="none"
>
-
- {comment.post.name}
-
+
+
+
diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json
index 0c3a25fb..2b44edb7 100644
--- a/src/lib/i18n/en.json
+++ b/src/lib/i18n/en.json
@@ -252,7 +252,9 @@
},
"reason": "Reason",
"resolve": "Resolve",
- "unresolve": "Unresolve"
+ "resolved": "Resolved",
+ "unresolve": "Unresolve",
+ "resolvedBy": "Resolved by"
},
"admin": {
"title": "Administration",
diff --git a/src/lib/lemmy/report.ts b/src/lib/lemmy/report.ts
index 600d977f..277afce1 100644
--- a/src/lib/lemmy/report.ts
+++ b/src/lib/lemmy/report.ts
@@ -33,6 +33,7 @@ interface BaseReport {
timestamp: Date
resolved: boolean
id: number
+ resolver?: Person
}
export const generalizeCommentReport = (
@@ -51,6 +52,7 @@ export const generalizeCommentReport = (
timestamp: publishedToDate(report.comment_report.published),
resolved: report.comment_report.resolved,
id: report.comment_report.id,
+ resolver: report.resolver,
})
export const generalizePostReport = (report: PostReportView): ReportView => ({
@@ -69,6 +71,7 @@ export const generalizePostReport = (report: PostReportView): ReportView => ({
timestamp: publishedToDate(report.post_report.published),
resolved: report.post_report.resolved,
id: report.post_report.id,
+ resolver: report.resolver,
})
export const generalizePrivateMessageReport = (
@@ -82,6 +85,7 @@ export const generalizePrivateMessageReport = (
timestamp: publishedToDate(report.private_message_report.published),
resolved: report.private_message_report.resolved,
id: report.private_message_report.id,
+ resolver: report.resolver,
})
export type Report =
diff --git a/src/routes/moderation/Report.svelte b/src/routes/moderation/Report.svelte
index 72f2bd5a..d8e0cab8 100644
--- a/src/routes/moderation/Report.svelte
+++ b/src/routes/moderation/Report.svelte
@@ -9,12 +9,14 @@
PostReportView,
PrivateMessageReportView,
} from 'lemmy-js-client'
- import { Check, Icon } from 'svelte-hero-icons'
+ import { Check, CheckCircle, Icon } from 'svelte-hero-icons'
import { notifications, profile } from '$lib/auth.js'
import { Button } from 'mono-svelte'
import type { ReportView } from '$lib/lemmy/report.js'
import PrivateMessage from '$lib/components/lemmy/inbox/PrivateMessage.svelte'
import { t } from '$lib/translations'
+ import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
+ import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
export let item: ReportView
@@ -32,6 +34,7 @@
})
item.resolved = res.comment_report_view.comment_report.resolved
+ item.resolver = res.comment_report_view.resolver
toast({
content: item.resolved
@@ -49,6 +52,7 @@
})
item.resolved = res.post_report_view.post_report.resolved
+ item.resolver = res.post_report_view.resolver
toast({
content: item.resolved
? $t('toast.resolveReport')
@@ -66,6 +70,9 @@
item.resolved =
res.private_message_report_view.private_message_report.resolved
+
+ item.resolver = res.private_message_report_view.resolver
+
toast({
content: item.resolved
? $t('toast.resolveReport')
@@ -103,24 +110,34 @@
/>
{/if}
-
+
-
+
{$t('routes.moderation.reason')}
-
+
{item.reason}
+ {#if item.resolver}
+
+
+ {$t('routes.moderation.resolvedBy')}
+
+
+
+ {/if}