Merge pull request #10990 from misskey-dev/develop

Release: 13.13.2

CHANGELOG.md

@@ -12,16 +12,6 @@
 
 -->
 
-## 13.x.x (unreleased)
-
-### General
-- identicon生成を無効にしてパフォーマンスを向上させることができるようになりました
-- サーバーのマシン情報の公開を無効にしてパフォーマンスを向上させることができるようになりました
-
-### Client
-- Fix: サーバーメトリクスが90度傾いている
-- Fix: sparkle内にリンクを入れるとクリック不能になる問題の修正
-
 ## 13.13.2
 
 ### General

locales/index.d.ts

@@ -1066,8 +1066,6 @@ export interface Locale {
     "additionalEmojiDictionary": string;
     "installed": string;
     "branding": string;
-    "enableServerMachineStats": string;
-    "enableIdenticonGeneration": string;
     "_initialAccountSetting": {
         "accountCreated": string;
         "letsStartAccountSetup": string;

locales/ja-JP.yml

@@ -1063,8 +1063,6 @@ goToMisskey: "Misskeyへ"
 additionalEmojiDictionary: "絵文字の追加辞書"
 installed: "インストール済み"
 branding: "ブランディング"
-enableServerMachineStats: "サーバーのマシン情報を公開する"
-enableIdenticonGeneration: "ユーザーごとのIdenticon生成を有効にする"
 
 _initialAccountSetting:
   accountCreated: "アカウントの作成が完了しました！"

package.json

@@ -56,11 +56,11 @@
 	"devDependencies": {
 		"@types/gulp": "4.0.10",
 		"@types/gulp-rename": "2.0.1",
-		"@typescript-eslint/eslint-plugin": "5.60.0",
-		"@typescript-eslint/parser": "5.60.0",
+		"@typescript-eslint/eslint-plugin": "5.59.8",
+		"@typescript-eslint/parser": "5.59.8",
 		"cross-env": "7.0.3",
-		"cypress": "12.15.0",
-		"eslint": "8.43.0",
+		"cypress": "12.13.0",
+		"eslint": "8.41.0",
 		"start-server-and-test": "2.0.0"
 	},
 	"optionalDependencies": {

packages/backend/.swcrc

@@ -17,7 +17,7 @@
 		"paths": {
 			"@/*": ["*"]
 		},
-		"target": "es2022"
+		"target": "es2021"
 	},
 	"minify": false
 }

packages/backend/migration/1688280713783-add-meta-options.js

@@ -1,13 +0,0 @@
-export class AddMetaOptions1688280713783 {
-    name = 'AddMetaOptions1688280713783'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "enableServerMachineStats" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "enableIdenticonGeneration" boolean NOT NULL DEFAULT true`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableIdenticonGeneration"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableServerMachineStats"`);
-    }
-}

packages/backend/package.json

@@ -54,32 +54,32 @@
 		"@aws-sdk/client-s3": "3.321.1",
 		"@aws-sdk/lib-storage": "3.321.1",
 		"@aws-sdk/node-http-handler": "3.321.1",
-		"@bull-board/api": "5.5.3",
-		"@bull-board/fastify": "5.5.3",
-		"@bull-board/ui": "5.5.3",
+		"@bull-board/api": "5.2.0",
+		"@bull-board/fastify": "5.2.0",
+		"@bull-board/ui": "5.2.0",
 		"@discordapp/twemoji": "14.1.2",
-		"@fastify/accepts": "4.2.0",
+		"@fastify/accepts": "4.1.0",
 		"@fastify/cookie": "8.3.0",
 		"@fastify/cors": "8.3.0",
-		"@fastify/http-proxy": "9.2.1",
-		"@fastify/multipart": "7.7.0",
+		"@fastify/http-proxy": "9.1.0",
+		"@fastify/multipart": "7.6.0",
 		"@fastify/static": "6.10.2",
 		"@fastify/view": "7.4.1",
-		"@nestjs/common": "10.0.3",
-		"@nestjs/core": "10.0.3",
-		"@nestjs/testing": "10.0.3",
+		"@nestjs/common": "9.4.2",
+		"@nestjs/core": "9.4.2",
+		"@nestjs/testing": "9.4.2",
 		"@peertube/http-signature": "1.7.0",
-		"@sinonjs/fake-timers": "10.3.0",
+		"@sinonjs/fake-timers": "10.2.0",
 		"@swc/cli": "0.1.62",
-		"@swc/core": "1.3.66",
+		"@swc/core": "1.3.61",
 		"accepts": "1.3.8",
 		"ajv": "8.12.0",
 		"archiver": "5.3.1",
 		"autwh": "0.1.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
-		"bullmq": "4.1.0",
-		"cacheable-lookup": "7.0.0",
+		"bullmq": "3.15.0",
+		"cacheable-lookup": "6.1.0",
 		"cbor": "9.0.0",
 		"chalk": "5.2.0",
 		"chalk-template": "0.4.0",
@@ -90,24 +90,23 @@
 		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
 		"escape-regexp": "0.0.1",
-		"fastify": "4.18.0",
+		"fastify": "4.17.0",
 		"feed": "4.2.2",
-		"file-type": "18.5.0",
+		"file-type": "18.4.0",
 		"fluent-ffmpeg": "2.1.2",
 		"form-data": "4.0.0",
-		"got": "13.0.0",
+		"got": "12.6.0",
 		"happy-dom": "9.20.3",
 		"hpagent": "1.2.0",
 		"ioredis": "5.3.2",
 		"ip-cidr": "3.1.0",
-		"ipaddr.js": "2.1.0",
 		"is-svg": "4.3.2",
 		"js-yaml": "4.1.0",
 		"jsdom": "22.1.0",
 		"json5": "2.2.3",
 		"jsonld": "8.2.0",
 		"jsrsasign": "10.8.6",
-		"meilisearch": "0.33.0",
+		"meilisearch": "0.32.5",
 		"mfm-js": "0.23.3",
 		"mime-types": "2.1.35",
 		"misskey-js": "workspace:*",
@@ -121,6 +120,7 @@
 		"otpauth": "9.1.2",
 		"parse5": "7.1.2",
 		"pg": "8.11.0",
+		"private-ip": "3.0.0",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
 		"pug": "3.0.2",
@@ -129,34 +129,36 @@
 		"qrcode": "1.5.3",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.19.1",
+		"re2": "1.19.0",
 		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
+		"rndstr": "1.0.0",
 		"rss-parser": "3.13.0",
 		"rxjs": "7.8.1",
 		"s-age": "1.1.2",
-		"sanitize-html": "2.11.0",
-		"semver": "7.5.3",
+		"sanitize-html": "2.10.0",
+		"seedrandom": "3.0.5",
+		"semver": "7.5.1",
 		"sharp": "0.32.1",
 		"sharp-read-bmp": "github:misskey-dev/sharp-read-bmp",
 		"slacc": "0.0.9",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"summaly": "github:misskey-dev/summaly",
-		"systeminformation": "5.18.4",
+		"systeminformation": "5.17.16",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.1",
 		"tsc-alias": "1.8.6",
 		"tsconfig-paths": "4.2.0",
 		"twemoji-parser": "14.0.0",
-		"typeorm": "0.3.17",
+		"typeorm": "0.3.16",
 		"typescript": "5.1.3",
 		"ulid": "2.3.0",
 		"unzipper": "0.10.14",
 		"uuid": "9.0.0",
 		"vary": "1.1.2",
-		"web-push": "3.6.3",
+		"web-push": "3.6.1",
 		"ws": "8.13.0",
 		"xev": "3.0.2"
 	},
@@ -174,15 +176,14 @@
 		"@types/jest": "29.5.2",
 		"@types/js-yaml": "4.0.5",
 		"@types/jsdom": "21.1.1",
-		"@types/jsonld": "1.5.9",
+		"@types/jsonld": "1.5.8",
 		"@types/jsrsasign": "10.5.8",
 		"@types/mime-types": "2.1.1",
-		"@types/ms": "^0.7.31",
-		"@types/node": "20.3.1",
+		"@types/node": "20.2.5",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.8",
 		"@types/oauth": "0.9.1",
-		"@types/pg": "8.10.2",
+		"@types/pg": "8.10.1",
 		"@types/pug": "2.0.6",
 		"@types/punycode": "2.1.0",
 		"@types/qrcode": "1.5.0",
@@ -197,20 +198,19 @@
 		"@types/tinycolor2": "1.4.3",
 		"@types/tmp": "0.2.3",
 		"@types/unzipper": "0.10.6",
-		"@types/uuid": "9.0.2",
+		"@types/uuid": "9.0.1",
 		"@types/vary": "1.1.0",
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
-		"@types/ws": "8.5.5",
-		"@typescript-eslint/eslint-plugin": "5.60.0",
-		"@typescript-eslint/parser": "5.60.0",
+		"@types/ws": "8.5.4",
+		"@typescript-eslint/eslint-plugin": "5.59.8",
+		"@typescript-eslint/parser": "5.59.8",
 		"aws-sdk-client-mock": "2.1.1",
 		"cross-env": "7.0.3",
-		"eslint": "8.43.0",
+		"eslint": "8.41.0",
 		"eslint-plugin-import": "2.27.5",
 		"execa": "6.1.0",
 		"jest": "29.5.0",
-		"jest-mock": "29.5.0",
-		"schema-type": "github:misskey-dev/schema-type"
+		"jest-mock": "29.5.0"
 	}
 }

packages/backend/src/core/AchievementService.ts

