diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-06-09 13:19:54 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-06-09 13:19:54 -0400 |
| commit | 30679935ce4ac037ac4465bf06237bd5c396f52b (patch) | |
| tree | 17cd2abb0b2d67db0f809664014f0266e93077bd | |
| parent | increase width of admin-user and instance-admin screens to prevent scrolling ... (diff) | |
| download | sharkey-30679935ce4ac037ac4465bf06237bd5c396f52b.tar.gz sharkey-30679935ce4ac037ac4465bf06237bd5c396f52b.tar.bz2 sharkey-30679935ce4ac037ac4465bf06237bd5c396f52b.zip | |
fix admin-user not working inside the reports ui
| -rw-r--r-- | packages/frontend/src/components/MkAbuseReport.vue | 14 | ||||
| -rw-r--r-- | 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<Misskey.entities.AdminMetaResponse | undefined>(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 <MkPagination v-slot="{items}" ref="reports" :pagination="pagination" :displayLimit="50"> <SkDateSeparatedList v-slot="{ item: report }" :items="items"> - <XAbuseReport :report="report" @resolved="resolved"/> + <XAbuseReport :report="report" :metaHint="metaHint" @resolved="resolved"/> </SkDateSeparatedList> </MkPagination> </div> @@ -59,6 +59,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { computed, useTemplateRef, ref } from 'vue'; +import * as Misskey from 'misskey-js'; import MkSelect from '@/components/MkSelect.vue'; import MkPagination from '@/components/MkPagination.vue'; import XAbuseReport from '@/components/MkAbuseReport.vue'; @@ -68,6 +69,8 @@ import MkButton from '@/components/MkButton.vue'; import MkInfo from '@/components/MkInfo.vue'; import { store } from '@/store.js'; import SkDateSeparatedList from '@/components/SkDateSeparatedList.vue'; +import { iAmAdmin } from '@/i'; +import { misskeyApi } from '@/utility/misskey-api'; const reports = useTemplateRef('reports'); @@ -77,6 +80,14 @@ const targetUserOrigin = ref('combined'); const searchUsername = ref(''); const searchHost = ref(''); +const metaHint = ref<Misskey.entities.AdminMetaResponse | undefined>(undefined); + +if (iAmAdmin) { + misskeyApi('admin/meta') + .then(meta => metaHint.value = meta) + .catch(err => console.error('[MkAbuseReport] Error fetching meta:', err)); +} + const pagination = { endpoint: 'admin/abuse-user-reports' as const, limit: 10, |