Merge remote-tracking branch 'msky/develop' into feat-1714

.github/workflows/lint.yml

@@ -40,8 +40,6 @@ jobs:
     needs: [pnpm_install]
     runs-on: ubuntu-latest
     continue-on-error: true
-    env:
-      eslint-cache-version: v1
     strategy:
       matrix:
         workspace:
@@ -49,6 +47,9 @@ jobs:
         - frontend
         - sw
         - misskey-js
+    env:
+      eslint-cache-version: v1
+      eslint-cache-path: ${{ github.workspace }}/node_modules/.cache/eslint-${{ matrix.workspace }}
     steps:
     - uses: actions/checkout@v4.1.1
       with:
@@ -64,11 +65,10 @@ jobs:
     - name: Restore eslint cache
       uses: actions/cache@v4.0.2
       with:
-        path: node_modules/.cache/eslint
+        path: ${{ env.eslint-cache-path }}
-        key: eslint-${{ env.eslint-cache-version }}-${{ hashFiles('/pnpm-lock.yaml') }}-${{ github.ref_name }}-${{ github.sha }}
+        key: eslint-${{ env.eslint-cache-version }}-${{ matrix.workspace }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ github.ref_name }}-${{ github.sha }}
-        restore-keys: |
+        restore-keys: eslint-${{ env.eslint-cache-version }}-${{ matrix.workspace }}-${{ hashFiles('**/pnpm-lock.yaml') }}-
-          eslint-${{ env.eslint-cache-version }}-${{ hashFiles('/pnpm-lock.yaml') }}-
+    - run: pnpm --filter ${{ matrix.workspace }} run eslint --cache --cache-location ${{ env.eslint-cache-path }} --cache-strategy content
-    - run: pnpm --filter ${{ matrix.workspace }} run eslint --cache --cache-location node_modules/.cache/eslint --cache-strategy content
 
   typecheck:
     needs: [pnpm_install]

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Feat: ノート単体・ユーザーのノート・クリップのノートの埋め込み機能
   - 埋め込みコードやウェブサイトへの実装方法の詳細はMisskey Hubに掲載予定です
 - サイズ制限を超過するファイルをアップロードしようとした際にエラーを出すように
+- Enhance: アイコンデコレーション管理画面にプレビューを追加
 - Fix: サーバーメトリクスが2つ以上あるとリロード直後の表示がおかしくなる問題を修正
 
 ### Server

packages/frontend/src/components/MkChart.vue

@@ -13,29 +13,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts">
-/* eslint-disable id-denylist --
+export type ChartSrc =
-  Chart.js has a `data` attribute in most chart definitions, which triggers the
-  id-denylist violation when setting it. This is causing about 60+ lint issues.
-  As this is part of Chart.js's API it makes sense to disable the check here.
-*/
-import { onMounted, ref, shallowRef, watch } from 'vue';
-import { Chart } from 'chart.js';
-import * as Misskey from 'misskey-js';
-import { misskeyApiGet } from '@/scripts/misskey-api.js';
-import { defaultStore } from '@/store.js';
-import { useChartTooltip } from '@/scripts/use-chart-tooltip.js';
-import { chartVLine } from '@/scripts/chart-vline.js';
-import { alpha } from '@/scripts/color.js';
-import date from '@/filters/date.js';
-import bytes from '@/filters/bytes.js';
-import { initChart } from '@/scripts/init-chart.js';
-import { chartLegend } from '@/scripts/chart-legend.js';
-import MkChartLegend from '@/components/MkChartLegend.vue';
-
-initChart();
-
-type ChartSrc =
 	| 'federation'
 	| 'ap-request'
 	| 'users'
@@ -62,7 +41,30 @@ type ChartSrc =
 	| 'per-user-pv'
 	| 'per-user-following'
 	| 'per-user-followers'
