From 013a1fd5af30770b9e01e503a462b86fec29b8a8 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 23 Sep 2023 16:25:23 +0900
Subject: [PATCH] wip

---
 packages/backend/src/types.ts                |  4 +-
 packages/frontend/src/pages/admin/modlog.vue | 39 +++++++++-----------
 packages/misskey-js/etc/misskey-js.api.md    |  3 ++
 packages/misskey-js/src/consts.ts            |  4 +-
 packages/misskey-js/src/entities.ts          |  2 +-
 packages/misskey-js/src/index.ts             |  1 +
 6 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index 97e4b228b4..d2a880f250 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -68,6 +68,6 @@ export type ModerationLogPayloads = {
 		roleId: string;
 		roleName: string;
 	};
-	clearQueue: {};
-	promoteQueue: {};
+	clearQueue: Record<string, never>;
+	promoteQueue: Record<string, never>;
 };
diff --git a/packages/frontend/src/pages/admin/modlog.vue b/packages/frontend/src/pages/admin/modlog.vue
index ba310c1c4e..da043f1b8f 100644
--- a/packages/frontend/src/pages/admin/modlog.vue
+++ b/packages/frontend/src/pages/admin/modlog.vue
@@ -8,27 +8,22 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="900">
 		<div>
-			<div class="reports">
-				<div class="">
-					<div class="inputs" style="display: flex;">
-						<MkSelect v-model="type" style="margin: 0; flex: 1;">
-							<template #label>{{ i18n.ts.type }}</template>
-							<option value="all">{{ i18n.ts.all }}</option>
-							<option value="unresolved">{{ i18n.ts.unresolved }}</option>
-							<option value="resolved">{{ i18n.ts.resolved }}</option>
-						</MkSelect>
-						<MkInput v-model="moderatorId" style="margin: 0; flex: 1;">
-							<template #label>{{ i18n.ts.moderator }}(ID)</template>
-						</MkInput>
-					</div>
-
-					<MkPagination v-slot="{items}" ref="logs" :pagination="pagination" style="margin-top: var(--margin);">
-						<div class="_gaps_s">
-							<XModLog v-for="item in items" :key="item.id" :log="item"/>
-						</div>
-					</MkPagination>
-				</div>
+			<div style="display: flex; gap: var(--margin); flex-wrap: wrap;">
+				<MkSelect v-model="type" style="margin: 0; flex: 1;">
+					<template #label>{{ i18n.ts.type }}</template>
+					<option :value="null">{{ i18n.ts.all }}</option>
+					<option v-for="t in Misskey.moderationLogTypes" :key="t" :value="t">{{ t }}</option>
+				</MkSelect>
+				<MkInput v-model="moderatorId" style="margin: 0; flex: 1;">
+					<template #label>{{ i18n.ts.moderator }}(ID)</template>
+				</MkInput>
 			</div>
+
+			<MkPagination v-slot="{items}" ref="logs" :pagination="pagination" style="margin-top: var(--margin);">
+				<div class="_gaps_s">
+					<XModLog v-for="item in items" :key="item.id" :log="item"/>
+				</div>
+			</MkPagination>
 		</div>
 	</MkSpacer>
 </MkStickyContainer>
@@ -36,7 +31,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-
+import * as Misskey from 'misskey-js';
 import XHeader from './_header_.vue';
 import XModLog from './modlog.ModLog.vue';
 import MkSelect from '@/components/MkSelect.vue';
@@ -59,6 +54,8 @@ const pagination = {
 	})),
 };
 
+console.log(Misskey);
+
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index 72f8143037..b7442aa077 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -2558,6 +2558,9 @@ type ModerationLog = {
     info: ModerationLogPayloads['promoteQueue'];
 });
 
+// @public (undocumented)
+export const moderationLogTypes: readonly ["updateMeta", "suspend", "unsuspend", "userNoteUpdated", "addEmoji", "roleAssigned", "roleUnassigned", "roleUpdated", "roleDeleted", "clearQueue", "promoteQueue"];
+
 // @public (undocumented)
 export const mutedNoteReasons: readonly ["word", "manual", "spam", "other"];
 
diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts
index f0c5c821a0..9a90e0c033 100644
--- a/packages/misskey-js/src/consts.ts
+++ b/packages/misskey-js/src/consts.ts
@@ -86,6 +86,6 @@ export type ModerationLogPayloads = {
 		roleId: string;
 		roleName: string;
 	};
-	clearQueue: {};
-	promoteQueue: {};
+	clearQueue: Record<string, never>;
+	promoteQueue: Record<string, never>;
 };
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index 858e3176b4..168176db52 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -1,4 +1,4 @@
-import { ModerationLogPayloads, moderationLogTypes } from './consts.js';
+import { ModerationLogPayloads } from './consts.js';
 
 export type ID = string;
 export type DateString = string;
diff --git a/packages/misskey-js/src/index.ts b/packages/misskey-js/src/index.ts
index ae4dd31fe0..e78501fdfd 100644
--- a/packages/misskey-js/src/index.ts
+++ b/packages/misskey-js/src/index.ts
@@ -17,6 +17,7 @@ export const notificationTypes = consts.notificationTypes;
 export const noteVisibilities = consts.noteVisibilities;
 export const mutedNoteReasons = consts.mutedNoteReasons;
 export const ffVisibility = consts.ffVisibility;
+export const moderationLogTypes = consts.moderationLogTypes;
 
 // api extractor not supported yet
 //export * as api from './api.js';