@@ -4,7 +4,83 @@ import type { User } from '@/models/entities/User.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { NotificationService } from '@/core/NotificationService.js';
-import { ACHIEVEMENT_TYPES } from 'misskey-js';
+
+export const ACHIEVEMENT_TYPES = [
+	'notes1',
+	'notes10',
+	'notes100',
+	'notes500',
+	'notes1000',
+	'notes5000',
+	'notes10000',
+	'notes20000',
+	'notes30000',
+	'notes40000',
+	'notes50000',
+	'notes60000',
+	'notes70000',
+	'notes80000',
+	'notes90000',
+	'notes100000',
+	'login3',
+	'login7',
+	'login15',
+	'login30',
+	'login60',
+	'login100',
+	'login200',
+	'login300',
+	'login400',
+	'login500',
+	'login600',
+	'login700',
+	'login800',
+	'login900',
+	'login1000',
+	'passedSinceAccountCreated1',
+	'passedSinceAccountCreated2',
+	'passedSinceAccountCreated3',
+	'loggedInOnBirthday',
+	'loggedInOnNewYearsDay',
+	'noteClipped1',
+	'noteFavorited1',
+	'myNoteFavorited1',
+	'profileFilled',
+	'markedAsCat',
+	'following1',
+	'following10',
+	'following50',
+	'following100',
+	'following300',
+	'followers1',
+	'followers10',
+	'followers50',
+	'followers100',
+	'followers300',
+	'followers500',
+	'followers1000',
+	'collectAchievements30',
+	'viewAchievements3min',
+	'iLoveMisskey',
+	'foundTreasure',
+	'client30min',
+	'client60min',
+	'noteDeletedWithin1min',
+	'postedAtLateNight',
+	'postedAt0min0sec',
+	'selfQuote',
+	'htl20npm',
+	'viewInstanceChart',
+	'outputHelloWorldOnScratchpad',
+	'open3windows',
+	'driveFolderCircularReference',
+	'reactWithoutRead',
+	'clickedClickHere',
+	'justPlainLucky',
+	'setNameToSyuilo',
+	'cookieClicked',
+	'brainDiver',
+] as const;
 
 @Injectable()
 export class AchievementService {

packages/backend/src/core/AntennaService.ts

@@ -10,7 +10,7 @@ import { isUserRelated } from '@/misc/is-user-related.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { PushNotificationService } from '@/core/PushNotificationService.js';
 import * as Acct from '@/misc/acct.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
 import { DI } from '@/di-symbols.js';
 import type { MutingsRepository, NotesRepository, AntennasRepository, UserListJoiningsRepository } from '@/models/index.js';
 import { UtilityService } from '@/core/UtilityService.js';

packages/backend/src/core/DownloadService.ts

@@ -2,7 +2,8 @@ import * as fs from 'node:fs';
 import * as stream from 'node:stream';
 import * as util from 'node:util';
 import { Inject, Injectable } from '@nestjs/common';
-import ipaddr from 'ipaddr.js';
+import IPCIDR from 'ip-cidr';
+import PrivateIp from 'private-ip';
 import chalk from 'chalk';
 import got, * as Got from 'got';
 import { parse } from 'content-disposition';
@@ -122,15 +123,15 @@ export class DownloadService {
 	public async downloadTextFile(url: string): Promise<string> {
 		// Create temp file
 		const [path, cleanup] = await createTemp();
-
+	
 		this.logger.info(`text file: Temp file is ${path}`);
-
+	
 		try {
 			// write content at URL to temp file
 			await this.downloadUrl(url, path);
-
+	
 			const text = await util.promisify(fs.readFile)(path, 'utf8');
-
+	
 			return text;
 		} finally {
 			cleanup();
@@ -139,14 +140,13 @@ export class DownloadService {
 
 	@bindThis
 	private isPrivateIp(ip: string): boolean {
-		const parsedIp = ipaddr.parse(ip);
-
 		for (const net of this.config.allowedPrivateNetworks ?? []) {
-			if (parsedIp.match(ipaddr.parseCIDR(net))) {
+			const cidr = new IPCIDR(net);
+			if (cidr.contains(ip)) {
 				return false;
 			}
 		}
 
-		return parsedIp.range() !== 'unicast';
+		return PrivateIp(ip) ?? false;
 	}
 }

packages/backend/src/core/GlobalEventService.ts

@@ -16,11 +16,11 @@ import type {
 	UserListStreamTypes,
 	RoleTimelineStreamTypes,
 } from '@/server/api/stream/types.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { bindThis } from '@/decorators.js';
-import { Role } from '@/models/index.js';
+import { Role } from '@/models';
 
 @Injectable()
 export class GlobalEventService {

packages/backend/src/core/IdService.ts

@@ -5,7 +5,7 @@ import type { Config } from '@/config.js';
 import { genAid, parseAid } from '@/misc/id/aid.js';
 import { genMeid, parseMeid } from '@/misc/id/meid.js';
 import { genMeidg, parseMeidg } from '@/misc/id/meidg.js';
-import { genObjectId, parseObjectId } from '@/misc/id/object-id.js';
+import { genObjectId } from '@/misc/id/object-id.js';
 import { bindThis } from '@/decorators.js';
 import { parseUlid } from '@/misc/id/ulid.js';
 
@@ -38,7 +38,7 @@ export class IdService {
 	public parse(id: string): { date: Date; } {
 		switch (this.method) {
 			case 'aid': return parseAid(id);
-			case 'objectid': return parseObjectId(id);
+			case 'objectid':
 			case 'meid': return parseMeid(id);
 			case 'meidg': return parseMeidg(id);
 			case 'ulid': return parseUlid(id);

packages/backend/src/core/LoggerService.ts

@@ -3,7 +3,7 @@ import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
-import type { KEYWORD } from 'color-convert/conversions.js';
+import type { KEYWORD } from 'color-convert/conversions';
 
 @Injectable()
 export class LoggerService {

packages/backend/src/core/NoteReadService.ts

@@ -3,7 +3,7 @@ import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import { In } from 'typeorm';
 import { DI } from '@/di-symbols.js';
 import type { User } from '@/models/entities/User.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
 import type { Note } from '@/models/entities/Note.js';
 import { IdService } from '@/core/IdService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';

packages/backend/src/core/PushNotificationService.ts

@@ -3,7 +3,7 @@ import push from 'web-push';
 import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema';
 import { getNoteSummary } from '@/misc/get-note-summary.js';
 import type { SwSubscription, SwSubscriptionsRepository } from '@/models/index.js';
 import { MetaService } from '@/core/MetaService.js';

packages/backend/src/core/QueueService.ts

@@ -400,11 +400,11 @@ export class QueueService {
 		this.deliverQueue.once('cleaned', (jobs, status) => {
 			//deliverLogger.succ(`Cleaned ${jobs.length} ${status} jobs`);
 		});
-		this.deliverQueue.clean(0, 0, 'delayed');
+		this.deliverQueue.clean(0, Infinity, 'delayed');
 
 		this.inboxQueue.once('cleaned', (jobs, status) => {
 			//inboxLogger.succ(`Cleaned ${jobs.length} ${status} jobs`);
 		});
-		this.inboxQueue.clean(0, 0, 'delayed');
+		this.inboxQueue.clean(0, Infinity, 'delayed');
 	}
 }

packages/backend/src/core/RoleService.ts

@@ -8,12 +8,12 @@ import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { MetaService } from '@/core/MetaService.js';
 import { CacheService } from '@/core/CacheService.js';
-import type { RoleCondFormulaValue } from 'misskey-js/built/schemas/role.js';
+import type { RoleCondFormulaValue } from '@/models/entities/Role.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { StreamMessages } from '@/server/api/stream/types.js';
 import { IdService } from '@/core/IdService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 export type RolePolicies = {

packages/backend/src/core/UserBlockingService.ts

@@ -107,10 +107,7 @@ export class UserBlockingService implements OnModuleInit {
 		if (this.userEntityService.isLocalUser(followee)) {
 			this.userEntityService.pack(followee, followee, {
 				detail: true,
-			}).then(packed => {
-				this.globalEventService.publishMainStream(followee.id, 'meUpdated', packed);
-				return packed; // somehow this is needed by typescript
-			});
+			}).then(packed => this.globalEventService.publishMainStream(followee.id, 'meUpdated', packed));
 		}
 
 		if (this.userEntityService.isLocalUser(follower) && !silent) {
@@ -125,8 +122,6 @@ export class UserBlockingService implements OnModuleInit {
 						user: packed,
 					});
 				}
-
-				return packed; // somehow this is needed by typescript
 			});
 		}
 

packages/backend/src/core/UserFollowingService.ts

@@ -7,7 +7,7 @@ import PerUserFollowingChart from '@/core/chart/charts/per-user-following.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { IdService } from '@/core/IdService.js';
 import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
 import InstanceChart from '@/core/chart/charts/instance.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { WebhookService } from '@/core/WebhookService.js';
@@ -267,7 +267,7 @@ export class UserFollowingService implements OnModuleInit {
 			this.userEntityService.pack(followee.id, follower, {
 				detail: true,
 			}).then(async packed => {
-				this.globalEventService.publishMainStream(follower.id, 'follow', packed);
+				this.globalEventService.publishMainStream(follower.id, 'follow', packed as Packed<'UserDetailedNotMe'>);
 
 				const webhooks = (await this.webhookService.getActiveWebhooks()).filter(x => x.userId === follower.id && x.on.includes('follow'));
 				for (const webhook of webhooks) {

packages/backend/src/core/chart/charts/entities/active-users.ts

@@ -1,7 +1,17 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
-export const name = 'activeUsers' as const;
-export const schema = chartsSchemas[name];
+export const name = 'activeUsers';
+
+export const schema = {
+	'readWrite': { intersection: ['read', 'write'] },
+	'read': { uniqueIncrement: true },
+	'write': { uniqueIncrement: true },
+	'registeredWithinWeek': { uniqueIncrement: true },
+	'registeredWithinMonth': { uniqueIncrement: true },
+	'registeredWithinYear': { uniqueIncrement: true },
+	'registeredOutsideWeek': { uniqueIncrement: true },
+	'registeredOutsideMonth': { uniqueIncrement: true },
+	'registeredOutsideYear': { uniqueIncrement: true },
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema);

packages/backend/src/core/chart/charts/entities/ap-request.ts

@@ -1,7 +1,11 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
-export const name = 'apRequest' as const;
-export const schema = chartsSchemas[name];
+export const name = 'apRequest';
+
+export const schema = {
+	'deliverFailed': { },
+	'deliverSucceeded': { },
+	'inboxReceived': { },
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema);

packages/backend/src/core/chart/charts/entities/drive.ts

@@ -1,7 +1,16 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
-export const name = 'drive' as const;
-export const schema = chartsSchemas[name];
+export const name = 'drive';
+
+export const schema = {
+	'local.incCount': {},
+	'local.incSize': {}, // in kilobyte
+	'local.decCount': {},
+	'local.decSize': {}, // in kilobyte
+	'remote.incCount': {},
+	'remote.incSize': {}, // in kilobyte
+	'remote.decCount': {},
+	'remote.decSize': {}, // in kilobyte
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema);

packages/backend/src/core/chart/charts/entities/federation.ts

@@ -1,7 +1,16 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
-export const name = 'federation' as const;
-export const schema = chartsSchemas[name];
+export const name = 'federation';
+
+export const schema = {
+	'deliveredInstances': { uniqueIncrement: true, range: 'small' },
+	'inboxInstances': { uniqueIncrement: true, range: 'small' },
+	'stalled': { uniqueIncrement: true, range: 'small' },
+	'sub': { accumulate: true, range: 'small' },
+	'pub': { accumulate: true, range: 'small' },
+	'pubsub': { accumulate: true, range: 'small' },
+	'subActive': { accumulate: true, range: 'small' },
+	'pubActive': { accumulate: true, range: 'small' },
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema);

packages/backend/src/core/chart/charts/entities/instance.ts

@@ -1,7 +1,32 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
-export const name = 'instance' as const;
-export const schema = chartsSchemas[name];
+export const name = 'instance';
+
+export const schema = {
+	'requests.failed': { range: 'small' },
+	'requests.succeeded': { range: 'small' },
+	'requests.received': { range: 'small' },
+	'notes.total': { accumulate: true },
+	'notes.inc': {},
+	'notes.dec': {},
+	'notes.diffs.normal': {},
+	'notes.diffs.reply': {},
+	'notes.diffs.renote': {},
+	'notes.diffs.withFile': {},
+	'users.total': { accumulate: true },
+	'users.inc': { range: 'small' },
+	'users.dec': { range: 'small' },
+	'following.total': { accumulate: true },
+	'following.inc': { range: 'small' },
+	'following.dec': { range: 'small' },
+	'followers.total': { accumulate: true },
+	'followers.inc': { range: 'small' },
+	'followers.dec': { range: 'small' },
+	'drive.totalFiles': { accumulate: true },
+	'drive.incFiles': {},
+	'drive.decFiles': {},
+	'drive.incUsage': {}, // in kilobyte
+	'drive.decUsage': {}, // in kilobyte
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema, true);

packages/backend/src/core/chart/charts/entities/notes.ts

@@ -1,7 +1,22 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
-export const name = 'notes' as const;
-export const schema = chartsSchemas[name];
+export const name = 'notes';
+
+export const schema = {
+	'local.total': { accumulate: true },
+	'local.inc': {},
+	'local.dec': {},
+	'local.diffs.normal': {},
+	'local.diffs.reply': {},
+	'local.diffs.renote': {},
+	'local.diffs.withFile': {},
+	'remote.total': { accumulate: true },
+	'remote.inc': {},
+	'remote.dec': {},
+	'remote.diffs.normal': {},
+	'remote.diffs.reply': {},
+	'remote.diffs.renote': {},
+	'remote.diffs.withFile': {},
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema);

packages/backend/src/core/chart/charts/entities/per-user-drive.ts

@@ -1,7 +1,14 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
-export const name = 'perUserDrive' as const;
-export const schema = chartsSchemas[name];
+export const name = 'perUserDrive';
+
+export const schema = {
+	'totalCount': { accumulate: true },
+	'totalSize': { accumulate: true }, // in kilobyte
+	'incCount': { range: 'small' },
+	'incSize': {}, // in kilobyte
+	'decCount': { range: 'small' },
+	'decSize': {}, // in kilobyte
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema, true);

packages/backend/src/core/chart/charts/entities/per-user-following.ts

@@ -1,7 +1,20 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
-export const name = 'perUserFollowing' as const;
-export const schema = chartsSchemas[name];
+export const name = 'perUserFollowing';
+
+export const schema = {
+	'local.followings.total': { accumulate: true },
+	'local.followings.inc': { range: 'small' },
+	'local.followings.dec': { range: 'small' },
+	'local.followers.total': { accumulate: true },
+	'local.followers.inc': { range: 'small' },
+	'local.followers.dec': { range: 'small' },
+	'remote.followings.total': { accumulate: true },
+	'remote.followings.inc': { range: 'small' },
+	'remote.followings.dec': { range: 'small' },
+	'remote.followers.total': { accumulate: true },
+	'remote.followers.inc': { range: 'small' },
+	'remote.followers.dec': { range: 'small' },
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema, true);

packages/backend/src/core/chart/charts/entities/per-user-notes.ts

@@ -1,7 +1,15 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
-export const name = 'perUserNotes' as const;
-export const schema = chartsSchemas[name];
+export const name = 'perUserNotes';
+
+export const schema = {
+	'total': { accumulate: true },
+	'inc': { range: 'small' },
+	'dec': { range: 'small' },
+	'diffs.normal': { range: 'small' },
+	'diffs.reply': { range: 'small' },
+	'diffs.renote': { range: 'small' },
+	'diffs.withFile': { range: 'small' },
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema, true);

packages/backend/src/core/chart/charts/entities/per-user-pv.ts

@@ -1,7 +1,12 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
-export const name = 'perUserPv' as const;
-export const schema = chartsSchemas[name];
+export const name = 'perUserPv';
+
+export const schema = {
+	'upv.user': { uniqueIncrement: true, range: 'small' },
+	'pv.user': { range: 'small' },
+	'upv.visitor': { uniqueIncrement: true, range: 'small' },
+	'pv.visitor': { range: 'small' },
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema, true);

packages/backend/src/core/chart/charts/entities/per-user-reactions.ts

@@ -1,7 +1,10 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
-export const name = 'perUserReactions' as const;
-export const schema = chartsSchemas[name];
+export const name = 'perUserReaction';
+
+export const schema = {
+	'local.count': { range: 'small' },
+	'remote.count': { range: 'small' },
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema, true);

packages/backend/src/core/chart/charts/entities/test-grouped.ts

@@ -1,7 +1,11 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
 export const name = 'testGrouped';
-export const schema = chartsSchemas[name];
+
+export const schema = {
+	'foo.total': { accumulate: true },
+	'foo.inc': {},
+	'foo.dec': {},
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema, true);

packages/backend/src/core/chart/charts/entities/test-intersection.ts

@@ -1,7 +1,11 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
 export const name = 'testIntersection';
-export const schema = chartsSchemas[name];
+
+export const schema = {
+	'a': { uniqueIncrement: true },
+	'b': { uniqueIncrement: true },
+	'aAndB': { intersection: ['a', 'b'] },
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema);

packages/backend/src/core/chart/charts/entities/test-unique.ts

@@ -1,7 +1,9 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
 export const name = 'testUnique';
-export const schema = chartsSchemas[name];
+
+export const schema = {
+	'foo': { uniqueIncrement: true },
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema);

packages/backend/src/core/chart/charts/entities/test.ts

@@ -1,7 +1,11 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
 export const name = 'test';
-export const schema = chartsSchemas[name];
+
+export const schema = {
+	'foo.total': { accumulate: true },
+	'foo.inc': {},
+	'foo.dec': {},
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema);

packages/backend/src/core/chart/charts/entities/users.ts

@@ -1,7 +1,14 @@
 import Chart from '../../core.js';
 
-import { chartsSchemas } from 'misskey-js/built/schemas/charts.js';
 export const name = 'users';
-export const schema = chartsSchemas[name];
+
+export const schema = {
+	'local.total': { accumulate: true },
+	'local.inc': { range: 'small' },
+	'local.dec': { range: 'small' },
+	'remote.total': { accumulate: true },
+	'remote.inc': { range: 'small' },
+	'remote.dec': { range: 'small' },
+} as const;
 
 export const entity = Chart.schemaToEntity(name, schema);

packages/backend/src/core/chart/core.ts

@@ -10,12 +10,22 @@ import { dateUTC, isTimeSame, isTimeBefore, subtractTime, addTime } from '@/misc
 import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
 import type { Repository, DataSource } from 'typeorm';
-import type { ChartSchema as Schema, ChartResult, Unflatten } from 'misskey-js/built/schemas';
 
 const COLUMN_PREFIX = '___' as const;
 const UNIQUE_TEMP_COLUMN_PREFIX = 'unique_temp___' as const;
 const COLUMN_DELIMITER = '_' as const;
 
+type Schema = Record<string, {
+	uniqueIncrement?: boolean;
+
+	intersection?: string[] | ReadonlyArray<string>;
+
+	range?: 'big' | 'small' | 'medium';
+
+	// previousな値を引き継ぐかどうか
+	accumulate?: boolean;
+}>;
+
 type KeyToColumnName<T extends string> = T extends `${infer R1}.${infer R2}` ? `${R1}${typeof COLUMN_DELIMITER}${KeyToColumnName<R2>}` : T;
 
 type Columns<S extends Schema> = {
@@ -54,6 +64,47 @@ export type KVs<S extends Schema> = {
 	[K in keyof S]: number;
 };
 
+type ChartResult<T extends Schema> = {
+	[P in keyof T]: number[];
+};
+
+type UnionToIntersection<T> = (T extends any ? (x: T) => any : never) extends (x: infer R) => any ? R : never;
+
+type UnflattenSingleton<K extends string, V> = K extends `${infer A}.${infer B}`
+	? { [_ in A]: UnflattenSingleton<B, V>; }
+	: { [_ in K]: V; };
+
+type Unflatten<T extends Record<string, any>> = UnionToIntersection<
+	{
+		[K in Extract<keyof T, string>]: UnflattenSingleton<K, T[K]>;
+	}[Extract<keyof T, string>]
+>;
+
+type ToJsonSchema<S> = {
+	type: 'object';
+	properties: {
+		[K in keyof S]: S[K] extends number[] ? { type: 'array'; items: { type: 'number'; }; } : ToJsonSchema<S[K]>;
+	},
+	required: (keyof S)[];
+};
+
+export function getJsonSchema<S extends Schema>(schema: S): ToJsonSchema<Unflatten<ChartResult<S>>> {
+	const jsonSchema = {
+		type: 'object',
+		properties: {} as Record<string, unknown>,
+		required: [],
+	};
+
+	for (const k in schema) {
+		jsonSchema.properties[k] = {
+			type: 'array',
+			items: { type: 'number' },
+		};
+	}
+
+	return jsonSchema as ToJsonSchema<Unflatten<ChartResult<S>>>;
+}
+
 /**
  * 様々なチャートの管理を司るクラス
  */

packages/backend/src/core/entities/AbuseUserReportEntityService.ts

@@ -5,7 +5,6 @@ import { awaitAll } from '@/misc/prelude/await-all.js';
 import type { AbuseUserReport } from '@/models/entities/AbuseUserReport.js';
 import { UserEntityService } from './UserEntityService.js';
 import { bindThis } from '@/decorators.js';
-import type { Packed } from 'misskey-js';
 
 @Injectable()
 export class AbuseUserReportEntityService {
@@ -20,7 +19,7 @@ export class AbuseUserReportEntityService {
 	@bindThis
 	public async pack(
 		src: AbuseUserReport['id'] | AbuseUserReport,
-	): Promise<Packed<'AbuseUserReport'>> {
+	) {
 		const report = typeof src === 'object' ? src : await this.abuseUserReportsRepository.findOneByOrFail({ id: src });
 
 		return await awaitAll({
@@ -47,7 +46,7 @@ export class AbuseUserReportEntityService {
 	@bindThis
 	public packMany(
 		reports: any[],
-	): Promise<Packed<'AbuseUserReport'>[]> {
+	) {
 		return Promise.all(reports.map(x => this.pack(x)));
 	}
 }

packages/backend/src/core/entities/AntennaEntityService.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { AntennasRepository } from '@/models/index.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
 import type { Antenna } from '@/models/entities/Antenna.js';
 import { bindThis } from '@/decorators.js';
 

packages/backend/src/core/entities/AppEntityService.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { AccessTokensRepository, AppsRepository } from '@/models/index.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
 import type { App } from '@/models/entities/App.js';
 import type { User } from '@/models/entities/User.js';
 import { bindThis } from '@/decorators.js';

packages/backend/src/core/entities/AuthSessionEntityService.ts

@@ -6,7 +6,6 @@ import type { AuthSession } from '@/models/entities/AuthSession.js';
 import type { User } from '@/models/entities/User.js';
 import { AppEntityService } from './AppEntityService.js';
 import { bindThis } from '@/decorators.js';
-import type { Packed } from 'misskey-js';
 
 @Injectable()
 export class AuthSessionEntityService {
@@ -22,7 +21,7 @@ export class AuthSessionEntityService {
 	public async pack(
 		src: AuthSession['id'] | AuthSession,
 		me?: { id: User['id'] } | null | undefined,
-	): Promise<Packed<'AuthSession'>> {
+	) {
 		const session = typeof src === 'object' ? src : await this.authSessionsRepository.findOneByOrFail({ id: src });
 
 		return await awaitAll({

packages/backend/src/core/entities/BlockingEntityService.ts

@@ -2,12 +2,11 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { BlockingsRepository } from '@/models/index.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
 import type { Blocking } from '@/models/entities/Blocking.js';
 import type { User } from '@/models/entities/User.js';
 import { bindThis } from '@/decorators.js';
 import { UserEntityService } from './UserEntityService.js';
-import type { Serialized } from 'schema-type';
 
 @Injectable()
 export class BlockingEntityService {
@@ -40,7 +39,7 @@ export class BlockingEntityService {
 	public packMany(
 		blockings: any[],
 		me: { id: User['id'] },
-	): Promise<Packed<'Blocking'>[]> {
+	) {
 		return Promise.all(blockings.map(x => this.pack(x, me)));
 	}
 }

packages/backend/src/core/entities/ChannelEntityService.ts

@@ -1,7 +1,8 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { ChannelFavoritesRepository, ChannelFollowingsRepository, ChannelsRepository, DriveFilesRepository, NoteUnreadsRepository, NotesRepository } from '@/models/index.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { User } from '@/models/entities/User.js';
 import type { Channel } from '@/models/entities/Channel.js';
 import { bindThis } from '@/decorators.js';

packages/backend/src/core/entities/ClipEntityService.ts

@@ -2,7 +2,8 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { ClipFavoritesRepository, ClipsRepository, User } from '@/models/index.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { Clip } from '@/models/entities/Clip.js';
 import { bindThis } from '@/decorators.js';
 import { UserEntityService } from './UserEntityService.js';
@@ -46,7 +47,7 @@ export class ClipEntityService {
 	public packMany(
 		clips: Clip[],
 		me?: { id: User['id'] } | null | undefined,
-	): Promise<Packed<'Clip'>[]> {
+	) {
 		return Promise.all(clips.map(x => this.pack(x, me)));
 	}
 }

packages/backend/src/core/entities/DriveFileEntityService.ts

@@ -3,7 +3,7 @@ import { DataSource, In } from 'typeorm';
 import { DI } from '@/di-symbols.js';
 import type { NotesRepository, DriveFilesRepository } from '@/models/index.js';
 import type { Config } from '@/config.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
 import type { User } from '@/models/entities/User.js';
 import type { DriveFile } from '@/models/entities/DriveFile.js';
@@ -265,11 +265,11 @@ export class DriveFileEntityService {
 	public async packManyByIdsMap(
 		fileIds: DriveFile['id'][],
 		options?: PackOptions,
-	): Promise<Map<Packed<'DriveFile'>>['id'], Serialized<Packed<'DriveFile'> | null>> {
+	): Promise<Map<Packed<'DriveFile'>['id'], Packed<'DriveFile'> | null>> {
 		if (fileIds.length === 0) return new Map();
 		const files = await this.driveFilesRepository.findBy({ id: In(fileIds) });
 		const packedFiles = await this.packMany(files, options);
-		const map = new Map<Packed<'DriveFile'>>['id'], Serialized<Packed<'DriveFile'> | null>(packedFiles.map(f => [f.id, f]));
+		const map = new Map<Packed<'DriveFile'>['id'], Packed<'DriveFile'> | null>(packedFiles.map(f => [f.id, f]));
 		for (const id of fileIds) {
 			if (!map.has(id)) map.set(id, null);
 		}

packages/backend/src/core/entities/DriveFolderEntityService.ts

@@ -2,7 +2,8 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { DriveFilesRepository, DriveFoldersRepository } from '@/models/index.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { DriveFolder } from '@/models/entities/DriveFolder.js';
 import { bindThis } from '@/decorators.js';
 

packages/backend/src/core/entities/EmojiEntityService.ts

@@ -1,7 +1,8 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { EmojisRepository } from '@/models/index.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { Emoji } from '@/models/entities/Emoji.js';
 import { bindThis } from '@/decorators.js';
 

packages/backend/src/core/entities/FlashEntityService.ts

@@ -2,7 +2,8 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { FlashsRepository, FlashLikesRepository } from '@/models/index.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { User } from '@/models/entities/User.js';
 import type { Flash } from '@/models/entities/Flash.js';
 import { bindThis } from '@/decorators.js';

packages/backend/src/core/entities/FlashLikeEntityService.ts

@@ -1,6 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { FlashLikesRepository } from '@/models/index.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { User } from '@/models/entities/User.js';
 import type { FlashLike } from '@/models/entities/FlashLike.js';
 import { bindThis } from '@/decorators.js';

packages/backend/src/core/entities/FollowRequestEntityService.ts

@@ -1,11 +1,11 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { FollowRequestsRepository } from '@/models/index.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { User } from '@/models/entities/User.js';
 import type { FollowRequest } from '@/models/entities/FollowRequest.js';
 import { UserEntityService } from './UserEntityService.js';
 import { bindThis } from '@/decorators.js';
-import { Packed } from 'misskey-js';
 
 @Injectable()
 export class FollowRequestEntityService {
@@ -21,7 +21,7 @@ export class FollowRequestEntityService {
 	public async pack(
 		src: FollowRequest['id'] | FollowRequest,
 		me?: { id: User['id'] } | null | undefined,
-	): Promise<Packed<'FollowRequest'>> {
+	) {
 		const request = typeof src === 'object' ? src : await this.followRequestsRepository.findOneByOrFail({ id: src });
 
 		return {

packages/backend/src/core/entities/FollowingEntityService.ts

@@ -2,7 +2,8 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { FollowingsRepository } from '@/models/index.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { User } from '@/models/entities/User.js';
 import type { Following } from '@/models/entities/Following.js';
 import { bindThis } from '@/decorators.js';

packages/backend/src/core/entities/GalleryLikeEntityService.ts

@@ -1,6 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { GalleryLikesRepository } from '@/models/index.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { GalleryLike } from '@/models/entities/GalleryLike.js';
 import { GalleryPostEntityService } from './GalleryPostEntityService.js';
 import { bindThis } from '@/decorators.js';

packages/backend/src/core/entities/GalleryPostEntityService.ts

@@ -2,7 +2,8 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { GalleryLikesRepository, GalleryPostsRepository } from '@/models/index.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { User } from '@/models/entities/User.js';
 import type { GalleryPost } from '@/models/entities/GalleryPost.js';
 import { bindThis } from '@/decorators.js';

packages/backend/src/core/entities/HashtagEntityService.ts

@@ -1,7 +1,8 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { HashtagsRepository } from '@/models/index.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { Hashtag } from '@/models/entities/Hashtag.js';
 import { bindThis } from '@/decorators.js';
 import { UserEntityService } from './UserEntityService.js';

packages/backend/src/core/entities/InstanceEntityService.ts

@@ -1,7 +1,8 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { InstancesRepository } from '@/models/index.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { Instance } from '@/models/entities/Instance.js';
 import { MetaService } from '@/core/MetaService.js';
 import { bindThis } from '@/decorators.js';

packages/backend/src/core/entities/ModerationLogEntityService.ts

@@ -2,10 +2,10 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { ModerationLogsRepository } from '@/models/index.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { ModerationLog } from '@/models/entities/ModerationLog.js';
 import { UserEntityService } from './UserEntityService.js';
 import { bindThis } from '@/decorators.js';
-import type { Packed } from 'misskey-js';
 
 @Injectable()
 export class ModerationLogEntityService {
@@ -20,7 +20,7 @@ export class ModerationLogEntityService {
 	@bindThis
 	public async pack(
 		src: ModerationLog['id'] | ModerationLog,
-	): Promise<Packed<'ModerationLog'>> {
+	) {
 		const log = typeof src === 'object' ? src : await this.moderationLogsRepository.findOneByOrFail({ id: src });
 
 		return await awaitAll({
@@ -38,7 +38,8 @@ export class ModerationLogEntityService {
 	@bindThis
 	public packMany(
 		reports: any[],
-	): Promise<Packed<'ModerationLog'>[]> {
+	) {
 		return Promise.all(reports.map(x => this.pack(x)));
 	}
 }
+

packages/backend/src/core/entities/MutingEntityService.ts

@@ -2,7 +2,8 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { MutingsRepository } from '@/models/index.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { User } from '@/models/entities/User.js';
 import type { Muting } from '@/models/entities/Muting.js';
 import { bindThis } from '@/decorators.js';

packages/backend/src/core/entities/NoteEntityService.ts

@@ -3,7 +3,7 @@ import { DataSource, In } from 'typeorm';
 import * as mfm from 'mfm-js';
 import { ModuleRef } from '@nestjs/core';
 import { DI } from '@/di-symbols.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
 import { nyaize } from '@/misc/nyaize.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
 import type { User } from '@/models/entities/User.js';

packages/backend/src/core/entities/NoteFavoriteEntityService.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { NoteFavoritesRepository } from '@/models/index.js';
-import type { Packed } from 'misskey-js';
+import type { } from '@/models/entities/Blocking.js';
 import type { User } from '@/models/entities/User.js';
 import type { NoteFavorite } from '@/models/entities/NoteFavorite.js';
 import { NoteEntityService } from './NoteEntityService.js';
@@ -21,7 +21,7 @@ export class NoteFavoriteEntityService {
 	public async pack(
 		src: NoteFavorite['id'] | NoteFavorite,
 		me?: { id: User['id'] } | null | undefined,
-	): Promise<Packed<'NoteFavorite'>> {
+	) {
 		const favorite = typeof src === 'object' ? src : await this.noteFavoritesRepository.findOneByOrFail({ id: src });
 
 		return {

packages/backend/src/core/entities/NoteReactionEntityService.ts

@@ -1,9 +1,10 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { NoteReactionsRepository } from '@/models/index.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
 import { bindThis } from '@/decorators.js';
 import type { OnModuleInit } from '@nestjs/common';
+import type { } from '@/models/entities/Blocking.js';
 import type { User } from '@/models/entities/User.js';
 import type { NoteReaction } from '@/models/entities/NoteReaction.js';
 import type { ReactionService } from '../ReactionService.js';

packages/backend/src/core/entities/NotificationEntityService.ts

@@ -6,10 +6,10 @@ import type { AccessTokensRepository, FollowRequestsRepository, NoteReactionsRep
 import { awaitAll } from '@/misc/prelude/await-all.js';
 import type { Notification } from '@/models/entities/Notification.js';
 import type { Note } from '@/models/entities/Note.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
 import { bindThis } from '@/decorators.js';
 import { isNotNull } from '@/misc/is-not-null.js';
-import { notificationTypes } from 'misskey-js';
+import { notificationTypes } from '@/types.js';
 import type { OnModuleInit } from '@nestjs/common';
 import type { CustomEmojiService } from '../CustomEmojiService.js';
 import type { UserEntityService } from './UserEntityService.js';

packages/backend/src/core/entities/PageEntityService.ts

@@ -2,7 +2,8 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { DriveFilesRepository, PagesRepository, PageLikesRepository } from '@/models/index.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { User } from '@/models/entities/User.js';
 import type { Page } from '@/models/entities/Page.js';
 import type { DriveFile } from '@/models/entities/DriveFile.js';

packages/backend/src/core/entities/PageLikeEntityService.ts

@@ -1,6 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { PageLikesRepository } from '@/models/index.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { User } from '@/models/entities/User.js';
 import type { PageLike } from '@/models/entities/PageLike.js';
 import { PageEntityService } from './PageEntityService.js';

packages/backend/src/core/entities/RenoteMutingEntityService.ts

@@ -2,7 +2,8 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { RenoteMutingsRepository } from '@/models/index.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { User } from '@/models/entities/User.js';
 import type { RenoteMuting } from '@/models/entities/RenoteMuting.js';
 import { bindThis } from '@/decorators.js';

packages/backend/src/core/entities/RoleEntityService.ts

@@ -8,7 +8,6 @@ import type { Role } from '@/models/entities/Role.js';
 import { bindThis } from '@/decorators.js';
 import { DEFAULT_POLICIES } from '@/core/RoleService.js';
 import { UserEntityService } from './UserEntityService.js';
-import type { Packed } from 'misskey-js';
 
 @Injectable()
 export class RoleEntityService {
@@ -27,7 +26,7 @@ export class RoleEntityService {
 	public async pack(
 		src: Role['id'] | Role,
 		me?: { id: User['id'] } | null | undefined,
-	): Promise<Packed<'Role'>> {
+	) {
 		const role = typeof src === 'object' ? src : await this.rolesRepository.findOneByOrFail({ id: src });
 
 		const assignedCount = await this.roleAssignmentsRepository.createQueryBuilder('assign')
@@ -38,7 +37,7 @@ export class RoleEntityService {
 			}))
 			.getCount();
 
-		const policies: { [x: string]: Packed<'RolePolicy'> } = { ...role.policies };
+		const policies = { ...role.policies };
 		for (const [k, v] of Object.entries(DEFAULT_POLICIES)) {
 			if (policies[k] == null) policies[k] = {
 				useDefault: true,
@@ -73,7 +72,8 @@ export class RoleEntityService {
 	public packMany(
 		roles: any[],
 		me: { id: User['id'] },
-	): Promise<Packed<'Role'>[]> {
+	) {
 		return Promise.all(roles.map(x => this.pack(x, me)));
 	}
 }
+

packages/backend/src/core/entities/SigninEntityService.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { SigninsRepository } from '@/models/index.js';
-import type { Packed } from 'misskey-js';
+import type { } from '@/models/entities/Blocking.js';
 import type { Signin } from '@/models/entities/Signin.js';
 import { UserEntityService } from './UserEntityService.js';
 import { bindThis } from '@/decorators.js';
@@ -19,10 +19,8 @@ export class SigninEntityService {
 	@bindThis
 	public async pack(
 		src: Signin,
-	): Promise<Packed<'SignIn'>> {
-		return {
-			...src,
-			createdAt: src.createdAt.toISOString(),
-		};
+	) {
+		return src;
 	}
 }
+

packages/backend/src/core/entities/UserEntityService.ts

@@ -1,11 +1,11 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { In, Not } from 'typeorm';
 import * as Redis from 'ioredis';
-import _Ajv from 'ajv';
+import Ajv from 'ajv';
 import { ModuleRef } from '@nestjs/core';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
 import type { Promiseable } from '@/misc/prelude/await-all.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
 import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const.js';
@@ -28,10 +28,9 @@ type IsMeAndIsUserDetailed<ExpectsMe extends boolean | null, Detailed extends bo
 	Detailed extends true ?
 		ExpectsMe extends true ? Packed<'MeDetailed'> :
 		ExpectsMe extends false ? Packed<'UserDetailedNotMe'> :
-		(Packed<'MeDetailed'> | Packed<'UserDetailedNotMe'>) :
+		Packed<'UserDetailed'> :
 	Packed<'UserLite'>;
 
-const Ajv = _Ajv.default;
 const ajv = new Ajv();
 
 function isLocalUser(user: User): user is LocalUser;
@@ -291,7 +290,7 @@ export class UserEntityService implements OnModuleInit {
 		return `${this.config.url}/users/${userId}`;
 	}
 
-	public async pack<ExpectsMe extends boolean | null = null, D extends boolean = false, R = IsMeAndIsUserDetailed<ExpectsMe, D>>(
+	public async pack<ExpectsMe extends boolean | null = null, D extends boolean = false>(
 		src: User['id'] | User,
 		me?: { id: User['id']; } | null | undefined,
 		options?: {
@@ -299,7 +298,7 @@ export class UserEntityService implements OnModuleInit {
 			includeSecrets?: boolean,
 			userProfile?: UserProfile,
 		},
-	): Promise<R> {
+	): Promise<IsMeAndIsUserDetailed<ExpectsMe, D>> {
 		const opts = Object.assign({
 			detail: false,
 			includeSecrets: false,
@@ -499,19 +498,19 @@ export class UserEntityService implements OnModuleInit {
 				isMuted: relation.isMuted,
 				isRenoteMuted: relation.isRenoteMuted,
 			} : {}),
-		} as Promiseable<R>;
+		} as Promiseable<Packed<'User'>> as Promiseable<IsMeAndIsUserDetailed<ExpectsMe, D>>;
 
 		return await awaitAll(packed);
 	}
 
-	public packMany<D extends boolean = false, R = IsUserDetailed<D>>(
+	public packMany<D extends boolean = false>(
 		users: (User['id'] | User)[],
 		me?: { id: User['id'] } | null | undefined,
 		options?: {
 			detail?: D,
 			includeSecrets?: boolean,
 		},
-	): Promise<R[]> {
-		return Promise.all(users.map(u => this.pack<null, D, R>(u, me, options)));
+	): Promise<IsUserDetailed<D>[]> {
+		return Promise.all(users.map(u => this.pack(u, me, options)));
 	}
 }

packages/backend/src/core/entities/UserListEntityService.ts

@@ -1,7 +1,8 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { UserListJoiningsRepository, UserListsRepository } from '@/models/index.js';
-import type { Packed } from 'misskey-js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/entities/Blocking.js';
 import type { UserList } from '@/models/entities/UserList.js';
 import { bindThis } from '@/decorators.js';
 import { UserEntityService } from './UserEntityService.js';
@@ -38,3 +39,4 @@ export class UserListEntityService {
 		};
 	}
 }
+

packages/backend/src/daemons/ServerStatsService.ts

@@ -3,7 +3,6 @@ import si from 'systeminformation';
 import Xev from 'xev';
 import * as osUtils from 'os-utils';
 import { bindThis } from '@/decorators.js';
-import { MetaService } from '@/core/MetaService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 const ev = new Xev();
@@ -15,10 +14,9 @@ const round = (num: number) => Math.round(num * 10) / 10;
 
 @Injectable()
 export class ServerStatsService implements OnApplicationShutdown {
-	private intervalId: NodeJS.Timer | null = null;
+	private intervalId: NodeJS.Timer;
 
 	constructor(
-		private metaService: MetaService,
 	) {
 	}
 
@@ -26,9 +24,7 @@ export class ServerStatsService implements OnApplicationShutdown {
 	 * Report server stats regularly
 	 */
 	@bindThis
-	public async start(): Promise<void> {
-		if (!(await this.metaService.fetch(true)).enableServerMachineStats) return;
-
+	public start(): void {
 		const log = [] as any[];
 
 		ev.on('requestServerStatsLog', x => {
@@ -68,9 +64,7 @@ export class ServerStatsService implements OnApplicationShutdown {
 
 	@bindThis
 	public dispose(): void {
-		if (this.intervalId) {
-			clearInterval(this.intervalId);
-		}
+		clearInterval(this.intervalId);
 	}
 
 	@bindThis

packages/backend/src/logger.ts

@@ -4,7 +4,7 @@ import { default as convertColor } from 'color-convert';
 import { format as dateFormat } from 'date-fns';
 import { bindThis } from '@/decorators.js';
 import { envOption } from './env.js';
-import type { KEYWORD } from 'color-convert/conversions.js';
+import type { KEYWORD } from 'color-convert/conversions';
 
 type Context = {
 	name: string;

packages/backend/src/misc/generate-native-user-token.ts

@@ -1,3 +1,3 @@
 import { secureRndstr } from '@/misc/secure-rndstr.js';
 
-export default () => secureRndstr(16);
+export default () => secureRndstr(16, true);

packages/backend/src/misc/get-ip-hash.ts

@@ -1,6 +1,6 @@
 import IPCIDR from 'ip-cidr';
 
-export function getIpHash(ip: string): string {
+export function getIpHash(ip: string) {
 	try {
 		// because a single person may control many IPv6 addresses,
 		// only a /64 subnet prefix of any IP will be taken into account.

packages/backend/src/misc/get-note-summary.ts

@@ -1,4 +1,4 @@
-import type { Packed } from 'misskey-js';
+import type { Packed } from './json-schema.js';
 
 /**
  * 投稿を表す文字列を取得します。

packages/backend/src/misc/is-instance-muted.ts

@@ -1,4 +1,4 @@
-import type { Packed } from 'misskey-js';
+import type { Packed } from './json-schema.js';
 
 export function isInstanceMuted(note: Packed<'Note'>, mutedInstances: Set<string>): boolean {
 	if (mutedInstances.has(note.user.host ?? '')) return true;

packages/backend/src/misc/json-schema.ts

@@ -0,0 +1,185 @@
+import {
+	packedUserLiteSchema,
+	packedUserDetailedNotMeOnlySchema,
+	packedMeDetailedOnlySchema,
+	packedUserDetailedNotMeSchema,
+	packedMeDetailedSchema,
+	packedUserDetailedSchema,
+	packedUserSchema,
+} from '@/models/json-schema/user.js';
+import { packedNoteSchema } from '@/models/json-schema/note.js';
+import { packedUserListSchema } from '@/models/json-schema/user-list.js';
+import { packedAppSchema } from '@/models/json-schema/app.js';
+import { packedNotificationSchema } from '@/models/json-schema/notification.js';
+import { packedDriveFileSchema } from '@/models/json-schema/drive-file.js';
+import { packedDriveFolderSchema } from '@/models/json-schema/drive-folder.js';
+import { packedFollowingSchema } from '@/models/json-schema/following.js';
+import { packedMutingSchema } from '@/models/json-schema/muting.js';
+import { packedRenoteMutingSchema } from '@/models/json-schema/renote-muting.js';
+import { packedBlockingSchema } from '@/models/json-schema/blocking.js';
+import { packedNoteReactionSchema } from '@/models/json-schema/note-reaction.js';
+import { packedHashtagSchema } from '@/models/json-schema/hashtag.js';
+import { packedPageSchema } from '@/models/json-schema/page.js';
+import { packedNoteFavoriteSchema } from '@/models/json-schema/note-favorite.js';
+import { packedChannelSchema } from '@/models/json-schema/channel.js';
+import { packedAntennaSchema } from '@/models/json-schema/antenna.js';
+import { packedClipSchema } from '@/models/json-schema/clip.js';
+import { packedFederationInstanceSchema } from '@/models/json-schema/federation-instance.js';
+import { packedQueueCountSchema } from '@/models/json-schema/queue.js';
+import { packedGalleryPostSchema } from '@/models/json-schema/gallery-post.js';
+import { packedEmojiDetailedSchema, packedEmojiSimpleSchema } from '@/models/json-schema/emoji.js';
+import { packedFlashSchema } from '@/models/json-schema/flash.js';
+
+export const refs = {
+	UserLite: packedUserLiteSchema,
+	UserDetailedNotMeOnly: packedUserDetailedNotMeOnlySchema,
+	MeDetailedOnly: packedMeDetailedOnlySchema,
+	UserDetailedNotMe: packedUserDetailedNotMeSchema,
+	MeDetailed: packedMeDetailedSchema,
+	UserDetailed: packedUserDetailedSchema,
+	User: packedUserSchema,
+
+	UserList: packedUserListSchema,
+	App: packedAppSchema,
+	Note: packedNoteSchema,
+	NoteReaction: packedNoteReactionSchema,
+	NoteFavorite: packedNoteFavoriteSchema,
+	Notification: packedNotificationSchema,
+	DriveFile: packedDriveFileSchema,
+	DriveFolder: packedDriveFolderSchema,
+	Following: packedFollowingSchema,
+	Muting: packedMutingSchema,
+	RenoteMuting: packedRenoteMutingSchema,
+	Blocking: packedBlockingSchema,
+	Hashtag: packedHashtagSchema,
+	Page: packedPageSchema,
+	Channel: packedChannelSchema,
+	QueueCount: packedQueueCountSchema,
+	Antenna: packedAntennaSchema,
+	Clip: packedClipSchema,
+	FederationInstance: packedFederationInstanceSchema,
+	GalleryPost: packedGalleryPostSchema,
+	EmojiSimple: packedEmojiSimpleSchema,
+	EmojiDetailed: packedEmojiDetailedSchema,
+	Flash: packedFlashSchema,
+};
+
+export type Packed<x extends keyof typeof refs> = SchemaType<typeof refs[x]>;
+
+type TypeStringef = 'null' | 'boolean' | 'integer' | 'number' | 'string' | 'array' | 'object' | 'any';
+type StringDefToType<T extends TypeStringef> =
+	T extends 'null' ? null :
+	T extends 'boolean' ? boolean :
+	T extends 'integer' ? number :
+	T extends 'number' ? number :
+	T extends 'string' ? string | Date :
+	T extends 'array' ? ReadonlyArray<any> :
+	T extends 'object' ? Record<string, any> :
+	any;
+
+// https://swagger.io/specification/?sbsearch=optional#schema-object
+type OfSchema = {
+	readonly anyOf?: ReadonlyArray<Schema>;
+	readonly oneOf?: ReadonlyArray<Schema>;
+	readonly allOf?: ReadonlyArray<Schema>;
+}
+
+export interface Schema extends OfSchema {
+	readonly type?: TypeStringef;
+	readonly nullable?: boolean;
+	readonly optional?: boolean;
+	readonly items?: Schema;
+	readonly properties?: Obj;
+	readonly required?: ReadonlyArray<Extract<keyof NonNullable<this['properties']>, string>>;
+	readonly description?: string;
+	readonly example?: any;
+	readonly format?: string;
+	readonly ref?: keyof typeof refs;
+	readonly enum?: ReadonlyArray<string | null>;
+	readonly default?: (this['type'] extends TypeStringef ? StringDefToType<this['type']> : any) | null;
+	readonly maxLength?: number;
+	readonly minLength?: number;
+	readonly maximum?: number;
+	readonly minimum?: number;
+	readonly pattern?: string;
+}
+
+type RequiredPropertyNames<s extends Obj> = {
+	[K in keyof s]:
+		// K is not optional
+		s[K]['optional'] extends false ? K :
+		// K has default value
+		s[K]['default'] extends null | string | number | boolean | Record<string, unknown> ? K :
+		never
+}[keyof s];
+
+export type Obj = Record<string, Schema>;
+
+// https://github.com/misskey-dev/misskey/issues/8535
+// To avoid excessive stack depth error,
+// deceive TypeScript with UnionToIntersection (or more precisely, `infer` expression within it).
+export type ObjType<s extends Obj, RequiredProps extends ReadonlyArray<keyof s>> =
+	UnionToIntersection<
+		{ -readonly [R in RequiredPropertyNames<s>]-?: SchemaType<s[R]> } &
+		{ -readonly [R in RequiredProps[number]]-?: SchemaType<s[R]> } &
+		{ -readonly [P in keyof s]?: SchemaType<s[P]> }
+	>;
+
+type NullOrUndefined<p extends Schema, T> =
+	| (p['nullable'] extends true ? null : never)
+	| (p['optional'] extends true ? undefined : never)
+	| T;
+
+// https://stackoverflow.com/questions/54938141/typescript-convert-union-to-intersection
+// Get intersection from union 
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
+type PartialIntersection<T> = Partial<UnionToIntersection<T>>;
+
+// https://github.com/misskey-dev/misskey/pull/8144#discussion_r785287552
+// To get union, we use `Foo extends any ? Hoge<Foo> : never`
+type UnionSchemaType<a extends readonly any[], X extends Schema = a[number]> = X extends any ? SchemaType<X> : never;
+//type UnionObjectSchemaType<a extends readonly any[], X extends Schema = a[number]> = X extends any ? ObjectSchemaType<X> : never;
+type UnionObjType<s extends Obj, a extends readonly any[], X extends ReadonlyArray<keyof s> = a[number]> = X extends any ? ObjType<s, X> : never;
+type ArrayUnion<T> = T extends any ? Array<T> : never;
+
+type ObjectSchemaTypeDef<p extends Schema> =
+	p['ref'] extends keyof typeof refs ? Packed<p['ref']> :
+	p['properties'] extends NonNullable<Obj> ?
+		p['anyOf'] extends ReadonlyArray<Schema> ? p['anyOf'][number]['required'] extends ReadonlyArray<keyof p['properties']> ?
+			UnionObjType<p['properties'], NonNullable<p['anyOf'][number]['required']>> & ObjType<p['properties'], NonNullable<p['required']>>
+			: never
+			: ObjType<p['properties'], NonNullable<p['required']>>
+	:
+	p['anyOf'] extends ReadonlyArray<Schema> ? never : // see CONTRIBUTING.md
+	p['allOf'] extends ReadonlyArray<Schema> ? UnionToIntersection<UnionSchemaType<p['allOf']>> :
+	any
+
+type ObjectSchemaType<p extends Schema> = NullOrUndefined<p, ObjectSchemaTypeDef<p>>;
+
+export type SchemaTypeDef<p extends Schema> =
+	p['type'] extends 'null' ? null :
+	p['type'] extends 'integer' ? number :
+	p['type'] extends 'number' ? number :
+	p['type'] extends 'string' ? (
+		p['enum'] extends readonly (string | null)[] ?
+		p['enum'][number] :
+		p['format'] extends 'date-time' ? string : // Dateにする？？
+		string
+	) :
+	p['type'] extends 'boolean' ? boolean :
+	p['type'] extends 'object' ? ObjectSchemaTypeDef<p> :
+	p['type'] extends 'array' ? (
+		p['items'] extends OfSchema ? (
+			p['items']['anyOf'] extends ReadonlyArray<Schema> ? UnionSchemaType<NonNullable<p['items']['anyOf']>>[] :
+			p['items']['oneOf'] extends ReadonlyArray<Schema> ? ArrayUnion<UnionSchemaType<NonNullable<p['items']['oneOf']>>> :
+			p['items']['allOf'] extends ReadonlyArray<Schema> ? UnionToIntersection<UnionSchemaType<NonNullable<p['items']['allOf']>>>[] :
+			never
+		) :
+		p['items'] extends NonNullable<Schema> ? SchemaTypeDef<p['items']>[] :
+		any[]
+	) :
+	p['anyOf'] extends ReadonlyArray<Schema> ? UnionSchemaType<p['anyOf']> & PartialIntersection<UnionSchemaType<p['anyOf']>> :
+	p['oneOf'] extends ReadonlyArray<Schema> ? UnionSchemaType<p['oneOf']> :
+	any;
+
+export type SchemaType<p extends Schema> = NullOrUndefined<p, SchemaTypeDef<p>>;

packages/backend/src/misc/secure-rndstr.ts

@@ -1,9 +1,10 @@
 import * as crypto from 'node:crypto';
 
-export const L_CHARS = '0123456789abcdefghijklmnopqrstuvwxyz';
+const L_CHARS = '0123456789abcdefghijklmnopqrstuvwxyz';
 const LU_CHARS = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
-export function secureRndstr(length = 32, { chars = LU_CHARS } = {}): string {
+export function secureRndstr(length = 32, useLU = true): string {
+	const chars = useLU ? LU_CHARS : L_CHARS;
 	const chars_len = chars.length;
 
 	let str = '';

packages/backend/src/models/entities/Meta.ts

@@ -413,16 +413,6 @@ export class Meta {
 	})
 	public enableChartsForFederatedInstances: boolean;
 
-	@Column('boolean', {
-		default: false,
-	})
-	public enableServerMachineStats: boolean;
-
-	@Column('boolean', {
-		default: true,
-	})
-	public enableIdenticonGeneration: boolean;
-
 	@Column('jsonb', {
 		default: { },
 	})

packages/backend/src/models/entities/MutedNote.ts

@@ -1,6 +1,6 @@
 import { Entity, Index, JoinColumn, Column, ManyToOne, PrimaryColumn } from 'typeorm';
 import { id } from '../id.js';
-import { mutedNoteReasons } from 'misskey-js';
+import { mutedNoteReasons } from '../../types.js';
 import { Note } from './Note.js';
 import { User } from './User.js';
 

packages/backend/src/models/entities/Note.ts

@@ -1,6 +1,6 @@
 import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
 import { id } from '../id.js';
-import { noteVisibilities } from 'misskey-js';
+import { noteVisibilities } from '../../types.js';
 import { User } from './User.js';
 import { Channel } from './Channel.js';
 import type { DriveFile } from './DriveFile.js';

packages/backend/src/models/entities/Notification.ts

@@ -1,4 +1,4 @@
-import { ACHIEVEMENT_TYPES, notificationTypes } from 'misskey-js';
+import { notificationTypes } from '@/types.js';
 import { User } from './User.js';
 import { Note } from './Note.js';
 import { FollowRequest } from './FollowRequest.js';
@@ -39,7 +39,7 @@ export type Notification = {
 
 	choice: number | null;
 
-	achievement: typeof ACHIEVEMENT_TYPES[number] | null;
+	achievement: string | null;
 
 	/**
 	 * アプリ通知のbody

packages/backend/src/models/entities/Poll.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm';
 import { id } from '../id.js';
-import { noteVisibilities } from 'misskey-js';
+import { noteVisibilities } from '../../types.js';
 import { Note } from './Note.js';
 import type { User } from './User.js';
 

packages/backend/src/models/entities/Role.ts

@@ -1,6 +1,83 @@
 import { Entity, Column, PrimaryColumn } from 'typeorm';
 import { id } from '../id.js';
-import type { RoleCondFormulaValue } from 'misskey-js/built/schemas/role.js';
+
+type CondFormulaValueAnd = {
+	type: 'and';
+	values: RoleCondFormulaValue[];
+};
+
+type CondFormulaValueOr = {
+	type: 'or';
+	values: RoleCondFormulaValue[];
+};
+
+type CondFormulaValueNot = {
+	type: 'not';
+	value: RoleCondFormulaValue;
+};
+
+type CondFormulaValueIsLocal = {
+	type: 'isLocal';
+};
+
+type CondFormulaValueIsRemote = {
+	type: 'isRemote';
+};
+
+type CondFormulaValueCreatedLessThan = {
+	type: 'createdLessThan';
+	sec: number;
+};
+
+type CondFormulaValueCreatedMoreThan = {
+	type: 'createdMoreThan';
+	sec: number;
+};
+
+type CondFormulaValueFollowersLessThanOrEq = {
+	type: 'followersLessThanOrEq';
+	value: number;
+};
+
+type CondFormulaValueFollowersMoreThanOrEq = {
+	type: 'followersMoreThanOrEq';
+	value: number;
+};
+
+type CondFormulaValueFollowingLessThanOrEq = {
+	type: 'followingLessThanOrEq';
+	value: number;
+};
+
+type CondFormulaValueFollowingMoreThanOrEq = {
+	type: 'followingMoreThanOrEq';
+	value: number;
+};
+
+type CondFormulaValueNotesLessThanOrEq = {
+	type: 'notesLessThanOrEq';
+	value: number;
+};
+
+type CondFormulaValueNotesMoreThanOrEq = {
+	type: 'notesMoreThanOrEq';
+	value: number;
+};
+
+export type RoleCondFormulaValue =
+	CondFormulaValueAnd |
+	CondFormulaValueOr |
+	CondFormulaValueNot |
+	CondFormulaValueIsLocal |
+	CondFormulaValueIsRemote |
+	CondFormulaValueCreatedLessThan |
+	CondFormulaValueCreatedMoreThan |
+	CondFormulaValueFollowersLessThanOrEq |
+	CondFormulaValueFollowersMoreThanOrEq |
+	CondFormulaValueFollowingLessThanOrEq |
+	CondFormulaValueFollowingMoreThanOrEq |
+	CondFormulaValueNotesLessThanOrEq |
+	CondFormulaValueNotesMoreThanOrEq;
 
 @Entity()
 export class Role {

packages/backend/src/models/entities/UserProfile.ts

@@ -1,5 +1,5 @@
 import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm';
-import { obsoleteNotificationTypes, ffVisibility, notificationTypes } from 'misskey-js';
+import { obsoleteNotificationTypes, ffVisibility, notificationTypes } from '@/types.js';
 import { id } from '../id.js';
 import { User } from './User.js';
 import { Page } from './Page.js';

packages/backend/src/models/json-schema/notification.ts

@@ -1,4 +1,4 @@
-import { notificationTypes } from 'misskey-js';
+import { notificationTypes } from '@/types.js';
 
 export const packedNotificationSchema = {
 	type: 'object',

packages/backend/src/queue/processors/ImportAntennasProcessorService.ts

@@ -1,5 +1,5 @@
 import { Injectable, Inject } from '@nestjs/common';
-import _Ajv from 'ajv';
+import Ajv from 'ajv';
 import { IdService } from '@/core/IdService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import Logger from '@/logger.js';
@@ -10,8 +10,6 @@ import { QueueLoggerService } from '../QueueLoggerService.js';
 import { DBAntennaImportJobData } from '../types.js';
 import type * as Bull from 'bullmq';
 
-const Ajv = _Ajv.default;
-
 const validate = new Ajv().compile({
 	type: 'object',
 	properties: {

packages/backend/src/server/ServerService.ts

@@ -16,7 +16,6 @@ import { createTemp } from '@/misc/create-temp.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { bindThis } from '@/decorators.js';
-import { MetaService } from '@/core/MetaService.js';
 import { ActivityPubServerService } from './ActivityPubServerService.js';
 import { NodeinfoServerService } from './NodeinfoServerService.js';
 import { ApiServerService } from './api/ApiServerService.js';
@@ -46,7 +45,6 @@ export class ServerService implements OnApplicationShutdown {
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
 
-		private metaService: MetaService,
 		private userEntityService: UserEntityService,
 		private apiServerService: ApiServerService,
 		private openApiServerService: OpenApiServerService,
@@ -163,16 +161,11 @@ export class ServerService implements OnApplicationShutdown {
 		});
 
 		fastify.get<{ Params: { x: string } }>('/identicon/:x', async (request, reply) => {
+			const [temp, cleanup] = await createTemp();
+			await genIdenticon(request.params.x, fs.createWriteStream(temp));
 			reply.header('Content-Type', 'image/png');
 			reply.header('Cache-Control', 'public, max-age=86400');
-
-			if ((await this.metaService.fetch()).enableIdenticonGeneration) {
-				const [temp, cleanup] = await createTemp();
-				await genIdenticon(request.params.x, fs.createWriteStream(temp));
-				return fs.createReadStream(temp).on('close', () => cleanup());
-			} else {
-				return reply.redirect('/static-assets/avatar.png');
-			}
+			return fs.createReadStream(temp).on('close', () => cleanup());
 		});
 
 		fastify.get<{ Params: { code: string } }>('/verify-email/:code', async (request, reply) => {
@@ -231,7 +224,7 @@ export class ServerService implements OnApplicationShutdown {
 
 	@bindThis
 	public async dispose(): Promise<void> {
-		await this.streamingApiServerService.detach();
+    await this.streamingApiServerService.detach();
 		await this.#fastify.close();
 	}
 

packages/backend/src/server/api/ApiCallService.ts

@@ -19,8 +19,7 @@ import { ApiLoggerService } from './ApiLoggerService.js';
 import { AuthenticateService, AuthenticationError } from './AuthenticateService.js';
 import type { FastifyRequest, FastifyReply } from 'fastify';
 import type { OnApplicationShutdown } from '@nestjs/common';
-import type { IEndpointMeta } from 'misskey-js/built/endpoints.types.js';
-import { ExecutorWrapper } from './endpoint-base.js';
+import type { IEndpointMeta, IEndpoint } from './endpoints.js';
 
 const pump = promisify(pipeline);
 
@@ -54,81 +53,53 @@ export class ApiCallService implements OnApplicationShutdown {
 		}, 1000 * 60 * 60);
 	}
 
-	#sendApiError(reply: FastifyReply, err: ApiError): void {
-		let statusCode = err.httpStatusCode;
-		if (err.httpStatusCode === 401) {
-			reply.header('WWW-Authenticate', 'Bearer realm="Misskey"');
-		} else if (err.kind === 'client') {
-			reply.header('WWW-Authenticate', `Bearer realm="Misskey", error="invalid_request", error_description="${err.message}"`);
-			statusCode = statusCode ?? 400;
-		} else if (err.kind === 'permission') {
-			// (ROLE_PERMISSION_DENIEDは関係ない)
-			if (err.code === 'PERMISSION_DENIED') {
-				reply.header('WWW-Authenticate', `Bearer realm="Misskey", error="insufficient_scope", error_description="${err.message}"`);
-			}
-			statusCode = statusCode ?? 403;
-		} else if (!statusCode) {
-			statusCode = 500;
-		}
-		this.send(reply, statusCode, err);
-	}
-
-	#sendAuthenticationError(reply: FastifyReply, err: unknown): void {
-		if (err instanceof AuthenticationError) {
-			const message = 'Authentication failed. Please ensure your token is correct.';
-			reply.header('WWW-Authenticate', `Bearer realm="Misskey", error="invalid_token", error_description="${message}"`);
-			this.send(reply, 401, new ApiError({
-				message: 'Authentication failed. Please ensure your token is correct.',
-				code: 'AUTHENTICATION_FAILED',
-				id: 'b0a7f5f8-dc2f-4171-b91f-de88ad238e14',
-			}));
-		} else {
-			this.send(reply, 500, new ApiError());
-		}
-	}
-
 	@bindThis
 	public handleRequest(
-		endpoint: { name: string, meta: IEndpointMeta, exec: ExecutorWrapper },
+		endpoint: IEndpoint & { exec: any },
 		request: FastifyRequest<{ Body: Record<string, unknown> | undefined, Querystring: Record<string, unknown> }>,
 		reply: FastifyReply,
-	): void {
+	) {
 		const body = request.method === 'GET'
 			? request.query
 			: request.body;
 
-		// https://datatracker.ietf.org/doc/html/rfc6750.html#section-2.1 (case sensitive)
-		const token = request.headers.authorization?.startsWith('Bearer ')
-			? request.headers.authorization.slice(7)
-			: body?.['i'];
+		const token = body?.['i'];
 		if (token != null && typeof token !== 'string') {
 			reply.code(400);
 			return;
 		}
 		this.authenticateService.authenticate(token).then(([user, app]) => {
 			this.call(endpoint, user, app, body, null, request).then((res) => {
-				if (request.method === 'GET' && endpoint.meta.cacheSec && !token && !user) {
+				if (request.method === 'GET' && endpoint.meta.cacheSec && !body?.['i'] && !user) {
 					reply.header('Cache-Control', `public, max-age=${endpoint.meta.cacheSec}`);
 				}
 				this.send(reply, res);
 			}).catch((err: ApiError) => {
-				this.#sendApiError(reply, err);
+				this.send(reply, err.httpStatusCode ? err.httpStatusCode : err.kind === 'client' ? 400 : err.kind === 'permission' ? 403 : 500, err);
 			});
 
 			if (user) {
 				this.logIp(request, user);
 			}
 		}).catch(err => {
-			this.#sendAuthenticationError(reply, err);
+			if (err instanceof AuthenticationError) {
+				this.send(reply, 403, new ApiError({
+					message: 'Authentication failed. Please ensure your token is correct.',
+					code: 'AUTHENTICATION_FAILED',
+					id: 'b0a7f5f8-dc2f-4171-b91f-de88ad238e14',
+				}));
+			} else {
+				this.send(reply, 500, new ApiError());
+			}
 		});
 	}
 
 	@bindThis
 	public async handleMultipartRequest(
-		endpoint: { name: string, meta: IEndpointMeta, exec: ExecutorWrapper },
+		endpoint: IEndpoint & { exec: any },
 		request: FastifyRequest<{ Body: Record<string, unknown>, Querystring: Record<string, unknown> }>,
 		reply: FastifyReply,
-	): Promise<void> {
+	) {
 		const multipartData = await request.file().catch(() => {
 			/* Fastify throws if the remote didn't send multipart data. Return 400 below. */
 		});
@@ -146,10 +117,7 @@ export class ApiCallService implements OnApplicationShutdown {
 			fields[k] = typeof v === 'object' && 'value' in v ? v.value : undefined;
 		}
 
-		// https://datatracker.ietf.org/doc/html/rfc6750.html#section-2.1 (case sensitive)
-		const token = request.headers.authorization?.startsWith('Bearer ')
-			? request.headers.authorization.slice(7)
-			: fields['i'];
+		const token = fields['i'];
 		if (token != null && typeof token !== 'string') {
 			reply.code(400);
 			return;
@@ -161,14 +129,22 @@ export class ApiCallService implements OnApplicationShutdown {
 			}, request).then((res) => {
 				this.send(reply, res);
 			}).catch((err: ApiError) => {
-				this.#sendApiError(reply, err);
+				this.send(reply, err.httpStatusCode ? err.httpStatusCode : err.kind === 'client' ? 400 : err.kind === 'permission' ? 403 : 500, err);
 			});
 
 			if (user) {
 				this.logIp(request, user);
 			}
 		}).catch(err => {
-			this.#sendAuthenticationError(reply, err);
+			if (err instanceof AuthenticationError) {
+				this.send(reply, 403, new ApiError({
+					message: 'Authentication failed. Please ensure your token is correct.',
+					code: 'AUTHENTICATION_FAILED',
+					id: 'b0a7f5f8-dc2f-4171-b91f-de88ad238e14',
+				}));
+			} else {
+				this.send(reply, 500, new ApiError());
+			}
 		});
 	}
 
@@ -220,7 +196,7 @@ export class ApiCallService implements OnApplicationShutdown {
 
 	@bindThis
 	private async call(
-		ep: { name: string, meta: IEndpointMeta, exec: ExecutorWrapper },
+		ep: IEndpoint & { exec: any },
 		user: LocalUser | null | undefined,
 		token: AccessToken | null | undefined,
 		data: any,
@@ -237,7 +213,7 @@ export class ApiCallService implements OnApplicationShutdown {
 		}
 
 		if (ep.meta.limit) {
-			// koa will automatically load the `X-Forwarded-For` header if `proxy: true` is configured in the app.
+		// koa will automatically load the `X-Forwarded-For` header if `proxy: true` is configured in the app.
 			let limitActor: string;
 			if (user) {
 				limitActor = user.id;
@@ -279,8 +255,8 @@ export class ApiCallService implements OnApplicationShutdown {
 				throw new ApiError({
 					message: 'Your account has been suspended.',
 					code: 'YOUR_ACCOUNT_SUSPENDED',
-					kind: 'permission',
 					id: 'a8c724b3-6e9c-4b46-b1a8-bc3ed6258370',
+					httpStatusCode: 403,
 				});
 			}
 		}
@@ -290,8 +266,8 @@ export class ApiCallService implements OnApplicationShutdown {
 				throw new ApiError({
 					message: 'You have moved your account.',
 					code: 'YOUR_ACCOUNT_MOVED',
-					kind: 'permission',
 					id: '56f20ec9-fd06-4fa5-841b-edd6d7d4fa31',
+					httpStatusCode: 403,
 				});
 			}
 		}
@@ -302,7 +278,6 @@ export class ApiCallService implements OnApplicationShutdown {
 				throw new ApiError({
 					message: 'You are not assigned to a moderator role.',
 					code: 'ROLE_PERMISSION_DENIED',
-					kind: 'permission',
 					id: 'd33d5333-db36-423d-a8f9-1a2b9549da41',
 				});
 			}
@@ -310,7 +285,6 @@ export class ApiCallService implements OnApplicationShutdown {
 				throw new ApiError({
 					message: 'You are not assigned to an administrator role.',
 					code: 'ROLE_PERMISSION_DENIED',
-					kind: 'permission',
 					id: 'c3d38592-54c0-429d-be96-5636b0431a61',
 				});
 			}
@@ -322,7 +296,6 @@ export class ApiCallService implements OnApplicationShutdown {
 				throw new ApiError({
 					message: 'You are not assigned to a required role.',
 					code: 'ROLE_PERMISSION_DENIED',
-					kind: 'permission',
 					id: '7f86f06f-7e15-4057-8561-f4b6d4ac755a',
 				});
 			}
@@ -332,23 +305,19 @@ export class ApiCallService implements OnApplicationShutdown {
 			throw new ApiError({
 				message: 'Your app does not have the necessary permissions to use this endpoint.',
 				code: 'PERMISSION_DENIED',
-				kind: 'permission',
 				id: '1370e5b7-d4eb-4566-bb1d-7748ee6a1838',
 			});
 		}
 
 		// Cast non JSON input
-		if ((ep.meta.requireFile || request.method === 'GET') && ep.meta.defines[0]?.req?.properties) {
-			for (const k of Object.keys(ep.meta.defines[0].req.properties)) {
-				const param = ep.meta.defines[0].req.properties[k];
-				if (typeof param === 'object' && (
-					(typeof param.type === 'string' && ['boolean', 'number', 'integer'].includes(param.type ?? '')) ||
-					(Array.isArray(param.type) && param.type.every(t => ['boolean', 'number', 'integer'].includes(t)))
-				) && typeof data[k] === 'string') {
+		if ((ep.meta.requireFile || request.method === 'GET') && ep.params.properties) {
+			for (const k of Object.keys(ep.params.properties)) {
+				const param = ep.params.properties![k];
+				if (['boolean', 'number', 'integer'].includes(param.type ?? '') && typeof data[k] === 'string') {
 					try {
 						data[k] = JSON.parse(data[k]);
 					} catch (e) {
-						throw new ApiError({
+						throw	new ApiError({
 							message: 'Invalid param.',
 							code: 'INVALID_PARAM',
 							id: '0b5f1631-7c1a-41a6-b399-cce335f34d85',

packages/backend/src/server/api/ApiServerService.ts

@@ -8,12 +8,11 @@ import type { UsersRepository, InstancesRepository, AccessTokensRepository } fro
 import { DI } from '@/di-symbols.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
-import { endpoints } from 'misskey-js/built/endpoints.js';
+import endpoints from './endpoints.js';
 import { ApiCallService } from './ApiCallService.js';
 import { SignupApiService } from './SignupApiService.js';
 import { SigninApiService } from './SigninApiService.js';
 import type { FastifyInstance, FastifyPluginOptions } from 'fastify';
-import { ExecutorWrapper } from './endpoint-base.js';
 
 @Injectable()
 export class ApiServerService {
@@ -61,20 +60,21 @@ export class ApiServerService {
 			done();
 		});
 
-		for (const [name, meta] of Object.entries(endpoints)) {
+		for (const endpoint of endpoints) {
 			const ep = {
-				name,
-				meta,
-				exec: this.moduleRef.get('ep:' + name, { strict: false }).exec as ExecutorWrapper,
+				name: endpoint.name,
+				meta: endpoint.meta,
+				params: endpoint.params,
+				exec: this.moduleRef.get('ep:' + endpoint.name, { strict: false }).exec,
 			};
 
-			if (meta.requireFile) {
+			if (endpoint.meta.requireFile) {
 				fastify.all<{
 					Params: { endpoint: string; },
 					Body: Record<string, unknown>,
 					Querystring: Record<string, unknown>,
-				}>('/' + name, async (request, reply) => {
-					if (request.method === 'GET' && !meta.allowGet) {
+				}>('/' + endpoint.name, async (request, reply) => {
+					if (request.method === 'GET' && !endpoint.meta.allowGet) {
 						reply.code(405);
 						reply.send();
 						return;
@@ -89,8 +89,8 @@ export class ApiServerService {
 					Params: { endpoint: string; },
 					Body: Record<string, unknown>,
 					Querystring: Record<string, unknown>,
-				}>('/' + name, { bodyLimit: 1024 * 1024 }, async (request, reply) => {
-					if (request.method === 'GET' && !meta.allowGet) {
+				}>('/' + endpoint.name, { bodyLimit: 1024 * 1024 }, async (request, reply) => {
+					if (request.method === 'GET' && !endpoint.meta.allowGet) {
 						reply.code(405);
 						reply.send();
 						return;

packages/backend/src/server/api/RateLimiterService.ts

@@ -5,7 +5,7 @@ import { DI } from '@/di-symbols.js';
 import type Logger from '@/logger.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { bindThis } from '@/decorators.js';
-import type { IEndpointMeta } from 'misskey-js/built/endpoints.types.js';
+import type { IEndpointMeta } from './endpoints.js';
 
 @Injectable()
 export class RateLimiterService {

packages/backend/src/server/api/SignupApiService.ts

@@ -1,4 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common';
+import rndstr from 'rndstr';
 import bcrypt from 'bcryptjs';
 import { IsNull } from 'typeorm';
 import { DI } from '@/di-symbols.js';
@@ -15,7 +16,6 @@ import { FastifyReplyError } from '@/misc/fastify-reply-error.js';
 import { bindThis } from '@/decorators.js';
 import { SigninService } from './SigninService.js';
 import type { FastifyRequest, FastifyReply } from 'fastify';
-import { L_CHARS, secureRndstr } from '@/misc/secure-rndstr.js';
 
 @Injectable()
 export class SignupApiService {
@@ -67,7 +67,7 @@ export class SignupApiService {
 		const body = request.body;
 
 		const instance = await this.metaService.fetch(true);
-
+	
 		// Verify *Captcha
 		// ただしテスト時はこの機構は障害となるため無効にする
 		if (process.env.NODE_ENV !== 'test') {
@@ -76,7 +76,7 @@ export class SignupApiService {
 					throw new FastifyReplyError(400, err);
 				});
 			}
-
+	
 			if (instance.enableRecaptcha && instance.recaptchaSecretKey) {
 				await this.captchaService.verifyRecaptcha(instance.recaptchaSecretKey, body['g-recaptcha-response']).catch(err => {
 					throw new FastifyReplyError(400, err);
@@ -89,44 +89,44 @@ export class SignupApiService {
 				});
 			}
 		}
-
+	
 		const username = body['username'];
 		const password = body['password'];
 		const host: string | null = process.env.NODE_ENV === 'test' ? (body['host'] ?? null) : null;
 		const invitationCode = body['invitationCode'];
 		const emailAddress = body['emailAddress'];
-
+	
 		if (instance.emailRequiredForSignup) {
 			if (emailAddress == null || typeof emailAddress !== 'string') {
 				reply.code(400);
 				return;
 			}
-
+	
 			const res = await this.emailService.validateEmailForAccount(emailAddress);
 			if (!res.available) {
 				reply.code(400);
 				return;
 			}
 		}
-
+	
 		if (instance.disableRegistration) {
 			if (invitationCode == null || typeof invitationCode !== 'string') {
 				reply.code(400);
 				return;
 			}
-
+	
 			const ticket = await this.registrationTicketsRepository.findOneBy({
 				code: invitationCode,
 			});
-
+	
 			if (ticket == null) {
 				reply.code(400);
 				return;
 			}
-
+	
 			this.registrationTicketsRepository.delete(ticket.id);
 		}
-
+	
 		if (instance.emailRequiredForSignup) {
 			if (await this.usersRepository.findOneBy({ usernameLower: username.toLowerCase(), host: IsNull() })) {
 				throw new FastifyReplyError(400, 'DUPLICATED_USERNAME');
@@ -142,7 +142,7 @@ export class SignupApiService {
 				throw new FastifyReplyError(400, 'DENIED_USERNAME');
 			}
 
-			const code = secureRndstr(16, { chars: L_CHARS });
+			const code = rndstr('a-z0-9', 16);
 
 			// Generate hash of password
 			const salt = await bcrypt.genSalt(8);
@@ -170,12 +170,12 @@ export class SignupApiService {
 				const { account, secret } = await this.signupService.signup({
 					username, password, host,
 				});
-
+	
 				const res = await this.userEntityService.pack(account, account, {
 					detail: true,
 					includeSecrets: true,
 				});
-
+	
 				return {
 					...res,
 					token: secret,

packages/backend/src/server/api/StreamingApiServerService.ts

@@ -10,7 +10,7 @@ import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { NotificationService } from '@/core/NotificationService.js';
 import { bindThis } from '@/decorators.js';
 import { CacheService } from '@/core/CacheService.js';
-import { LocalUser } from '@/models/entities/User.js';
+import { LocalUser } from '@/models/entities/User';
 import { AuthenticateService, AuthenticationError } from './AuthenticateService.js';
 import MainStreamConnection from './stream/index.js';
 import { ChannelsService } from './stream/ChannelsService.js';
@@ -58,21 +58,11 @@ export class StreamingApiServerService {
 			let user: LocalUser | null = null;
 			let app: AccessToken | null = null;
 
-			// https://datatracker.ietf.org/doc/html/rfc6750.html#section-2.1
-			// Note that the standard WHATWG WebSocket API does not support setting any headers,
-			// but non-browser apps may still be able to set it.
-			const token = request.headers.authorization?.startsWith('Bearer ')
-				? request.headers.authorization.slice(7)
-				: q.get('i');
-
 			try {
-				[user, app] = await this.authenticateService.authenticate(token);
+				[user, app] = await this.authenticateService.authenticate(q.get('i'));
 			} catch (e) {
 				if (e instanceof AuthenticationError) {
-					socket.write([
-						'HTTP/1.1 401 Unauthorized',
-						'WWW-Authenticate: Bearer realm="Misskey", error="invalid_token", error_description="Failed to authenticate"',
-					].join('\r\n') + '\r\n\r\n');
+					socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
 				} else {
 					socket.write('HTTP/1.1 500 Internal Server Error\r\n\r\n');
 				}

packages/backend/src/server/api/endpoint-base.ts

@@ -1,14 +1,10 @@
 import * as fs from 'node:fs';
-import _Ajv from 'ajv';
+import Ajv from 'ajv';
+import type { Schema, SchemaType } from '@/misc/json-schema.js';
 import type { LocalUser } from '@/models/entities/User.js';
 import type { AccessToken } from '@/models/entities/AccessToken.js';
 import { ApiError } from './error.js';
-import { endpoints, getEndpointSchema } from 'misskey-js/built/endpoints.js';
-import type { IEndpointMeta, ResponseOf, SchemaOrUndefined } from 'misskey-js/built/endpoints.types.js';
-import type { Endpoints } from 'misskey-js';
-import { WeakSerialized } from 'schema-type';
-
-const Ajv = _Ajv.default;
+import type { IEndpointMeta } from './endpoints.js';
 
 const ajv = new Ajv({
 	useDefaults: true,
@@ -23,42 +19,21 @@ type File = {
 	path: string;
 };
 
-export type Executor<T extends IEndpointMeta, P = SchemaOrUndefined<T['defines'][number]['req'], true>> =
-	(
-		params: P,
-		user: LocalUser | (T['requireCredential'] extends true ? never : null),
-		token: AccessToken | null,
-		file?: File,
-		cleanup?: () => any,
-		ip?: string | null,
-		headers?: Record<string, string> | null
-	) => Promise<WeakSerialized<ResponseOf<T, P, true>>>;
+// TODO: paramsの型をT['params']のスキーマ定義から推論する
+type Executor<T extends IEndpointMeta, Ps extends Schema> =
+	(params: SchemaType<Ps>, user: T['requireCredential'] extends true ? LocalUser : LocalUser | null, token: AccessToken | null, file?: File, cleanup?: () => any, ip?: string | null, headers?: Record<string, string> | null) =>
+		Promise<T['res'] extends undefined ? Response : SchemaType<NonNullable<T['res']>>>;
 
-// ExecutorWrapperの型はあえて緩くしておく
-export type ExecutorWrapper =
-	(
-		params: any,
-		user: LocalUser | null,
-		token: AccessToken | null,
-		file?: File,
-		ip?: string | null,
-		headers?: Record<string, string> | null
-	) => Promise<any>;
+export abstract class Endpoint<T extends IEndpointMeta, Ps extends Schema> {
+	public exec: (params: any, user: T['requireCredential'] extends true ? LocalUser : LocalUser | null, token: AccessToken | null, file?: File, ip?: string | null, headers?: Record<string, string> | null) => Promise<any>;
 
-export abstract class Endpoint<E extends keyof Endpoints, T extends IEndpointMeta = Endpoints[E]> {
-	public readonly name: E;
-	public readonly meta: Endpoints[E];
-	public exec: ExecutorWrapper;
+	constructor(meta: T, paramDef: Ps, cb: Executor<T, Ps>) {
+		const validate = ajv.compile(paramDef);
 
-	constructor(cb: Executor<T>) {
-		this.meta = endpoints[this.name];
-		const req = getEndpointSchema('req', this.name);
-		const validate = req ? ajv.compile(req) : null;
-
-		this.exec = (params, user, token, file, ip, headers) => {
+		this.exec = (params: any, user: T['requireCredential'] extends true ? LocalUser : LocalUser | null, token: AccessToken | null, file?: File, ip?: string | null, headers?: Record<string, string> | null) => {
 			let cleanup: undefined | (() => void) = undefined;
 	
-			if (this.meta.requireFile) {
+			if (meta.requireFile) {
 				cleanup = () => {
 					if (file) fs.unlink(file.path, () => {});
 				};
@@ -69,30 +44,24 @@ export abstract class Endpoint<E extends keyof Endpoints, T extends IEndpointMet
 					id: '4267801e-70d1-416a-b011-4ee502885d8b',
 				}));
 			}
-
-			if (validate) {
-				const valid = validate(params);
-
-				if (!valid) {
-					if (file) cleanup!();
-		
-					const errors = validate.errors!;
-					const err = new ApiError({
-						message: 'Invalid param.',
-						code: 'INVALID_PARAM',
-						id: '3d81ceae-475f-4600-b2a8-2bc116157532',
-					}, {
-						param: errors[0].schemaPath,
-						reason: errors[0].message,
-					});
-					return Promise.reject(err);
-				}
-			} else {
-				// validateがnullである場合、paramsがnullや空オブジェクトであるべきではあるが、
-				// 特にチェックはしない
+	
+			const valid = validate(params);
+			if (!valid) {
+				if (file) cleanup!();
+	
+				const errors = validate.errors!;
+				const err = new ApiError({
+					message: 'Invalid param.',
+					code: 'INVALID_PARAM',
+					id: '3d81ceae-475f-4600-b2a8-2bc116157532',
+				}, {
+					param: errors[0].schemaPath,
+					reason: errors[0].message,
+				});
+				return Promise.reject(err);
 			}
-
-			return cb(params as any, user as any, token, file, cleanup, ip, headers);
+	
+			return cb(params as SchemaType<Ps>, user, token, file, cleanup, ip, headers);
 		};
 	}
 }

packages/backend/src/server/api/endpoints.ts

@@ -0,0 +1,793 @@
+import type { Schema } from '@/misc/json-schema.js';
+import { RolePolicies } from '@/core/RoleService.js';
+
+import * as ep___admin_meta from './endpoints/admin/meta.js';
+import * as ep___admin_abuseUserReports from './endpoints/admin/abuse-user-reports.js';
+import * as ep___admin_accounts_create from './endpoints/admin/accounts/create.js';
+import * as ep___admin_accounts_delete from './endpoints/admin/accounts/delete.js';
+import * as ep___admin_ad_create from './endpoints/admin/ad/create.js';
+import * as ep___admin_ad_delete from './endpoints/admin/ad/delete.js';
+import * as ep___admin_ad_list from './endpoints/admin/ad/list.js';
+import * as ep___admin_ad_update from './endpoints/admin/ad/update.js';
+import * as ep___admin_announcements_create from './endpoints/admin/announcements/create.js';
+import * as ep___admin_announcements_delete from './endpoints/admin/announcements/delete.js';
+import * as ep___admin_announcements_list from './endpoints/admin/announcements/list.js';
+import * as ep___admin_announcements_update from './endpoints/admin/announcements/update.js';
+import * as ep___admin_deleteAllFilesOfAUser from './endpoints/admin/delete-all-files-of-a-user.js';
+import * as ep___admin_drive_cleanRemoteFiles from './endpoints/admin/drive/clean-remote-files.js';
+import * as ep___admin_drive_cleanup from './endpoints/admin/drive/cleanup.js';
+import * as ep___admin_drive_files from './endpoints/admin/drive/files.js';
+import * as ep___admin_drive_showFile from './endpoints/admin/drive/show-file.js';
+import * as ep___admin_emoji_addAliasesBulk from './endpoints/admin/emoji/add-aliases-bulk.js';
+import * as ep___admin_emoji_add from './endpoints/admin/emoji/add.js';
+import * as ep___admin_emoji_copy from './endpoints/admin/emoji/copy.js';
+import * as ep___admin_emoji_deleteBulk from './endpoints/admin/emoji/delete-bulk.js';
+import * as ep___admin_emoji_delete from './endpoints/admin/emoji/delete.js';
+import * as ep___admin_emoji_importZip from './endpoints/admin/emoji/import-zip.js';
+import * as ep___admin_emoji_listRemote from './endpoints/admin/emoji/list-remote.js';
+import * as ep___admin_emoji_list from './endpoints/admin/emoji/list.js';
+import * as ep___admin_emoji_removeAliasesBulk from './endpoints/admin/emoji/remove-aliases-bulk.js';
+import * as ep___admin_emoji_setAliasesBulk from './endpoints/admin/emoji/set-aliases-bulk.js';
+import * as ep___admin_emoji_setCategoryBulk from './endpoints/admin/emoji/set-category-bulk.js';
+import * as ep___admin_emoji_setLicenseBulk from './endpoints/admin/emoji/set-license-bulk.js';
+import * as ep___admin_emoji_update from './endpoints/admin/emoji/update.js';
+import * as ep___admin_federation_deleteAllFiles from './endpoints/admin/federation/delete-all-files.js';
+import * as ep___admin_federation_refreshRemoteInstanceMetadata from './endpoints/admin/federation/refresh-remote-instance-metadata.js';
+import * as ep___admin_federation_removeAllFollowing from './endpoints/admin/federation/remove-all-following.js';
+import * as ep___admin_federation_updateInstance from './endpoints/admin/federation/update-instance.js';
+import * as ep___admin_getIndexStats from './endpoints/admin/get-index-stats.js';
+import * as ep___admin_getTableStats from './endpoints/admin/get-table-stats.js';
+import * as ep___admin_getUserIps from './endpoints/admin/get-user-ips.js';
+import * as ep___invite from './endpoints/invite.js';
+import * as ep___admin_promo_create from './endpoints/admin/promo/create.js';
+import * as ep___admin_queue_clear from './endpoints/admin/queue/clear.js';
+import * as ep___admin_queue_deliverDelayed from './endpoints/admin/queue/deliver-delayed.js';
+import * as ep___admin_queue_inboxDelayed from './endpoints/admin/queue/inbox-delayed.js';
+import * as ep___admin_queue_promote from './endpoints/admin/queue/promote.js';
+import * as ep___admin_queue_stats from './endpoints/admin/queue/stats.js';
+import * as ep___admin_relays_add from './endpoints/admin/relays/add.js';
+import * as ep___admin_relays_list from './endpoints/admin/relays/list.js';
+import * as ep___admin_relays_remove from './endpoints/admin/relays/remove.js';
+import * as ep___admin_resetPassword from './endpoints/admin/reset-password.js';
+import * as ep___admin_resolveAbuseUserReport from './endpoints/admin/resolve-abuse-user-report.js';
+import * as ep___admin_sendEmail from './endpoints/admin/send-email.js';
+import * as ep___admin_serverInfo from './endpoints/admin/server-info.js';
+import * as ep___admin_showModerationLogs from './endpoints/admin/show-moderation-logs.js';
+import * as ep___admin_showUser from './endpoints/admin/show-user.js';
+import * as ep___admin_showUsers from './endpoints/admin/show-users.js';
+import * as ep___admin_suspendUser from './endpoints/admin/suspend-user.js';
+import * as ep___admin_unsuspendUser from './endpoints/admin/unsuspend-user.js';
+import * as ep___admin_updateMeta from './endpoints/admin/update-meta.js';
+import * as ep___admin_deleteAccount from './endpoints/admin/delete-account.js';
+import * as ep___admin_updateUserNote from './endpoints/admin/update-user-note.js';
+import * as ep___admin_roles_create from './endpoints/admin/roles/create.js';
+import * as ep___admin_roles_delete from './endpoints/admin/roles/delete.js';
+import * as ep___admin_roles_list from './endpoints/admin/roles/list.js';
+import * as ep___admin_roles_show from './endpoints/admin/roles/show.js';
+import * as ep___admin_roles_update from './endpoints/admin/roles/update.js';
+import * as ep___admin_roles_assign from './endpoints/admin/roles/assign.js';
+import * as ep___admin_roles_unassign from './endpoints/admin/roles/unassign.js';
+import * as ep___admin_roles_updateDefaultPolicies from './endpoints/admin/roles/update-default-policies.js';
+import * as ep___admin_roles_users from './endpoints/admin/roles/users.js';
+import * as ep___announcements from './endpoints/announcements.js';
+import * as ep___antennas_create from './endpoints/antennas/create.js';
+import * as ep___antennas_delete from './endpoints/antennas/delete.js';
+import * as ep___antennas_list from './endpoints/antennas/list.js';
+import * as ep___antennas_notes from './endpoints/antennas/notes.js';
+import * as ep___antennas_show from './endpoints/antennas/show.js';
+import * as ep___antennas_update from './endpoints/antennas/update.js';
+import * as ep___ap_get from './endpoints/ap/get.js';
+import * as ep___ap_show from './endpoints/ap/show.js';
+import * as ep___app_create from './endpoints/app/create.js';
+import * as ep___app_show from './endpoints/app/show.js';
+import * as ep___auth_accept from './endpoints/auth/accept.js';
+import * as ep___auth_session_generate from './endpoints/auth/session/generate.js';
+import * as ep___auth_session_show from './endpoints/auth/session/show.js';
+import * as ep___auth_session_userkey from './endpoints/auth/session/userkey.js';
+import * as ep___blocking_create from './endpoints/blocking/create.js';
+import * as ep___blocking_delete from './endpoints/blocking/delete.js';
+import * as ep___blocking_list from './endpoints/blocking/list.js';
+import * as ep___channels_create from './endpoints/channels/create.js';
+import * as ep___channels_featured from './endpoints/channels/featured.js';
+import * as ep___channels_follow from './endpoints/channels/follow.js';
+import * as ep___channels_followed from './endpoints/channels/followed.js';
+import * as ep___channels_owned from './endpoints/channels/owned.js';
+import * as ep___channels_show from './endpoints/channels/show.js';
+import * as ep___channels_timeline from './endpoints/channels/timeline.js';
+import * as ep___channels_unfollow from './endpoints/channels/unfollow.js';
+import * as ep___channels_update from './endpoints/channels/update.js';
+import * as ep___channels_favorite from './endpoints/channels/favorite.js';
+import * as ep___channels_unfavorite from './endpoints/channels/unfavorite.js';
+import * as ep___channels_myFavorites from './endpoints/channels/my-favorites.js';
+import * as ep___channels_search from './endpoints/channels/search.js';
+import * as ep___charts_activeUsers from './endpoints/charts/active-users.js';
+import * as ep___charts_apRequest from './endpoints/charts/ap-request.js';
+import * as ep___charts_drive from './endpoints/charts/drive.js';
+import * as ep___charts_federation from './endpoints/charts/federation.js';
+import * as ep___charts_instance from './endpoints/charts/instance.js';
+import * as ep___charts_notes from './endpoints/charts/notes.js';
+import * as ep___charts_user_drive from './endpoints/charts/user/drive.js';
+import * as ep___charts_user_following from './endpoints/charts/user/following.js';
+import * as ep___charts_user_notes from './endpoints/charts/user/notes.js';
+import * as ep___charts_user_pv from './endpoints/charts/user/pv.js';
+import * as ep___charts_user_reactions from './endpoints/charts/user/reactions.js';
+import * as ep___charts_users from './endpoints/charts/users.js';
+import * as ep___clips_addNote from './endpoints/clips/add-note.js';
+import * as ep___clips_removeNote from './endpoints/clips/remove-note.js';
+import * as ep___clips_create from './endpoints/clips/create.js';
+import * as ep___clips_delete from './endpoints/clips/delete.js';
+import * as ep___clips_list from './endpoints/clips/list.js';
+import * as ep___clips_notes from './endpoints/clips/notes.js';
+import * as ep___clips_show from './endpoints/clips/show.js';
+import * as ep___clips_update from './endpoints/clips/update.js';
+import * as ep___clips_favorite from './endpoints/clips/favorite.js';
+import * as ep___clips_unfavorite from './endpoints/clips/unfavorite.js';
+import * as ep___clips_myFavorites from './endpoints/clips/my-favorites.js';
+import * as ep___drive from './endpoints/drive.js';
+import * as ep___drive_files from './endpoints/drive/files.js';
+import * as ep___drive_files_attachedNotes from './endpoints/drive/files/attached-notes.js';
+import * as ep___drive_files_checkExistence from './endpoints/drive/files/check-existence.js';
+import * as ep___drive_files_create from './endpoints/drive/files/create.js';
+import * as ep___drive_files_delete from './endpoints/drive/files/delete.js';
+import * as ep___drive_files_findByHash from './endpoints/drive/files/find-by-hash.js';
+import * as ep___drive_files_find from './endpoints/drive/files/find.js';
+import * as ep___drive_files_show from './endpoints/drive/files/show.js';
+import * as ep___drive_files_update from './endpoints/drive/files/update.js';
+import * as ep___drive_files_uploadFromUrl from './endpoints/drive/files/upload-from-url.js';
+import * as ep___drive_folders from './endpoints/drive/folders.js';
+import * as ep___drive_folders_create from './endpoints/drive/folders/create.js';
+import * as ep___drive_folders_delete from './endpoints/drive/folders/delete.js';
+import * as ep___drive_folders_find from './endpoints/drive/folders/find.js';
+import * as ep___drive_folders_show from './endpoints/drive/folders/show.js';
+import * as ep___drive_folders_update from './endpoints/drive/folders/update.js';
+import * as ep___drive_stream from './endpoints/drive/stream.js';
+import * as ep___emailAddress_available from './endpoints/email-address/available.js';
+import * as ep___endpoint from './endpoints/endpoint.js';
+import * as ep___endpoints from './endpoints/endpoints.js';
+import * as ep___exportCustomEmojis from './endpoints/export-custom-emojis.js';
+import * as ep___federation_followers from './endpoints/federation/followers.js';
+import * as ep___federation_following from './endpoints/federation/following.js';
+import * as ep___federation_instances from './endpoints/federation/instances.js';
+import * as ep___federation_showInstance from './endpoints/federation/show-instance.js';
+import * as ep___federation_updateRemoteUser from './endpoints/federation/update-remote-user.js';
+import * as ep___federation_users from './endpoints/federation/users.js';
+import * as ep___federation_stats from './endpoints/federation/stats.js';
+import * as ep___following_create from './endpoints/following/create.js';
+import * as ep___following_delete from './endpoints/following/delete.js';
+import * as ep___following_invalidate from './endpoints/following/invalidate.js';
+import * as ep___following_requests_accept from './endpoints/following/requests/accept.js';
+import * as ep___following_requests_cancel from './endpoints/following/requests/cancel.js';
+import * as ep___following_requests_list from './endpoints/following/requests/list.js';
+import * as ep___following_requests_reject from './endpoints/following/requests/reject.js';
+import * as ep___gallery_featured from './endpoints/gallery/featured.js';
+import * as ep___gallery_popular from './endpoints/gallery/popular.js';
+import * as ep___gallery_posts from './endpoints/gallery/posts.js';
+import * as ep___gallery_posts_create from './endpoints/gallery/posts/create.js';
+import * as ep___gallery_posts_delete from './endpoints/gallery/posts/delete.js';
+import * as ep___gallery_posts_like from './endpoints/gallery/posts/like.js';
+import * as ep___gallery_posts_show from './endpoints/gallery/posts/show.js';
+import * as ep___gallery_posts_unlike from './endpoints/gallery/posts/unlike.js';
+import * as ep___gallery_posts_update from './endpoints/gallery/posts/update.js';
+import * as ep___getOnlineUsersCount from './endpoints/get-online-users-count.js';
+import * as ep___hashtags_list from './endpoints/hashtags/list.js';
+import * as ep___hashtags_search from './endpoints/hashtags/search.js';
+import * as ep___hashtags_show from './endpoints/hashtags/show.js';
+import * as ep___hashtags_trend from './endpoints/hashtags/trend.js';
+import * as ep___hashtags_users from './endpoints/hashtags/users.js';
+import * as ep___i from './endpoints/i.js';
+import * as ep___i_2fa_done from './endpoints/i/2fa/done.js';
+import * as ep___i_2fa_keyDone from './endpoints/i/2fa/key-done.js';
+import * as ep___i_2fa_passwordLess from './endpoints/i/2fa/password-less.js';
+import * as ep___i_2fa_registerKey from './endpoints/i/2fa/register-key.js';
+import * as ep___i_2fa_register from './endpoints/i/2fa/register.js';
+import * as ep___i_2fa_updateKey from './endpoints/i/2fa/update-key.js';
+import * as ep___i_2fa_removeKey from './endpoints/i/2fa/remove-key.js';
+import * as ep___i_2fa_unregister from './endpoints/i/2fa/unregister.js';
+import * as ep___i_apps from './endpoints/i/apps.js';
+import * as ep___i_authorizedApps from './endpoints/i/authorized-apps.js';
+import * as ep___i_claimAchievement from './endpoints/i/claim-achievement.js';
+import * as ep___i_changePassword from './endpoints/i/change-password.js';
+import * as ep___i_deleteAccount from './endpoints/i/delete-account.js';
+import * as ep___i_exportBlocking from './endpoints/i/export-blocking.js';
+import * as ep___i_exportFollowing from './endpoints/i/export-following.js';
+import * as ep___i_exportMute from './endpoints/i/export-mute.js';
+import * as ep___i_exportNotes from './endpoints/i/export-notes.js';
+import * as ep___i_exportFavorites from './endpoints/i/export-favorites.js';
+import * as ep___i_exportUserLists from './endpoints/i/export-user-lists.js';
+import * as ep___i_exportAntennas from './endpoints/i/export-antennas.js';
+import * as ep___i_favorites from './endpoints/i/favorites.js';
+import * as ep___i_gallery_likes from './endpoints/i/gallery/likes.js';
+import * as ep___i_gallery_posts from './endpoints/i/gallery/posts.js';
+import * as ep___i_getWordMutedNotesCount from './endpoints/i/get-word-muted-notes-count.js';
+import * as ep___i_importBlocking from './endpoints/i/import-blocking.js';
+import * as ep___i_importFollowing from './endpoints/i/import-following.js';
+import * as ep___i_importMuting from './endpoints/i/import-muting.js';
+import * as ep___i_importUserLists from './endpoints/i/import-user-lists.js';
+import * as ep___i_importAntennas from './endpoints/i/import-antennas.js';
+import * as ep___i_notifications from './endpoints/i/notifications.js';
+import * as ep___i_pageLikes from './endpoints/i/page-likes.js';
+import * as ep___i_pages from './endpoints/i/pages.js';
+import * as ep___i_pin from './endpoints/i/pin.js';
+import * as ep___i_readAllUnreadNotes from './endpoints/i/read-all-unread-notes.js';
+import * as ep___i_readAnnouncement from './endpoints/i/read-announcement.js';
+import * as ep___i_regenerateToken from './endpoints/i/regenerate-token.js';
+import * as ep___i_registry_getAll from './endpoints/i/registry/get-all.js';
+import * as ep___i_registry_getDetail from './endpoints/i/registry/get-detail.js';
+import * as ep___i_registry_get from './endpoints/i/registry/get.js';
+import * as ep___i_registry_keysWithType from './endpoints/i/registry/keys-with-type.js';
+import * as ep___i_registry_keys from './endpoints/i/registry/keys.js';
+import * as ep___i_registry_remove from './endpoints/i/registry/remove.js';
+import * as ep___i_registry_scopes from './endpoints/i/registry/scopes.js';
+import * as ep___i_registry_set from './endpoints/i/registry/set.js';
+import * as ep___i_revokeToken from './endpoints/i/revoke-token.js';
+import * as ep___i_signinHistory from './endpoints/i/signin-history.js';
+import * as ep___i_unpin from './endpoints/i/unpin.js';
+import * as ep___i_updateEmail from './endpoints/i/update-email.js';
+import * as ep___i_update from './endpoints/i/update.js';
+import * as ep___i_move from './endpoints/i/move.js';
+import * as ep___i_webhooks_create from './endpoints/i/webhooks/create.js';
+import * as ep___i_webhooks_show from './endpoints/i/webhooks/show.js';
+import * as ep___i_webhooks_list from './endpoints/i/webhooks/list.js';
+import * as ep___i_webhooks_update from './endpoints/i/webhooks/update.js';
+import * as ep___i_webhooks_delete from './endpoints/i/webhooks/delete.js';
+import * as ep___meta from './endpoints/meta.js';
+import * as ep___emojis from './endpoints/emojis.js';
+import * as ep___emoji from './endpoints/emoji.js';
+import * as ep___miauth_genToken from './endpoints/miauth/gen-token.js';
+import * as ep___mute_create from './endpoints/mute/create.js';
+import * as ep___mute_delete from './endpoints/mute/delete.js';
+import * as ep___mute_list from './endpoints/mute/list.js';
+import * as ep___renoteMute_create from './endpoints/renote-mute/create.js';
+import * as ep___renoteMute_delete from './endpoints/renote-mute/delete.js';
+import * as ep___renoteMute_list from './endpoints/renote-mute/list.js';
+import * as ep___my_apps from './endpoints/my/apps.js';
+import * as ep___notes from './endpoints/notes.js';
+import * as ep___notes_children from './endpoints/notes/children.js';
+import * as ep___notes_clips from './endpoints/notes/clips.js';
+import * as ep___notes_conversation from './endpoints/notes/conversation.js';
+import * as ep___notes_create from './endpoints/notes/create.js';
+import * as ep___notes_delete from './endpoints/notes/delete.js';
+import * as ep___notes_favorites_create from './endpoints/notes/favorites/create.js';
+import * as ep___notes_favorites_delete from './endpoints/notes/favorites/delete.js';
+import * as ep___notes_featured from './endpoints/notes/featured.js';
+import * as ep___notes_globalTimeline from './endpoints/notes/global-timeline.js';
+import * as ep___notes_hybridTimeline from './endpoints/notes/hybrid-timeline.js';
+import * as ep___notes_localTimeline from './endpoints/notes/local-timeline.js';
+import * as ep___notes_mentions from './endpoints/notes/mentions.js';
+import * as ep___notes_polls_recommendation from './endpoints/notes/polls/recommendation.js';
+import * as ep___notes_polls_vote from './endpoints/notes/polls/vote.js';
+import * as ep___notes_reactions from './endpoints/notes/reactions.js';
+import * as ep___notes_reactions_create from './endpoints/notes/reactions/create.js';
+import * as ep___notes_reactions_delete from './endpoints/notes/reactions/delete.js';
+import * as ep___notes_renotes from './endpoints/notes/renotes.js';
+import * as ep___notes_replies from './endpoints/notes/replies.js';
+import * as ep___notes_searchByTag from './endpoints/notes/search-by-tag.js';
+import * as ep___notes_search from './endpoints/notes/search.js';
+import * as ep___notes_show from './endpoints/notes/show.js';
+import * as ep___notes_state from './endpoints/notes/state.js';
+import * as ep___notes_threadMuting_create from './endpoints/notes/thread-muting/create.js';
+import * as ep___notes_threadMuting_delete from './endpoints/notes/thread-muting/delete.js';
+import * as ep___notes_timeline from './endpoints/notes/timeline.js';
+import * as ep___notes_translate from './endpoints/notes/translate.js';
+import * as ep___notes_unrenote from './endpoints/notes/unrenote.js';
+import * as ep___notes_userListTimeline from './endpoints/notes/user-list-timeline.js';
+import * as ep___notifications_create from './endpoints/notifications/create.js';
+import * as ep___notifications_markAllAsRead from './endpoints/notifications/mark-all-as-read.js';
+import * as ep___pagePush from './endpoints/page-push.js';
+import * as ep___pages_create from './endpoints/pages/create.js';
+import * as ep___pages_delete from './endpoints/pages/delete.js';
+import * as ep___pages_featured from './endpoints/pages/featured.js';
+import * as ep___pages_like from './endpoints/pages/like.js';
+import * as ep___pages_show from './endpoints/pages/show.js';
+import * as ep___pages_unlike from './endpoints/pages/unlike.js';
+import * as ep___pages_update from './endpoints/pages/update.js';
+import * as ep___flash_create from './endpoints/flash/create.js';
+import * as ep___flash_delete from './endpoints/flash/delete.js';
+import * as ep___flash_featured from './endpoints/flash/featured.js';
+import * as ep___flash_like from './endpoints/flash/like.js';
+import * as ep___flash_show from './endpoints/flash/show.js';
+import * as ep___flash_unlike from './endpoints/flash/unlike.js';
+import * as ep___flash_update from './endpoints/flash/update.js';
+import * as ep___flash_my from './endpoints/flash/my.js';
+import * as ep___flash_myLikes from './endpoints/flash/my-likes.js';
+import * as ep___ping from './endpoints/ping.js';
+import * as ep___pinnedUsers from './endpoints/pinned-users.js';
+import * as ep___promo_read from './endpoints/promo/read.js';
+import * as ep___roles_list from './endpoints/roles/list.js';
+import * as ep___roles_show from './endpoints/roles/show.js';
+import * as ep___roles_users from './endpoints/roles/users.js';
+import * as ep___roles_notes from './endpoints/roles/notes.js';
+import * as ep___requestResetPassword from './endpoints/request-reset-password.js';
+import * as ep___resetDb from './endpoints/reset-db.js';
+import * as ep___resetPassword from './endpoints/reset-password.js';
+import * as ep___serverInfo from './endpoints/server-info.js';
+import * as ep___stats from './endpoints/stats.js';
+import * as ep___sw_show_registration from './endpoints/sw/show-registration.js';
+import * as ep___sw_update_registration from './endpoints/sw/update-registration.js';
+import * as ep___sw_register from './endpoints/sw/register.js';
+import * as ep___sw_unregister from './endpoints/sw/unregister.js';
+import * as ep___test from './endpoints/test.js';
+import * as ep___username_available from './endpoints/username/available.js';
+import * as ep___users from './endpoints/users.js';
+import * as ep___users_clips from './endpoints/users/clips.js';
+import * as ep___users_followers from './endpoints/users/followers.js';
+import * as ep___users_following from './endpoints/users/following.js';
+import * as ep___users_gallery_posts from './endpoints/users/gallery/posts.js';
+import * as ep___users_getFrequentlyRepliedUsers from './endpoints/users/get-frequently-replied-users.js';
+import * as ep___users_lists_create from './endpoints/users/lists/create.js';
+import * as ep___users_lists_delete from './endpoints/users/lists/delete.js';
+import * as ep___users_lists_list from './endpoints/users/lists/list.js';
+import * as ep___users_lists_pull from './endpoints/users/lists/pull.js';
+import * as ep___users_lists_push from './endpoints/users/lists/push.js';
+import * as ep___users_lists_show from './endpoints/users/lists/show.js';
+import * as ep___users_lists_favorite from './endpoints/users/lists/favorite.js';
+import * as ep___users_lists_unfavorite from './endpoints/users/lists/unfavorite.js';
+import * as ep___users_lists_create_from_public from './endpoints/users/lists/create-from-public.js';
+import * as ep___users_lists_update from './endpoints/users/lists/update.js';
+import * as ep___users_notes from './endpoints/users/notes.js';
+import * as ep___users_pages from './endpoints/users/pages.js';
+import * as ep___users_reactions from './endpoints/users/reactions.js';
+import * as ep___users_recommendation from './endpoints/users/recommendation.js';
+import * as ep___users_relation from './endpoints/users/relation.js';
+import * as ep___users_reportAbuse from './endpoints/users/report-abuse.js';
+import * as ep___users_searchByUsernameAndHost from './endpoints/users/search-by-username-and-host.js';
+import * as ep___users_search from './endpoints/users/search.js';
+import * as ep___users_show from './endpoints/users/show.js';
+import * as ep___users_achievements from './endpoints/users/achievements.js';
+import * as ep___users_updateMemo from './endpoints/users/update-memo.js';
+import * as ep___fetchRss from './endpoints/fetch-rss.js';
+import * as ep___retention from './endpoints/retention.js';
+
+const eps = [
+	['admin/meta', ep___admin_meta],
+	['admin/abuse-user-reports', ep___admin_abuseUserReports],
+	['admin/accounts/create', ep___admin_accounts_create],
+	['admin/accounts/delete', ep___admin_accounts_delete],
+	['admin/ad/create', ep___admin_ad_create],
+	['admin/ad/delete', ep___admin_ad_delete],
+	['admin/ad/list', ep___admin_ad_list],
+	['admin/ad/update', ep___admin_ad_update],
+	['admin/announcements/create', ep___admin_announcements_create],
+	['admin/announcements/delete', ep___admin_announcements_delete],
+	['admin/announcements/list', ep___admin_announcements_list],
+	['admin/announcements/update', ep___admin_announcements_update],
+	['admin/delete-all-files-of-a-user', ep___admin_deleteAllFilesOfAUser],
+	['admin/drive/clean-remote-files', ep___admin_drive_cleanRemoteFiles],
+	['admin/drive/cleanup', ep___admin_drive_cleanup],
+	['admin/drive/files', ep___admin_drive_files],
+	['admin/drive/show-file', ep___admin_drive_showFile],
+	['admin/emoji/add-aliases-bulk', ep___admin_emoji_addAliasesBulk],
+	['admin/emoji/add', ep___admin_emoji_add],
+	['admin/emoji/copy', ep___admin_emoji_copy],
+	['admin/emoji/delete-bulk', ep___admin_emoji_deleteBulk],
+	['admin/emoji/delete', ep___admin_emoji_delete],
+	['admin/emoji/import-zip', ep___admin_emoji_importZip],
+	['admin/emoji/list-remote', ep___admin_emoji_listRemote],
+	['admin/emoji/list', ep___admin_emoji_list],
+	['admin/emoji/remove-aliases-bulk', ep___admin_emoji_removeAliasesBulk],
+	['admin/emoji/set-aliases-bulk', ep___admin_emoji_setAliasesBulk],
+	['admin/emoji/set-category-bulk', ep___admin_emoji_setCategoryBulk],
+	['admin/emoji/set-license-bulk', ep___admin_emoji_setLicenseBulk],
+	['admin/emoji/update', ep___admin_emoji_update],
+	['admin/federation/delete-all-files', ep___admin_federation_deleteAllFiles],
+	['admin/federation/refresh-remote-instance-metadata', ep___admin_federation_refreshRemoteInstanceMetadata],
+	['admin/federation/remove-all-following', ep___admin_federation_removeAllFollowing],
+	['admin/federation/update-instance', ep___admin_federation_updateInstance],
+	['admin/get-index-stats', ep___admin_getIndexStats],
+	['admin/get-table-stats', ep___admin_getTableStats],
+	['admin/get-user-ips', ep___admin_getUserIps],
+	['invite', ep___invite],
+	['admin/promo/create', ep___admin_promo_create],
+	['admin/queue/clear', ep___admin_queue_clear],
+	['admin/queue/deliver-delayed', ep___admin_queue_deliverDelayed],
+	['admin/queue/inbox-delayed', ep___admin_queue_inboxDelayed],
+	['admin/queue/promote', ep___admin_queue_promote],
+	['admin/queue/stats', ep___admin_queue_stats],
+	['admin/relays/add', ep___admin_relays_add],
+	['admin/relays/list', ep___admin_relays_list],
+	['admin/relays/remove', ep___admin_relays_remove],
+	['admin/reset-password', ep___admin_resetPassword],
+	['admin/resolve-abuse-user-report', ep___admin_resolveAbuseUserReport],
+	['admin/send-email', ep___admin_sendEmail],
+	['admin/server-info', ep___admin_serverInfo],
+	['admin/show-moderation-logs', ep___admin_showModerationLogs],
+	['admin/show-user', ep___admin_showUser],
+	['admin/show-users', ep___admin_showUsers],
+	['admin/suspend-user', ep___admin_suspendUser],
+	['admin/unsuspend-user', ep___admin_unsuspendUser],
+	['admin/update-meta', ep___admin_updateMeta],
+	['admin/delete-account', ep___admin_deleteAccount],
+	['admin/update-user-note', ep___admin_updateUserNote],
+	['admin/roles/create', ep___admin_roles_create],
+	['admin/roles/delete', ep___admin_roles_delete],
+	['admin/roles/list', ep___admin_roles_list],
+	['admin/roles/show', ep___admin_roles_show],
+	['admin/roles/update', ep___admin_roles_update],
+	['admin/roles/assign', ep___admin_roles_assign],
+	['admin/roles/unassign', ep___admin_roles_unassign],
+	['admin/roles/update-default-policies', ep___admin_roles_updateDefaultPolicies],
+	['admin/roles/users', ep___admin_roles_users],
+	['announcements', ep___announcements],
+	['antennas/create', ep___antennas_create],
+	['antennas/delete', ep___antennas_delete],
+	['antennas/list', ep___antennas_list],
+	['antennas/notes', ep___antennas_notes],
+	['antennas/show', ep___antennas_show],
+	['antennas/update', ep___antennas_update],
+	['ap/get', ep___ap_get],
+	['ap/show', ep___ap_show],
+	['app/create', ep___app_create],
+	['app/show', ep___app_show],
+	['auth/accept', ep___auth_accept],
+	['auth/session/generate', ep___auth_session_generate],
+	['auth/session/show', ep___auth_session_show],
+	['auth/session/userkey', ep___auth_session_userkey],
+	['blocking/create', ep___blocking_create],
+	['blocking/delete', ep___blocking_delete],
+	['blocking/list', ep___blocking_list],
+	['channels/create', ep___channels_create],
+	['channels/featured', ep___channels_featured],
+	['channels/follow', ep___channels_follow],
+	['channels/followed', ep___channels_followed],
+	['channels/owned', ep___channels_owned],
+	['channels/show', ep___channels_show],
+	['channels/timeline', ep___channels_timeline],
+	['channels/unfollow', ep___channels_unfollow],
+	['channels/update', ep___channels_update],
+	['channels/favorite', ep___channels_favorite],
+	['channels/unfavorite', ep___channels_unfavorite],
+	['channels/my-favorites', ep___channels_myFavorites],
+	['channels/search', ep___channels_search],
+	['charts/active-users', ep___charts_activeUsers],
+	['charts/ap-request', ep___charts_apRequest],
+	['charts/drive', ep___charts_drive],
+	['charts/federation', ep___charts_federation],
+	['charts/instance', ep___charts_instance],
+	['charts/notes', ep___charts_notes],
+	['charts/user/drive', ep___charts_user_drive],
+	['charts/user/following', ep___charts_user_following],
+	['charts/user/notes', ep___charts_user_notes],
+	['charts/user/pv', ep___charts_user_pv],
+	['charts/user/reactions', ep___charts_user_reactions],
+	['charts/users', ep___charts_users],
+	['clips/add-note', ep___clips_addNote],
+	['clips/remove-note', ep___clips_removeNote],
+	['clips/create', ep___clips_create],
+	['clips/delete', ep___clips_delete],
+	['clips/list', ep___clips_list],
+	['clips/notes', ep___clips_notes],
+	['clips/show', ep___clips_show],
+	['clips/update', ep___clips_update],
+	['clips/favorite', ep___clips_favorite],
+	['clips/unfavorite', ep___clips_unfavorite],
+	['clips/my-favorites', ep___clips_myFavorites],
+	['drive', ep___drive],
+	['drive/files', ep___drive_files],
+	['drive/files/attached-notes', ep___drive_files_attachedNotes],
+	['drive/files/check-existence', ep___drive_files_checkExistence],
+	['drive/files/create', ep___drive_files_create],
+	['drive/files/delete', ep___drive_files_delete],
+	['drive/files/find-by-hash', ep___drive_files_findByHash],
+	['drive/files/find', ep___drive_files_find],
+	['drive/files/show', ep___drive_files_show],
+	['drive/files/update', ep___drive_files_update],
+	['drive/files/upload-from-url', ep___drive_files_uploadFromUrl],
+	['drive/folders', ep___drive_folders],
+	['drive/folders/create', ep___drive_folders_create],
+	['drive/folders/delete', ep___drive_folders_delete],
+	['drive/folders/find', ep___drive_folders_find],
+	['drive/folders/show', ep___drive_folders_show],
+	['drive/folders/update', ep___drive_folders_update],
+	['drive/stream', ep___drive_stream],
+	['email-address/available', ep___emailAddress_available],
+	['endpoint', ep___endpoint],
+	['endpoints', ep___endpoints],
+	['export-custom-emojis', ep___exportCustomEmojis],
+	['federation/followers', ep___federation_followers],
+	['federation/following', ep___federation_following],
+	['federation/instances', ep___federation_instances],
+	['federation/show-instance', ep___federation_showInstance],
+	['federation/update-remote-user', ep___federation_updateRemoteUser],
+	['federation/users', ep___federation_users],
+	['federation/stats', ep___federation_stats],
+	['following/create', ep___following_create],
+	['following/delete', ep___following_delete],
+	['following/invalidate', ep___following_invalidate],
+	['following/requests/accept', ep___following_requests_accept],
+	['following/requests/cancel', ep___following_requests_cancel],
+	['following/requests/list', ep___following_requests_list],
+	['following/requests/reject', ep___following_requests_reject],
+	['gallery/featured', ep___gallery_featured],
+	['gallery/popular', ep___gallery_popular],
+	['gallery/posts', ep___gallery_posts],
+	['gallery/posts/create', ep___gallery_posts_create],
+	['gallery/posts/delete', ep___gallery_posts_delete],
+	['gallery/posts/like', ep___gallery_posts_like],
+	['gallery/posts/show', ep___gallery_posts_show],
+	['gallery/posts/unlike', ep___gallery_posts_unlike],
+	['gallery/posts/update', ep___gallery_posts_update],
+	['get-online-users-count', ep___getOnlineUsersCount],
+	['hashtags/list', ep___hashtags_list],
+	['hashtags/search', ep___hashtags_search],
+	['hashtags/show', ep___hashtags_show],
+	['hashtags/trend', ep___hashtags_trend],
+	['hashtags/users', ep___hashtags_users],
+	['i', ep___i],
+	['i/2fa/done', ep___i_2fa_done],
+	['i/2fa/key-done', ep___i_2fa_keyDone],
+	['i/2fa/password-less', ep___i_2fa_passwordLess],
+	['i/2fa/register-key', ep___i_2fa_registerKey],
+	['i/2fa/register', ep___i_2fa_register],
+	['i/2fa/update-key', ep___i_2fa_updateKey],
+	['i/2fa/remove-key', ep___i_2fa_removeKey],
+	['i/2fa/unregister', ep___i_2fa_unregister],
+	['i/apps', ep___i_apps],
+	['i/authorized-apps', ep___i_authorizedApps],
+	['i/claim-achievement', ep___i_claimAchievement],
+	['i/change-password', ep___i_changePassword],
+	['i/delete-account', ep___i_deleteAccount],
+	['i/export-blocking', ep___i_exportBlocking],
+	['i/export-following', ep___i_exportFollowing],
+	['i/export-mute', ep___i_exportMute],
+	['i/export-notes', ep___i_exportNotes],
+	['i/export-favorites', ep___i_exportFavorites],
+	['i/export-user-lists', ep___i_exportUserLists],
+	['i/export-antennas', ep___i_exportAntennas],
+	['i/favorites', ep___i_favorites],
+	['i/gallery/likes', ep___i_gallery_likes],
+	['i/gallery/posts', ep___i_gallery_posts],
+	['i/get-word-muted-notes-count', ep___i_getWordMutedNotesCount],
+	['i/import-blocking', ep___i_importBlocking],
+	['i/import-following', ep___i_importFollowing],
+	['i/import-muting', ep___i_importMuting],
+	['i/import-user-lists', ep___i_importUserLists],
+	['i/import-antennas', ep___i_importAntennas],
+	['i/notifications', ep___i_notifications],
+	['i/page-likes', ep___i_pageLikes],
+	['i/pages', ep___i_pages],
+	['i/pin', ep___i_pin],
+	['i/read-all-unread-notes', ep___i_readAllUnreadNotes],
+	['i/read-announcement', ep___i_readAnnouncement],
+	['i/regenerate-token', ep___i_regenerateToken],
+	['i/registry/get-all', ep___i_registry_getAll],
+	['i/registry/get-detail', ep___i_registry_getDetail],
+	['i/registry/get', ep___i_registry_get],
+	['i/registry/keys-with-type', ep___i_registry_keysWithType],
+	['i/registry/keys', ep___i_registry_keys],
+	['i/registry/remove', ep___i_registry_remove],
+	['i/registry/scopes', ep___i_registry_scopes],
+	['i/registry/set', ep___i_registry_set],
+	['i/revoke-token', ep___i_revokeToken],
+	['i/signin-history', ep___i_signinHistory],
+	['i/unpin', ep___i_unpin],
+	['i/update-email', ep___i_updateEmail],
+	['i/update', ep___i_update],
+	['i/move', ep___i_move],
+	['i/webhooks/create', ep___i_webhooks_create],
+	['i/webhooks/list', ep___i_webhooks_list],
+	['i/webhooks/show', ep___i_webhooks_show],
+	['i/webhooks/update', ep___i_webhooks_update],
+	['i/webhooks/delete', ep___i_webhooks_delete],
+	['meta', ep___meta],
+	['emojis', ep___emojis],
+	['emoji', ep___emoji],
+	['miauth/gen-token', ep___miauth_genToken],
+	['mute/create', ep___mute_create],
+	['mute/delete', ep___mute_delete],
+	['mute/list', ep___mute_list],
+	['renote-mute/create', ep___renoteMute_create],
+	['renote-mute/delete', ep___renoteMute_delete],
+	['renote-mute/list', ep___renoteMute_list],
+	['my/apps', ep___my_apps],
+	['notes', ep___notes],
+	['notes/children', ep___notes_children],
+	['notes/clips', ep___notes_clips],
+	['notes/conversation', ep___notes_conversation],
+	['notes/create', ep___notes_create],
+	['notes/delete', ep___notes_delete],
+	['notes/favorites/create', ep___notes_favorites_create],
+	['notes/favorites/delete', ep___notes_favorites_delete],
+	['notes/featured', ep___notes_featured],
+	['notes/global-timeline', ep___notes_globalTimeline],
+	['notes/hybrid-timeline', ep___notes_hybridTimeline],
+	['notes/local-timeline', ep___notes_localTimeline],
+	['notes/mentions', ep___notes_mentions],
+	['notes/polls/recommendation', ep___notes_polls_recommendation],
+	['notes/polls/vote', ep___notes_polls_vote],
+	['notes/reactions', ep___notes_reactions],
+	['notes/reactions/create', ep___notes_reactions_create],
+	['notes/reactions/delete', ep___notes_reactions_delete],
+	['notes/renotes', ep___notes_renotes],
+	['notes/replies', ep___notes_replies],
+	['notes/search-by-tag', ep___notes_searchByTag],
+	['notes/search', ep___notes_search],
+	['notes/show', ep___notes_show],
+	['notes/state', ep___notes_state],
+	['notes/thread-muting/create', ep___notes_threadMuting_create],
+	['notes/thread-muting/delete', ep___notes_threadMuting_delete],
+	['notes/timeline', ep___notes_timeline],
+	['notes/translate', ep___notes_translate],
+	['notes/unrenote', ep___notes_unrenote],
+	['notes/user-list-timeline', ep___notes_userListTimeline],
+	['notifications/create', ep___notifications_create],
+	['notifications/mark-all-as-read', ep___notifications_markAllAsRead],
+	['page-push', ep___pagePush],
+	['pages/create', ep___pages_create],
+	['pages/delete', ep___pages_delete],
+	['pages/featured', ep___pages_featured],
+	['pages/like', ep___pages_like],
+	['pages/show', ep___pages_show],
+	['pages/unlike', ep___pages_unlike],
+	['pages/update', ep___pages_update],
+	['flash/create', ep___flash_create],
+	['flash/delete', ep___flash_delete],
+	['flash/featured', ep___flash_featured],
+	['flash/like', ep___flash_like],
+	['flash/show', ep___flash_show],
+	['flash/unlike', ep___flash_unlike],
+	['flash/update', ep___flash_update],
+	['flash/my', ep___flash_my],
+	['flash/my-likes', ep___flash_myLikes],
+	['ping', ep___ping],
+	['pinned-users', ep___pinnedUsers],
+	['promo/read', ep___promo_read],
+	['roles/list', ep___roles_list],
+	['roles/show', ep___roles_show],
+	['roles/users', ep___roles_users],
+	['roles/notes', ep___roles_notes],
+	['request-reset-password', ep___requestResetPassword],
+	['reset-db', ep___resetDb],
+	['reset-password', ep___resetPassword],
+	['server-info', ep___serverInfo],
+	['stats', ep___stats],
+	['sw/show-registration', ep___sw_show_registration],
+	['sw/update-registration', ep___sw_update_registration],
+	['sw/register', ep___sw_register],
+	['sw/unregister', ep___sw_unregister],
+	['test', ep___test],
+	['username/available', ep___username_available],
+	['users', ep___users],
+	['users/clips', ep___users_clips],
+	['users/followers', ep___users_followers],
+	['users/following', ep___users_following],
+	['users/gallery/posts', ep___users_gallery_posts],
+	['users/get-frequently-replied-users', ep___users_getFrequentlyRepliedUsers],
+	['users/lists/create', ep___users_lists_create],
+	['users/lists/delete', ep___users_lists_delete],
+	['users/lists/list', ep___users_lists_list],
+	['users/lists/pull', ep___users_lists_pull],
+	['users/lists/push', ep___users_lists_push],
+	['users/lists/show', ep___users_lists_show],
+	['users/lists/favorite', ep___users_lists_favorite],
+	['users/lists/unfavorite', ep___users_lists_unfavorite],
+	['users/lists/update', ep___users_lists_update],
+	['users/lists/create-from-public', ep___users_lists_create_from_public],
+	['users/notes', ep___users_notes],
+	['users/pages', ep___users_pages],
+	['users/reactions', ep___users_reactions],
+	['users/recommendation', ep___users_recommendation],
+	['users/relation', ep___users_relation],
+	['users/report-abuse', ep___users_reportAbuse],
+	['users/search-by-username-and-host', ep___users_searchByUsernameAndHost],
+	['users/search', ep___users_search],
+	['users/show', ep___users_show],
+	['users/achievements', ep___users_achievements],
+	['users/update-memo', ep___users_updateMemo],
+	['fetch-rss', ep___fetchRss],
+	['retention', ep___retention],
+];
+
+export interface IEndpointMeta {
+	readonly stability?: 'deprecated' | 'experimental' | 'stable';
+
+	readonly tags?: ReadonlyArray<string>;
+
+	readonly errors?: {
+		readonly [key: string]: {
+			readonly message: string;
+			readonly code: string;
+			readonly id: string;
+		};
+	};
+
+	readonly res?: Schema;
+
+	/**
+	 * このエンドポイントにリクエストするのにユーザー情報が必須か否か
+	 * 省略した場合は false として解釈されます。
+	 */
+	readonly requireCredential?: boolean;
+
+	/**
+	 * isModeratorなロールを必要とするか
+	 */
+	readonly requireModerator?: boolean;
+
+	/**
+	 * isAdministratorなロールを必要とするか
+	 */
+	readonly requireAdmin?: boolean;
+
+	readonly requireRolePolicy?: keyof RolePolicies;
+
+	/**
+	 * 引っ越し済みのユーザーによるリクエストを禁止するか
+	 * 省略した場合は false として解釈されます。
+	 */
+	readonly prohibitMoved?: boolean;
+
+	/**
+	 * エンドポイントのリミテーションに関するやつ
+	 * 省略した場合はリミテーションは無いものとして解釈されます。
+	 */
+	readonly limit?: {
+
+		/**
+		 * 複数のエンドポイントでリミットを共有したい場合に指定するキー
+		 */
+		readonly key?: string;
+
+		/**
+		 * リミットを適用する期間(ms)
+		 * このプロパティを設定する場合、max プロパティも設定する必要があります。
+		 */
+		readonly duration?: number;
+
+		/**
+		 * durationで指定した期間内にいくつまでリクエストできるのか
+		 * このプロパティを設定する場合、duration プロパティも設定する必要があります。
+		 */
+		readonly max?: number;
+
+		/**
+		 * 最低でもどれくらいの間隔を開けてリクエストしなければならないか(ms)
+		 */
+		readonly minInterval?: number;
+	};
+
+	/**
+	 * ファイルの添付を必要とするか否か
+	 * 省略した場合は false として解釈されます。
+	 */
+	readonly requireFile?: boolean;
+
+	/**
+	 * サードパーティアプリからはリクエストすることができないか否か
+	 * 省略した場合は false として解釈されます。
+	 */
+	readonly secure?: boolean;
+
+	/**
+	 * エンドポイントの種類
+	 * パーミッションの実現に利用されます。
+	 */
+	readonly kind?: string;
+
+	readonly description?: string;
+
+	/**
+	 * GETでのリクエストを許容するか否か
+	 */
+	readonly allowGet?: boolean;
+
+	/**
+	 * 正常応答をキャッシュ (Cache-Control: public) する秒数
+	 */
+	readonly cacheSec?: number;
+}
+
+export interface IEndpoint {
+	name: string;
+	meta: IEndpointMeta;
+	params: Schema;
+}
+
+const endpoints: IEndpoint[] = (eps as [string, any]).map(([name, ep]) => {
+	return {
+		name: name,
+		get meta() { return ep.meta ?? {}; },
+		get params() { return ep.paramDef; },
+	};
+});
+
+export default endpoints;

packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts

@@ -5,10 +5,91 @@ import { QueryService } from '@/core/QueryService.js';
 import { DI } from '@/di-symbols.js';
 import { AbuseUserReportEntityService } from '@/core/entities/AbuseUserReportEntityService.js';
 
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+
+	res: {
+		type: 'array',
+		optional: false, nullable: false,
+		items: {
+			type: 'object',
+			optional: false, nullable: false,
+			properties: {
+				id: {
+					type: 'string',
+					nullable: false, optional: false,
+					format: 'id',
+					example: 'xxxxxxxxxx',
+				},
+				createdAt: {
+					type: 'string',
+					nullable: false, optional: false,
+					format: 'date-time',
+				},
+				comment: {
+					type: 'string',
+					nullable: false, optional: false,
+				},
+				resolved: {
+					type: 'boolean',
+					nullable: false, optional: false,
+					example: false,
+				},
+				reporterId: {
+					type: 'string',
+					nullable: false, optional: false,
+					format: 'id',
+				},
+				targetUserId: {
+					type: 'string',
+					nullable: false, optional: false,
+					format: 'id',
+				},
+				assigneeId: {
+					type: 'string',
+					nullable: true, optional: false,
+					format: 'id',
+				},
+				reporter: {
+					type: 'object',
+					nullable: false, optional: false,
+					ref: 'User',
+				},
+				targetUser: {
+					type: 'object',
+					nullable: false, optional: false,
+					ref: 'User',
+				},
+				assignee: {
+					type: 'object',
+					nullable: true, optional: true,
+					ref: 'User',
+				},
+			},
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
+		sinceId: { type: 'string', format: 'misskey:id' },
+		untilId: { type: 'string', format: 'misskey:id' },
+		state: { type: 'string', nullable: true, default: null },
+		reporterOrigin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'combined' },
+		targetUserOrigin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'combined' },
+		forwarded: { type: 'boolean', default: false },
+	},
+	required: [],
+} as const;
+
 // eslint-disable-next-line import/no-default-export
 @Injectable()
-export default class extends Endpoint<'admin/abuse-user-reports'> {
-	name = 'admin/abuse-user-reports' as const;
+export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.abuseUserReportsRepository)
 		private abuseUserReportsRepository: AbuseUserReportsRepository,
@@ -16,7 +97,7 @@ export default class extends Endpoint<'admin/abuse-user-reports'> {
 		private abuseUserReportEntityService: AbuseUserReportEntityService,
 		private queryService: QueryService,
 	) {
-		super(async (ps, me) => {
+		super(meta, paramDef, async (ps, me) => {
 			const query = this.queryService.makePaginationQuery(this.abuseUserReportsRepository.createQueryBuilder('report'), ps.sinceId, ps.untilId);
 
 			switch (ps.state) {

packages/backend/src/server/api/endpoints/admin/accounts/create.ts

@@ -7,10 +7,34 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { localUsernameSchema, passwordSchema } from '@/models/entities/User.js';
 import { DI } from '@/di-symbols.js';
 
+export const meta = {
+	tags: ['admin'],
+
+	res: {
+		type: 'object',
+		optional: false, nullable: false,
+		ref: 'User',
+		properties: {
+			token: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		username: localUsernameSchema,
+		password: passwordSchema,
+	},
+	required: ['username', 'password'],
+} as const;
+
 // eslint-disable-next-line import/no-default-export
 @Injectable()
-export default class extends Endpoint<'admin/accounts/create'> {
-	name = 'admin/accounts/create' as const;
+export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
@@ -18,7 +42,7 @@ export default class extends Endpoint<'admin/accounts/create'> {
 		private userEntityService: UserEntityService,
 		private signupService: SignupService,
 	) {
-		super(async (ps, _me) => {
+		super(meta, paramDef, async (ps, _me) => {
 			const me = _me ? await this.usersRepository.findOneByOrFail({ id: _me.id }) : null;
 			const noUsers = (await this.usersRepository.countBy({
 				host: IsNull(),
@@ -31,12 +55,14 @@ export default class extends Endpoint<'admin/accounts/create'> {
 				ignorePreservedUsernames: true,
 			});
 
-			const res = await this.userEntityService.pack<true, true>(account, account, {
+			const res = await this.userEntityService.pack(account, account, {
 				detail: true,
 				includeSecrets: true,
 			});
 
-			return { ...res, token: secret };
+			(res as any).token = secret;
+
+			return res;
 		});
 	}
 }

packages/backend/src/server/api/endpoints/admin/accounts/delete.ts

@@ -7,10 +7,24 @@ import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { DI } from '@/di-symbols.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireAdmin: true,
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		userId: { type: 'string', format: 'misskey:id' },
+	},
+	required: ['userId'],
+} as const;
+
 // eslint-disable-next-line import/no-default-export
 @Injectable()
-export default class extends Endpoint<'admin/accounts/delete'> {
-	name = 'admin/accounts/delete' as const;
+export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
@@ -20,7 +34,7 @@ export default class extends Endpoint<'admin/accounts/delete'> {
 		private globalEventService: GlobalEventService,
 		private userSuspendService: UserSuspendService,
 	) {
-		super(async (ps, me) => {
+		super(meta, paramDef, async (ps, me) => {
 			const user = await this.usersRepository.findOneBy({ id: ps.userId });
 
 			if (user == null) {

packages/backend/src/server/api/endpoints/admin/ad/create.ts

@@ -4,17 +4,38 @@ import type { AdsRepository } from '@/models/index.js';
 import { IdService } from '@/core/IdService.js';
 import { DI } from '@/di-symbols.js';
 
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		url: { type: 'string', minLength: 1 },
+		memo: { type: 'string' },
+		place: { type: 'string' },
+		priority: { type: 'string' },
+		ratio: { type: 'integer' },
+		expiresAt: { type: 'integer' },
+		startsAt: { type: 'integer' },
+		imageUrl: { type: 'string', minLength: 1 },
+	},
+	required: ['url', 'memo', 'place', 'priority', 'ratio', 'expiresAt', 'startsAt', 'imageUrl'],
+} as const;
+
 // eslint-disable-next-line import/no-default-export
 @Injectable()
-export default class extends Endpoint<'admin/ad/create'> {
-	name = 'admin/ad/create' as const;
+export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.adsRepository)
 		private adsRepository: AdsRepository,
 
 		private idService: IdService,
 	) {
-		super(async (ps, me) => {
+		super(meta, paramDef, async (ps, me) => {
 			await this.adsRepository.insert({
 				id: this.idService.genId(),
 				createdAt: new Date(),

packages/backend/src/server/api/endpoints/admin/ad/delete.ts

@@ -4,18 +4,40 @@ import type { AdsRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
 import { ApiError } from '../../../error.js';
 
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+
+	errors: {
+		noSuchAd: {
+			message: 'No such ad.',
+			code: 'NO_SUCH_AD',
+			id: 'ccac9863-3a03-416e-b899-8a64041118b1',
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		id: { type: 'string', format: 'misskey:id' },
+	},
+	required: ['id'],
+} as const;
+
 // eslint-disable-next-line import/no-default-export
 @Injectable()
-export default class extends Endpoint<'admin/ad/delete'> {
-	name = 'admin/ad/delete' as const;
+export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.adsRepository)
 		private adsRepository: AdsRepository,
 	) {
-		super(async (ps, me) => {
+		super(meta, paramDef, async (ps, me) => {
 			const ad = await this.adsRepository.findOneBy({ id: ps.id });
 
-			if (ad == null) throw new ApiError(this.meta.errors.noSuchAd);
+			if (ad == null) throw new ApiError(meta.errors.noSuchAd);
 
 			await this.adsRepository.delete(ad.id);
 		});

packages/backend/src/server/api/endpoints/admin/ad/list.ts

@@ -23,15 +23,14 @@ export const paramDef = {
 
 // eslint-disable-next-line import/no-default-export
 @Injectable()
-export default class extends Endpoint<'admin/ad/list'> {
-	name = 'admin/ad/list' as const;
+export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.adsRepository)
 		private adsRepository: AdsRepository,
 
 		private queryService: QueryService,
 	) {
-		super(async (ps, me) => {
+		super(meta, paramDef, async (ps, me) => {
 			const query = this.queryService.makePaginationQuery(this.adsRepository.createQueryBuilder('ad'), ps.sinceId, ps.untilId);
 			const ads = await query.take(ps.limit).getMany();
 

packages/backend/src/server/api/endpoints/admin/ad/update.ts

@@ -4,18 +4,48 @@ import type { AdsRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
 import { ApiError } from '../../../error.js';
 
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+
+	errors: {
+		noSuchAd: {
+			message: 'No such ad.',
+			code: 'NO_SUCH_AD',
+			id: 'b7aa1727-1354-47bc-a182-3a9c3973d300',
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		id: { type: 'string', format: 'misskey:id' },
+		memo: { type: 'string' },
+		url: { type: 'string', minLength: 1 },
+		imageUrl: { type: 'string', minLength: 1 },
+		place: { type: 'string' },
+		priority: { type: 'string' },
+		ratio: { type: 'integer' },
+		expiresAt: { type: 'integer' },
+		startsAt: { type: 'integer' },
+	},
+	required: ['id', 'memo', 'url', 'imageUrl', 'place', 'priority', 'ratio', 'expiresAt', 'startsAt'],
+} as const;
+
 // eslint-disable-next-line import/no-default-export
 @Injectable()
-export default class extends Endpoint<'admin/ad/update'> {
-	name = 'admin/ad/update' as const;
+export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.adsRepository)
 		private adsRepository: AdsRepository,
 	) {
-		super(async (ps, me) => {
+		super(meta, paramDef, async (ps, me) => {
 			const ad = await this.adsRepository.findOneBy({ id: ps.id });
 
-			if (ad == null) throw new ApiError(this.meta.errors.noSuchAd);
+			if (ad == null) throw new ApiError(meta.errors.noSuchAd);
 
 			await this.adsRepository.update(ad.id, {
 				url: ps.url,