-	| 'per-user-drive'
+	| 'per-user-drive';
+</script>
+
+<script lang="ts" setup>
+/* eslint-disable id-denylist --
+  Chart.js has a `data` attribute in most chart definitions, which triggers the
+  id-denylist violation when setting it. This is causing about 60+ lint issues.
+  As this is part of Chart.js's API it makes sense to disable the check here.
+*/
+import { onMounted, ref, shallowRef, watch } from 'vue';
+import { Chart } from 'chart.js';
+import * as Misskey from 'misskey-js';
+import { misskeyApiGet } from '@/scripts/misskey-api.js';
+import { defaultStore } from '@/store.js';
+import { useChartTooltip } from '@/scripts/use-chart-tooltip.js';
+import { chartVLine } from '@/scripts/chart-vline.js';
+import { alpha } from '@/scripts/color.js';
+import date from '@/filters/date.js';
+import bytes from '@/filters/bytes.js';
+import { initChart } from '@/scripts/init-chart.js';
+import { chartLegend } from '@/scripts/chart-legend.js';
+import MkChartLegend from '@/components/MkChartLegend.vue';
+
+initChart();
 
 const props = withDefaults(defineProps<{
 	src: ChartSrc;

packages/frontend/src/components/MkModalWindow.vue

@@ -94,12 +94,12 @@ defineExpose({
 
 	--root-margin: 24px;
 
+	--headerHeight: 46px;
+	--headerHeightNarrow: 42px;
+
 	@media (max-width: 500px) {
 		--root-margin: 16px;
 	}
-
-	--headerHeight: 46px;
-	--headerHeightNarrow: 42px;
 }
 
 .header {

packages/frontend/src/components/MkSuperMenu.vue

@@ -100,14 +100,14 @@ defineProps<{
 
 	&.grid {
 		> .group {
+			margin-left: 0;
+			margin-right: 0;
+
 			& + .group {
 				padding-top: 0;
 				border-top: none;
 			}
 
-			margin-left: 0;
-			margin-right: 0;
-
 			> .title {
 				font-size: 1em;
 				opacity: 0.7;

packages/frontend/src/components/MkWindow.vue

@@ -508,10 +508,6 @@ defineExpose({
 .header {
 	--height: 39px;
 
-	&.mini {
-		--height: 32px;
-	}
-
 	display: flex;
 	position: relative;
 	z-index: 1;
@@ -524,6 +520,10 @@ defineExpose({
 	//border-bottom: solid 1px var(--divider);
 	font-size: 90%;
 	font-weight: bold;
+
+	&.mini {
+		--height: 32px;
+	}
 }
 
 .headerButton {

packages/frontend/src/pages/admin/overview.users.vue

@@ -47,14 +47,14 @@ useInterval(fetch, 1000 * 60, {
 .root {
 	&:global {
 		> .users {
-			.chart-move {
-				transition: transform 1s ease;
-			}
-
 			display: grid;
 			grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
 			grid-gap: 12px;
 
+			.chart-move {
+				transition: transform 1s ease;
+			}
+
 			> .user:hover {
 				text-decoration: none;
 			}

packages/frontend/src/pages/avatar-decorations.vue

@@ -12,6 +12,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<template #label>{{ avatarDecoration.name }}</template>
 				<template #caption>{{ avatarDecoration.description }}</template>
 
+				<div :class="$style.editorRoot">
+					<div :class="$style.editorWrapper">
+						<div :class="$style.preview">
+							<div :class="[$style.previewItem, $style.light]">
+								<MkAvatar style="width: 60px; height: 60px;" :user="$i" :decorations="[avatarDecoration]" forceShowDecoration/>
+							</div>
+							<div :class="[$style.previewItem, $style.dark]">
+								<MkAvatar style="width: 60px; height: 60px;" :user="$i" :decorations="[avatarDecoration]" forceShowDecoration/>
+							</div>
+						</div>
 						<div class="_gaps_m">
 							<MkInput v-model="avatarDecoration.name">
 								<template #label>{{ i18n.ts.name }}</template>
@@ -22,9 +32,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<MkInput v-model="avatarDecoration.url">
 								<template #label>{{ i18n.ts.imageUrl }}</template>
 							</MkInput>
-					<div class="buttons _buttons">
+							<div class="_buttons">
-						<MkButton class="button" inline primary @click="save(avatarDecoration)"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
+								<MkButton inline primary @click="save(avatarDecoration)"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
-						<MkButton v-if="avatarDecoration.id != null" class="button" inline danger @click="del(avatarDecoration)"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
+								<MkButton v-if="avatarDecoration.id != null" inline danger @click="del(avatarDecoration)"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
+							</div>
+						</div>
 					</div>
 				</div>
 			</MkFolder>
@@ -39,6 +51,7 @@ import * as Misskey from 'misskey-js';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
+import { signinRequired } from '@/account.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
@@ -47,6 +60,8 @@ import MkFolder from '@/components/MkFolder.vue';
 
 const avatarDecorations = ref<Misskey.entities.AdminAvatarDecorationsListResponse>([]);
 
+const $i = signinRequired();
+
 function add() {
 	avatarDecorations.value.unshift({
 		_id: Math.random().toString(36),
@@ -99,3 +114,55 @@ definePageMetadata(() => ({
 	icon: 'ti ti-sparkles',
 }));
 </script>
+
+<style lang="scss" module>
+.editorRoot {
+	container: editor / inline-size;
+}
+
+.editorWrapper {
+	display: grid;
+	grid-template-columns: 1fr;
+	grid-template-rows: auto auto;
+	gap: var(--margin);
+}
+
+.preview {
+	display: grid;
+	place-items: center;
+	grid-template-columns: 1fr 1fr;
+	grid-template-rows: 1fr;
+	gap: var(--margin);
+}
+
+.previewItem {
+	width: 100%;
+	height: 100%;
+	min-height: 160px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: var(--radius);
+
+	&.light {
+		background: #eee;
+	}
+
+	&.dark {
+		background: #222;
+	}
+}
+
+@container editor (min-width: 600px) {
+	.editorWrapper {
+		grid-template-columns: 200px 1fr;
+		grid-template-rows: 1fr;
+		gap: calc(var(--margin) * 2);
+	}
+
+	.preview {
+		grid-template-columns: 1fr;
+		grid-template-rows: 1fr 1fr;
+	}
+}
+</style>

packages/frontend/src/pages/instance-info.vue

@@ -134,7 +134,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { ref, computed, watch, inject } from 'vue';
 import * as Misskey from 'misskey-js';
-import MkChart from '@/components/MkChart.vue';
+import MkChart, { type ChartSrc } from '@/components/MkChart.vue';
 import MkObjectView from '@/components/MkObjectView.vue';
 import FormLink from '@/components/form/link.vue';
 import MkLink from '@/components/MkLink.vue';
@@ -150,7 +150,7 @@ import { iAmModerator, iAmAdmin } from '@/account.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { i18n } from '@/i18n.js';
 import MkUserCardMini from '@/components/MkUserCardMini.vue';
-import MkPagination from '@/components/MkPagination.vue';
+import MkPagination, { type Paging } from '@/components/MkPagination.vue';
 import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 import { dateString } from '@/filters/date.js';
 import MkTextarea from '@/components/MkTextarea.vue';
@@ -165,7 +165,7 @@ const props = defineProps<{
 
 const tab = ref('overview');
 
-const chartSrc = ref('instance-requests');
+const chartSrc = ref<ChartSrc>('instance-requests');
 const meta = ref<Misskey.entities.AdminMetaResponse | null>(null);
 const instance = ref<Misskey.entities.FederationInstance | null>(null);
 const suspensionState = ref<'none' | 'manuallySuspended' | 'goneSuspended' | 'autoSuspendedForNotResponding'>('none');
@@ -176,7 +176,7 @@ const faviconUrl = ref<string | null>(null);
 const moderationNote = ref('');
 
 const usersPagination = {
-	endpoint: iAmModerator ? 'admin/show-users' : 'users' as const,
+	endpoint: iAmModerator ? 'admin/show-users' : 'users',
 	limit: 10,
 	params: {
 		sort: '+updatedAt',
@@ -184,11 +184,14 @@ const usersPagination = {
 		hostname: props.host,
 	},
 	offsetMode: true,
-};
+} satisfies Paging;
 
-watch(moderationNote, async () => {
+if (iAmModerator) {
+	watch(moderationNote, async () => {
+		if (instance.value == null) return;
 		await misskeyApi('admin/federation/update-instance', { host: instance.value.host, moderationNote: moderationNote.value });
-});
+	});
+}
 
 async function fetch(): Promise<void> {
 	if (iAmAdmin) {
@@ -206,6 +209,7 @@ async function fetch(): Promise<void> {
 }
 
 async function toggleBlock(): Promise<void> {
+	if (!iAmAdmin) return;
 	if (!meta.value) throw new Error('No meta?');
 	if (!instance.value) throw new Error('No instance?');
 	const { host } = instance.value;
@@ -215,6 +219,7 @@ async function toggleBlock(): Promise<void> {
 }
 
 async function toggleSilenced(): Promise<void> {
+	if (!iAmAdmin) return;
 	if (!meta.value) throw new Error('No meta?');
 	if (!instance.value) throw new Error('No instance?');
 	const { host } = instance.value;
@@ -225,6 +230,7 @@ async function toggleSilenced(): Promise<void> {
 }
 
 async function toggleMediaSilenced(): Promise<void> {
+	if (!iAmAdmin) return;
 	if (!meta.value) throw new Error('No meta?');
 	if (!instance.value) throw new Error('No instance?');
 	const { host } = instance.value;
@@ -235,6 +241,7 @@ async function toggleMediaSilenced(): Promise<void> {
 }
 
 async function stopDelivery(): Promise<void> {
+	if (!iAmModerator) return;
 	if (!instance.value) throw new Error('No instance?');
 	suspensionState.value = 'manuallySuspended';
 	await misskeyApi('admin/federation/update-instance', {
@@ -244,6 +251,7 @@ async function stopDelivery(): Promise<void> {
 }
 
 async function resumeDelivery(): Promise<void> {
+	if (!iAmModerator) return;
 	if (!instance.value) throw new Error('No instance?');
 	suspensionState.value = 'none';
 	await misskeyApi('admin/federation/update-instance', {
@@ -253,6 +261,7 @@ async function resumeDelivery(): Promise<void> {
 }
 
 function refreshMetadata(): void {
+	if (!iAmModerator) return;
 	if (!instance.value) throw new Error('No instance?');
 	misskeyApi('admin/federation/refresh-remote-instance-metadata', {
 		host: instance.value.host,

packages/frontend/src/pages/page.vue

@@ -436,13 +436,12 @@ definePageMetadata(() => ({
 		.pageBannerTitleUser {
 			--height: 32px;
 			flex-shrink: 0;
+			line-height: var(--height);
 
 			.avatar {
 				height: var(--height);
 				width: var(--height);
 			}
-
-			line-height: var(--height);
 		}
 
 		.pageBannerTitleSubActions {

packages/frontend/src/style.scss

@@ -17,10 +17,6 @@
 	--minBottomSpacingMobile: calc(72px + max(12px, env(safe-area-inset-bottom, 0px)));
 	--minBottomSpacing: var(--minBottomSpacingMobile);
 
-	@media (max-width: 500px) {
-		--margin: var(--marginHalf);
-	}
-
 	//--ad: rgb(255 169 0 / 10%);
 	--eventFollow: #36aed2;
 	--eventRenote: #36d298;
@@ -29,6 +25,10 @@
 	--eventReaction: #e99a0b;
 	--eventAchievement: #cb9a11;
 	--eventOther: #88a6b7;
+
+	@media (max-width: 500px) {
+		--margin: var(--marginHalf);
+	}
 }
 
 ::selection {

packages/frontend/src/ui/_common_/statusbars.vue

@@ -40,6 +40,14 @@ const XUserList = defineAsyncComponent(() => import('./statusbar-user-list.vue')
 	--nameMargin: 10px;
 	font-size: 0.85em;
 
+	display: flex;
+	vertical-align: bottom;
+	width: 100%;
+	line-height: var(--height);
+	height: var(--height);
+	overflow: clip;
+	contain: strict;
+
 	&.verySmall {
 		--nameMargin: 7px;
 		--height: 16px;
@@ -64,14 +72,6 @@ const XUserList = defineAsyncComponent(() => import('./statusbar-user-list.vue')
 		font-size: 0.9em;
 	}
 
-	display: flex;
-	vertical-align: bottom;
-	width: 100%;
-	line-height: var(--height);
-	height: var(--height);
-	overflow: clip;
-	contain: strict;
-
 	&.black {
 		background: #000;
 		color: #fff;

packages/frontend/src/ui/deck/column.vue

@@ -324,11 +324,11 @@ function onDrop(ev) {
 
 		> .body {
 			background: transparent !important;
+			scrollbar-color: var(--scrollbarHandle) transparent;
 
 			&::-webkit-scrollbar-track {
 				background: transparent;
 			}
-			scrollbar-color: var(--scrollbarHandle) transparent;
 		}
 	}
 
@@ -338,11 +338,11 @@ function onDrop(ev) {
 		> .body {
 			background: var(--bg) !important;
 			overflow-y: scroll !important;
+			scrollbar-color: var(--scrollbarHandle) transparent;
 
 			&::-webkit-scrollbar-track {
 				background: inherit;
 			}
-			scrollbar-color: var(--scrollbarHandle) transparent;
 		}
 	}
 }
@@ -423,10 +423,10 @@ function onDrop(ev) {
 	box-sizing: border-box;
 	container-type: size;
 	background-color: var(--bg);
+	scrollbar-color: var(--scrollbarHandle) var(--panel);
 
 	&::-webkit-scrollbar-track {
 		background: var(--panel);
 	}
-	scrollbar-color: var(--scrollbarHandle) var(--panel);
 }
 </style>

packages/misskey-js/generator/src/generator.ts

@@ -96,15 +96,11 @@ async function generateEndpoints(
 				endpoint.request = req;
 
 				const reqType = new EndpointReqMediaType(path, req);
+				if (reqType.getMediaType() !== 'application/json') {
 					endpointReqMediaTypesSet.add(reqType.getMediaType());
 					endpointReqMediaTypes.push(reqType);
-			} else {
-				endpointReqMediaTypesSet.add('application/json');
-				endpointReqMediaTypes.push(new EndpointReqMediaType(path, undefined, 'application/json'));
 				}
-		} else {
+			}
-			endpointReqMediaTypesSet.add('application/json');
-			endpointReqMediaTypes.push(new EndpointReqMediaType(path, undefined, 'application/json'));
 		}
 
 		if (operation.responses && isResponseObject(operation.responses['200']) && operation.responses['200'].content) {
@@ -158,16 +154,19 @@ async function generateEndpoints(
 	endpointOutputLine.push('');
 
 	function generateEndpointReqMediaTypesType() {
-		return `Record<keyof Endpoints, ${[...endpointReqMediaTypesSet].map((t) => `'${t}'`).join(' | ')}>`;
+		return `{ [K in keyof Endpoints]?: ${[...endpointReqMediaTypesSet].map((t) => `'${t}'`).join(' | ')}; }`;
 	}
 
-	endpointOutputLine.push(`export const endpointReqTypes: ${generateEndpointReqMediaTypesType()} = {`);
+	endpointOutputLine.push(`/**
+ * NOTE: The content-type for all endpoints not listed here is application/json.
+ */`);
+	endpointOutputLine.push('export const endpointReqTypes = {');
 
 	endpointOutputLine.push(
 		...endpointReqMediaTypes.map(it => '\t' + it.toLine()),
 	);
 
-	endpointOutputLine.push('};');
+	endpointOutputLine.push(`} as const satisfies ${generateEndpointReqMediaTypesType()};`);
 	endpointOutputLine.push('');
 
 	await writeFile(endpointOutputPath, endpointOutputLine.join('\n'));

packages/misskey-js/src/api.ts

@@ -56,6 +56,10 @@ export class APIClient {
 		return obj !== null && typeof obj === 'object' && !Array.isArray(obj);
 	}
 
+	private assertSpecialEpReqType(ep: keyof Endpoints): ep is keyof typeof endpointReqTypes {
+		return ep in endpointReqTypes;
+	}
+
 	public request<E extends keyof Endpoints, P extends Endpoints[E]['req']>(
 		endpoint: E,
 		params: P = {} as P,
@@ -63,9 +67,10 @@ export class APIClient {
 	): Promise<SwitchCaseResponseType<E, P>> {
 		return new Promise((resolve, reject) => {
 			let mediaType = 'application/json';
-			if (endpoint in endpointReqTypes) {
+			if (this.assertSpecialEpReqType(endpoint) && endpointReqTypes[endpoint] != null) {
 				mediaType = endpointReqTypes[endpoint];
 			}
+			
 			let payload: FormData | string = '{}';
 
 			if (mediaType === 'application/json') {
@@ -100,7 +105,7 @@ export class APIClient {
 				method: 'POST',
 				body: payload,
 				headers: {
-					'Content-Type': endpointReqTypes[endpoint],
+					'Content-Type': mediaType,
 				},
 				credentials: 'omit',
 				cache: 'no-cache',

packages/misskey-js/src/autogen/endpoint.ts

@@ -955,384 +955,9 @@ export type Endpoints = {
 	'reversi/verify': { req: ReversiVerifyRequest; res: ReversiVerifyResponse };
 }
 
-export const endpointReqTypes: Record<keyof Endpoints, 'application/json' | 'multipart/form-data'> = {
+/**
-	'admin/meta': 'application/json',
+ * NOTE: The content-type for all endpoints not listed here is application/json.
-	'admin/abuse-user-reports': 'application/json',
+ */
-	'admin/abuse-report/notification-recipient/list': 'application/json',
+export const endpointReqTypes = {
-	'admin/abuse-report/notification-recipient/show': 'application/json',
-	'admin/abuse-report/notification-recipient/create': 'application/json',
-	'admin/abuse-report/notification-recipient/update': 'application/json',
-	'admin/abuse-report/notification-recipient/delete': 'application/json',
-	'admin/accounts/create': 'application/json',
-	'admin/accounts/delete': 'application/json',
-	'admin/accounts/find-by-email': 'application/json',
-	'admin/ad/create': 'application/json',
-	'admin/ad/delete': 'application/json',
-	'admin/ad/list': 'application/json',
-	'admin/ad/update': 'application/json',
-	'admin/announcements/create': 'application/json',
-	'admin/announcements/delete': 'application/json',
-	'admin/announcements/list': 'application/json',
-	'admin/announcements/update': 'application/json',
-	'admin/avatar-decorations/create': 'application/json',
-	'admin/avatar-decorations/delete': 'application/json',
-	'admin/avatar-decorations/list': 'application/json',
-	'admin/avatar-decorations/update': 'application/json',
-	'admin/delete-all-files-of-a-user': 'application/json',
-	'admin/unset-user-avatar': 'application/json',
-	'admin/unset-user-banner': 'application/json',
-	'admin/drive/clean-remote-files': 'application/json',
-	'admin/drive/cleanup': 'application/json',
-	'admin/drive/files': 'application/json',
-	'admin/drive/show-file': 'application/json',
-	'admin/emoji/add-aliases-bulk': 'application/json',
-	'admin/emoji/add': 'application/json',
-	'admin/emoji/copy': 'application/json',
-	'admin/emoji/delete-bulk': 'application/json',
-	'admin/emoji/delete': 'application/json',
-	'admin/emoji/import-zip': 'application/json',
-	'admin/emoji/list-remote': 'application/json',
-	'admin/emoji/list': 'application/json',
-	'admin/emoji/remove-aliases-bulk': 'application/json',
-	'admin/emoji/set-aliases-bulk': 'application/json',
-	'admin/emoji/set-category-bulk': 'application/json',
-	'admin/emoji/set-license-bulk': 'application/json',
-	'admin/emoji/update': 'application/json',
-	'admin/federation/delete-all-files': 'application/json',
-	'admin/federation/refresh-remote-instance-metadata': 'application/json',
-	'admin/federation/remove-all-following': 'application/json',
-	'admin/federation/update-instance': 'application/json',
-	'admin/get-index-stats': 'application/json',
-	'admin/get-table-stats': 'application/json',
-	'admin/get-user-ips': 'application/json',
-	'admin/invite/create': 'application/json',
-	'admin/invite/list': 'application/json',
-	'admin/promo/create': 'application/json',
-	'admin/queue/clear': 'application/json',
-	'admin/queue/deliver-delayed': 'application/json',
-	'admin/queue/inbox-delayed': 'application/json',
-	'admin/queue/promote': 'application/json',
-	'admin/queue/stats': 'application/json',
-	'admin/relays/add': 'application/json',
-	'admin/relays/list': 'application/json',
-	'admin/relays/remove': 'application/json',
-	'admin/reset-password': 'application/json',
-	'admin/resolve-abuse-user-report': 'application/json',
-	'admin/send-email': 'application/json',
-	'admin/server-info': 'application/json',
-	'admin/show-moderation-logs': 'application/json',
-	'admin/show-user': 'application/json',
-	'admin/show-users': 'application/json',
-	'admin/suspend-user': 'application/json',
-	'admin/unsuspend-user': 'application/json',
-	'admin/update-meta': 'application/json',
-	'admin/delete-account': 'application/json',
-	'admin/update-user-note': 'application/json',
-	'admin/roles/create': 'application/json',
-	'admin/roles/delete': 'application/json',
-	'admin/roles/list': 'application/json',
-	'admin/roles/show': 'application/json',
-	'admin/roles/update': 'application/json',
-	'admin/roles/assign': 'application/json',
-	'admin/roles/unassign': 'application/json',
-	'admin/roles/update-default-policies': 'application/json',
-	'admin/roles/users': 'application/json',
-	'admin/system-webhook/create': 'application/json',
-	'admin/system-webhook/delete': 'application/json',
-	'admin/system-webhook/list': 'application/json',
-	'admin/system-webhook/show': 'application/json',
-	'admin/system-webhook/update': 'application/json',
-	'announcements': 'application/json',
-	'announcements/show': 'application/json',
-	'antennas/create': 'application/json',
-	'antennas/delete': 'application/json',
-	'antennas/list': 'application/json',
-	'antennas/notes': 'application/json',
-	'antennas/show': 'application/json',
-	'antennas/update': 'application/json',
-	'ap/get': 'application/json',
-	'ap/show': 'application/json',
-	'app/create': 'application/json',
-	'app/show': 'application/json',
-	'auth/accept': 'application/json',
-	'auth/session/generate': 'application/json',
-	'auth/session/show': 'application/json',
-	'auth/session/userkey': 'application/json',
-	'blocking/create': 'application/json',
-	'blocking/delete': 'application/json',
-	'blocking/list': 'application/json',
-	'channels/create': 'application/json',
-	'channels/featured': 'application/json',
-	'channels/follow': 'application/json',
-	'channels/followed': 'application/json',
-	'channels/owned': 'application/json',
-	'channels/show': 'application/json',
-	'channels/timeline': 'application/json',
-	'channels/unfollow': 'application/json',
-	'channels/update': 'application/json',
-	'channels/favorite': 'application/json',
-	'channels/unfavorite': 'application/json',
-	'channels/my-favorites': 'application/json',
-	'channels/search': 'application/json',
-	'charts/active-users': 'application/json',
-	'charts/ap-request': 'application/json',
-	'charts/drive': 'application/json',
-	'charts/federation': 'application/json',
-	'charts/instance': 'application/json',
-	'charts/notes': 'application/json',
-	'charts/user/drive': 'application/json',
-	'charts/user/following': 'application/json',
-	'charts/user/notes': 'application/json',
-	'charts/user/pv': 'application/json',
-	'charts/user/reactions': 'application/json',
-	'charts/users': 'application/json',
-	'clips/add-note': 'application/json',
-	'clips/remove-note': 'application/json',
-	'clips/create': 'application/json',
-	'clips/delete': 'application/json',
-	'clips/list': 'application/json',
-	'clips/notes': 'application/json',
-	'clips/show': 'application/json',
-	'clips/update': 'application/json',
-	'clips/favorite': 'application/json',
-	'clips/unfavorite': 'application/json',
-	'clips/my-favorites': 'application/json',
-	'drive': 'application/json',
-	'drive/files': 'application/json',
-	'drive/files/attached-notes': 'application/json',
-	'drive/files/check-existence': 'application/json',
 	'drive/files/create': 'multipart/form-data',
-	'drive/files/delete': 'application/json',
+} as const satisfies { [K in keyof Endpoints]?: 'multipart/form-data'; };
-	'drive/files/find-by-hash': 'application/json',
-	'drive/files/find': 'application/json',
-	'drive/files/show': 'application/json',
-	'drive/files/update': 'application/json',
-	'drive/files/upload-from-url': 'application/json',
-	'drive/folders': 'application/json',
-	'drive/folders/create': 'application/json',
-	'drive/folders/delete': 'application/json',
-	'drive/folders/find': 'application/json',
-	'drive/folders/show': 'application/json',
-	'drive/folders/update': 'application/json',
-	'drive/stream': 'application/json',
-	'email-address/available': 'application/json',
-	'endpoint': 'application/json',
-	'endpoints': 'application/json',
-	'export-custom-emojis': 'application/json',
-	'federation/followers': 'application/json',
-	'federation/following': 'application/json',
-	'federation/instances': 'application/json',
-	'federation/show-instance': 'application/json',
-	'federation/update-remote-user': 'application/json',
-	'federation/users': 'application/json',
-	'federation/stats': 'application/json',
-	'following/create': 'application/json',
-	'following/delete': 'application/json',
-	'following/update': 'application/json',
-	'following/update-all': 'application/json',
-	'following/invalidate': 'application/json',
-	'following/requests/accept': 'application/json',
-	'following/requests/cancel': 'application/json',
-	'following/requests/list': 'application/json',
-	'following/requests/reject': 'application/json',
-	'gallery/featured': 'application/json',
-	'gallery/popular': 'application/json',
-	'gallery/posts': 'application/json',
-	'gallery/posts/create': 'application/json',
-	'gallery/posts/delete': 'application/json',
-	'gallery/posts/like': 'application/json',
-	'gallery/posts/show': 'application/json',
-	'gallery/posts/unlike': 'application/json',
-	'gallery/posts/update': 'application/json',
-	'get-online-users-count': 'application/json',
-	'get-avatar-decorations': 'application/json',
-	'hashtags/list': 'application/json',
-	'hashtags/search': 'application/json',
-	'hashtags/show': 'application/json',
-	'hashtags/trend': 'application/json',
-	'hashtags/users': 'application/json',
-	'i': 'application/json',
-	'i/2fa/done': 'application/json',
-	'i/2fa/key-done': 'application/json',
-	'i/2fa/password-less': 'application/json',
-	'i/2fa/register-key': 'application/json',
-	'i/2fa/register': 'application/json',
-	'i/2fa/update-key': 'application/json',
-	'i/2fa/remove-key': 'application/json',
-	'i/2fa/unregister': 'application/json',
-	'i/apps': 'application/json',
-	'i/authorized-apps': 'application/json',
-	'i/claim-achievement': 'application/json',
-	'i/change-password': 'application/json',
-	'i/delete-account': 'application/json',
-	'i/export-blocking': 'application/json',
-	'i/export-following': 'application/json',
-	'i/export-mute': 'application/json',
-	'i/export-notes': 'application/json',
-	'i/export-clips': 'application/json',
-	'i/export-favorites': 'application/json',
-	'i/export-user-lists': 'application/json',
-	'i/export-antennas': 'application/json',
-	'i/favorites': 'application/json',
-	'i/gallery/likes': 'application/json',
-	'i/gallery/posts': 'application/json',
-	'i/import-blocking': 'application/json',
-	'i/import-following': 'application/json',
-	'i/import-muting': 'application/json',
-	'i/import-user-lists': 'application/json',
-	'i/import-antennas': 'application/json',
-	'i/notifications': 'application/json',
-	'i/notifications-grouped': 'application/json',
-	'i/page-likes': 'application/json',
-	'i/pages': 'application/json',
-	'i/pin': 'application/json',
-	'i/read-all-unread-notes': 'application/json',
-	'i/read-announcement': 'application/json',
-	'i/regenerate-token': 'application/json',
-	'i/registry/get-all': 'application/json',
-	'i/registry/get-detail': 'application/json',
-	'i/registry/get': 'application/json',
-	'i/registry/keys-with-type': 'application/json',
-	'i/registry/keys': 'application/json',
-	'i/registry/remove': 'application/json',
-	'i/registry/scopes-with-domain': 'application/json',
-	'i/registry/set': 'application/json',
-	'i/revoke-token': 'application/json',
-	'i/signin-history': 'application/json',
-	'i/unpin': 'application/json',
-	'i/update-email': 'application/json',
-	'i/update': 'application/json',
-	'i/move': 'application/json',
-	'i/webhooks/create': 'application/json',
-	'i/webhooks/list': 'application/json',
-	'i/webhooks/show': 'application/json',
-	'i/webhooks/update': 'application/json',
-	'i/webhooks/delete': 'application/json',
-	'invite/create': 'application/json',
-	'invite/delete': 'application/json',
-	'invite/list': 'application/json',
-	'invite/limit': 'application/json',
-	'meta': 'application/json',
-	'emojis': 'application/json',
-	'emoji': 'application/json',
-	'miauth/gen-token': 'application/json',
-	'mute/create': 'application/json',
-	'mute/delete': 'application/json',
-	'mute/list': 'application/json',
-	'renote-mute/create': 'application/json',
-	'renote-mute/delete': 'application/json',
-	'renote-mute/list': 'application/json',
-	'my/apps': 'application/json',
-	'notes': 'application/json',
-	'notes/children': 'application/json',
-	'notes/clips': 'application/json',
-	'notes/conversation': 'application/json',
-	'notes/create': 'application/json',
-	'notes/delete': 'application/json',
-	'notes/favorites/create': 'application/json',
-	'notes/favorites/delete': 'application/json',
-	'notes/featured': 'application/json',
-	'notes/global-timeline': 'application/json',
-	'notes/hybrid-timeline': 'application/json',
-	'notes/local-timeline': 'application/json',
-	'notes/mentions': 'application/json',
-	'notes/polls/recommendation': 'application/json',
-	'notes/polls/vote': 'application/json',
-	'notes/reactions': 'application/json',
-	'notes/reactions/create': 'application/json',
-	'notes/reactions/delete': 'application/json',
-	'notes/renotes': 'application/json',
-	'notes/replies': 'application/json',
-	'notes/search-by-tag': 'application/json',
-	'notes/search': 'application/json',
-	'notes/show': 'application/json',
-	'notes/state': 'application/json',
-	'notes/thread-muting/create': 'application/json',
-	'notes/thread-muting/delete': 'application/json',
-	'notes/timeline': 'application/json',
-	'notes/translate': 'application/json',
-	'notes/unrenote': 'application/json',
-	'notes/user-list-timeline': 'application/json',
-	'notifications/create': 'application/json',
-	'notifications/flush': 'application/json',
-	'notifications/mark-all-as-read': 'application/json',
-	'notifications/test-notification': 'application/json',
-	'page-push': 'application/json',
-	'pages/create': 'application/json',
-	'pages/delete': 'application/json',
-	'pages/featured': 'application/json',
-	'pages/like': 'application/json',
-	'pages/show': 'application/json',
-	'pages/unlike': 'application/json',
-	'pages/update': 'application/json',
-	'flash/create': 'application/json',
-	'flash/delete': 'application/json',
-	'flash/featured': 'application/json',
-	'flash/like': 'application/json',
-	'flash/show': 'application/json',
-	'flash/unlike': 'application/json',
-	'flash/update': 'application/json',
-	'flash/my': 'application/json',
-	'flash/my-likes': 'application/json',
-	'ping': 'application/json',
-	'pinned-users': 'application/json',
-	'promo/read': 'application/json',
-	'roles/list': 'application/json',
-	'roles/show': 'application/json',
-	'roles/users': 'application/json',
-	'roles/notes': 'application/json',
-	'request-reset-password': 'application/json',
-	'reset-db': 'application/json',
-	'reset-password': 'application/json',
-	'server-info': 'application/json',
-	'stats': 'application/json',
-	'sw/show-registration': 'application/json',
-	'sw/update-registration': 'application/json',
-	'sw/register': 'application/json',
-	'sw/unregister': 'application/json',
-	'test': 'application/json',
-	'username/available': 'application/json',
-	'users': 'application/json',
-	'users/clips': 'application/json',
-	'users/followers': 'application/json',
-	'users/following': 'application/json',
-	'users/gallery/posts': 'application/json',
-	'users/get-frequently-replied-users': 'application/json',
-	'users/featured-notes': 'application/json',
-	'users/lists/create': 'application/json',
-	'users/lists/delete': 'application/json',
-	'users/lists/list': 'application/json',
-	'users/lists/pull': 'application/json',
-	'users/lists/push': 'application/json',
-	'users/lists/show': 'application/json',
-	'users/lists/favorite': 'application/json',
-	'users/lists/unfavorite': 'application/json',
-	'users/lists/update': 'application/json',
-	'users/lists/create-from-public': 'application/json',
-	'users/lists/update-membership': 'application/json',
-	'users/lists/get-memberships': 'application/json',
-	'users/notes': 'application/json',
-	'users/pages': 'application/json',
-	'users/flashs': 'application/json',
-	'users/reactions': 'application/json',
-	'users/recommendation': 'application/json',
-	'users/relation': 'application/json',
-	'users/report-abuse': 'application/json',
-	'users/search-by-username-and-host': 'application/json',
-	'users/search': 'application/json',
-	'users/show': 'application/json',
-	'users/achievements': 'application/json',
-	'users/update-memo': 'application/json',
-	'fetch-rss': 'application/json',
-	'fetch-external-resources': 'application/json',
-	'retention': 'application/json',
-	'bubble-game/register': 'application/json',
-	'bubble-game/ranking': 'application/json',
-	'reversi/cancel-match': 'application/json',
-	'reversi/games': 'application/json',
-	'reversi/match': 'application/json',
-	'reversi/invitations': 'application/json',
-	'reversi/show-game': 'application/json',
-	'reversi/surrender': 'application/json',
-	'reversi/verify': 'application/json',
-};