From 30679935ce4ac037ac4465bf06237bd5c396f52b Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Mon, 9 Jun 2025 13:19:54 -0400 Subject: [PATCH] fix admin-user not working inside the reports ui --- packages/frontend/src/components/MkAbuseReport.vue | 14 +++++--------- packages/frontend/src/pages/admin/abuses.vue | 13 ++++++++++++- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/packages/frontend/src/components/MkAbuseReport.vue b/packages/frontend/src/components/MkAbuseReport.vue index 5bf5380a1e..7ad0ad647c 100644 --- a/packages/frontend/src/components/MkAbuseReport.vue +++ b/packages/frontend/src/components/MkAbuseReport.vue @@ -118,9 +118,12 @@ import { misskeyApi } from '@/utility/misskey-api'; import AdminUser from '@/pages/admin-user.vue'; import SkUrlPreviewGroup from '@/components/SkUrlPreviewGroup.vue'; -const props = defineProps<{ +const props = withDefaults(defineProps<{ report: Misskey.entities.AdminAbuseUserReportsResponse[number]; -}>(); + metaHint?: Misskey.entities.AdminMetaResponse | undefined; +}>(), { + metaHint: undefined, +}); const emit = defineEmits<{ (ev: 'resolved', reportId: string): void; @@ -134,7 +137,6 @@ reporterRouter.init(); */ const parsedComment = computed(() => mfm.parse(props.report.comment)); -const metaHint = ref(undefined); const targetInstanceIcon = computed(() => props.report.targetInstance?.faviconUrl ? getProxiedImageUrlNullable(props.report.targetInstance.faviconUrl, 'preview') @@ -142,12 +144,6 @@ const targetInstanceIcon = computed(() => props.report.targetInstance?.faviconUr ? getProxiedImageUrlNullable(props.report.targetInstance.iconUrl, 'preview') : null); -if (iAmAdmin) { - misskeyApi('admin/meta') - .then(meta => metaHint.value = meta) - .catch(err => console.error('[MkAbuseReport] Error fetching meta:', err)); -} - const moderationNote = ref(props.report.moderationNote ?? ''); watch(moderationNote, async () => { diff --git a/packages/frontend/src/pages/admin/abuses.vue b/packages/frontend/src/pages/admin/abuses.vue index 6531a3e49d..a2343d7e76 100644 --- a/packages/frontend/src/pages/admin/abuses.vue +++ b/packages/frontend/src/pages/admin/abuses.vue @@ -49,7 +49,7 @@ SPDX-License-Identifier: AGPL-3.0-only - + @@ -59,6 +59,7 @@ SPDX-License-Identifier: AGPL-3.0-only