Merge branch 'develop' into pr/ThatOneCalculator/8764

packages/backend/.mocharc.json

@@ -5,6 +5,6 @@
 		"loader=./test/loader.js"
 	],
 	"slow": 1000,
-	"timeout": 3000,
+	"timeout": 10000,
 	"exit": true
 }

packages/backend/package.json

@@ -35,10 +35,9 @@
 		"archiver": "5.3.1",
 		"autobind-decorator": "2.4.0",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.1145.0",
+		"aws-sdk": "2.1152.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.5",
-		"broadcast-channel": "4.12.0",
 		"bull": "4.8.3",
 		"cacheable-lookup": "6.0.4",
 		"cbor": "8.1.0",
@@ -51,7 +50,7 @@
 		"deep-email-validator": "0.1.21",
 		"escape-regexp": "0.0.1",
 		"feed": "4.2.2",
-		"file-type": "17.1.1",
+		"file-type": "17.1.2",
 		"fluent-ffmpeg": "2.1.2",
 		"got": "12.1.0",
 		"hpagent": "0.1.2",
@@ -61,8 +60,8 @@
 		"jsdom": "19.0.0",
 		"json5": "2.2.1",
 		"json5-loader": "4.0.1",
-		"jsonld": "5.2.0",
-		"jsrsasign": "10.5.23",
+		"jsonld": "6.0.0",
+		"jsrsasign": "10.5.24",
 		"koa": "2.13.4",
 		"koa-bodyparser": "4.3.0",
 		"koa-favicon": "2.1.0",
@@ -79,7 +78,7 @@
 		"ms": "3.0.0-canary.1",
 		"multer": "1.4.4",
 		"nested-property": "4.0.0",
-		"node-fetch": "3.2.4",
+		"node-fetch": "3.2.6",
 		"nodemailer": "6.7.5",
 		"oauth": "^0.9.15",
 		"os-utils": "0.0.14",
@@ -115,8 +114,8 @@
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
 		"ts-loader": "9.3.0",
-		"ts-node": "10.8.0",
-		"tsc-alias": "1.6.7",
+		"ts-node": "10.8.1",
+		"tsc-alias": "1.6.9",
 		"tsconfig-paths": "4.0.0",
 		"twemoji-parser": "14.0.0",
 		"typeorm": "0.3.6",
@@ -125,7 +124,7 @@
 		"uuid": "8.3.2",
 		"web-push": "3.5.0",
 		"websocket": "1.0.34",
-		"ws": "8.7.0",
+		"ws": "8.8.0",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
@@ -152,7 +151,7 @@
 		"@types/koa__multer": "2.0.4",
 		"@types/koa__router": "8.0.11",
 		"@types/mocha": "9.1.1",
-		"@types/node": "17.0.36",
+		"@types/node": "17.0.41",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.4",
 		"@types/oauth": "0.9.1",
@@ -175,10 +174,10 @@
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.3",
-		"@typescript-eslint/eslint-plugin": "5.27.0",
-		"@typescript-eslint/parser": "5.27.0",
+		"@typescript-eslint/eslint-plugin": "5.27.1",
+		"@typescript-eslint/parser": "5.27.1",
 		"cross-env": "7.0.3",
-		"eslint": "8.16.0",
+		"eslint": "8.17.0",
 		"eslint-plugin-import": "2.26.0",
 		"execa": "6.1.0",
 		"form-data": "^4.0.0",

packages/backend/src/db/postgre.ts

@@ -208,7 +208,15 @@ export const db = new DataSource({
 	migrations: ['../../migration/*.js'],
 });
 
-export async function initDb() {
+export async function initDb(force = false) {
+	if (force) {
+		if (db.isInitialized) {
+			await db.destroy();
+		}
+		await db.initialize();
+		return;
+	}
+
 	if (db.isInitialized) {
 		// nop
 	} else {

packages/backend/src/misc/create-temp.ts

@@ -11,9 +11,14 @@ export function createTemp(): Promise<[string, () => void]> {
 
 export function createTempDir(): Promise<[string, () => void]> {
 	return new Promise<[string, () => void]>((res, rej) => {
-		tmp.dir((e, path, cleanup) => {
-			if (e) return rej(e);
-			res([path, cleanup]);
-		});
+		tmp.dir(
+			{
+				unsafeCleanup: true,
+			},
+			(e, path, cleanup) => {
+				if (e) return rej(e);
+				res([path, cleanup]);
+			}
+		);
 	});
 }

packages/backend/src/models/repositories/note.ts

@@ -136,6 +136,7 @@ async function populateMyReaction(note: Note, meId: User['id'], _hint_?: {
 
 export const NoteRepository = db.getRepository(Note).extend({
 	async isVisibleForMe(note: Note, meId: User['id'] | null): Promise<boolean> {
+		// This code must always be synchronized with the checks in generateVisibilityQuery.
 		// visibility が specified かつ自分が指定されていなかったら非表示
 		if (note.visibility === 'specified') {
 			if (meId == null) {

packages/backend/src/remote/activitypub/models/note.ts

@@ -197,7 +197,14 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s
 	const cw = note.summary === '' ? null : note.summary;
 
 	// テキストのパース
-	const text = typeof note._misskey_content !== 'undefined' ? note._misskey_content : (note.content ? htmlToMfm(note.content, note.tag) : null);
+	let text: string | null = null;
+	if (note.source?.mediaType === 'text/x.misskeymarkdown' && typeof note.source?.content === 'string') {
+		text = note.source.content;
+	} else if (typeof note._misskey_content !== 'undefined') {
+		text = note._misskey_content;
+	} else if (typeof note.content === 'string') {
+		text = htmlToMfm(note.content, note.tag);
+	}
 
 	// vote
 	if (reply && reply.hasPoll) {

packages/backend/src/remote/activitypub/renderer/note.ts

@@ -82,15 +82,14 @@ export default async function renderNote(note: Note, dive = true, isTalk = false
 
 	const files = await getPromisedFiles(note.fileIds);
 
-	// text should never be undefined
-	const text = note.text ?? null;
+	const text = note.text ?? '';
 	let poll: Poll | null = null;
 
 	if (note.hasPoll) {
 		poll = await Polls.findOneBy({ noteId: note.id });
 	}
 
-	let apText = text ?? '';
+	let apText = text;
 
 	if (quote) {
 		apText += `\n\nRE: ${quote}`;
@@ -138,6 +137,10 @@ export default async function renderNote(note: Note, dive = true, isTalk = false
 		summary,
 		content,
 		_misskey_content: text,
+		source: {
+			content: text,
+			mediaType: "text/x.misskeymarkdown",
+		},
 		_misskey_quote: quote,
 		quoteUrl: quote,
 		published: note.createdAt.toISOString(),

packages/backend/src/remote/activitypub/type.ts

@@ -106,7 +106,10 @@ export const isPost = (object: IObject): object is IPost =>
 
 export interface IPost extends IObject {
 	type: 'Note' | 'Question' | 'Article' | 'Audio' | 'Document' | 'Image' | 'Page' | 'Video' | 'Event';
-	_misskey_content?: string;
+	source?: {
+		content: string;
+		mediaType: string;
+	};
 	_misskey_quote?: string;
 	quoteUrl?: string;
 	_misskey_talk: boolean;
@@ -114,7 +117,10 @@ export interface IPost extends IObject {
 
 export interface IQuestion extends IObject {
 	type: 'Note' | 'Question';
-	_misskey_content?: string;
+	source?: {
+		content: string;
+		mediaType: string;
+	};
 	_misskey_quote?: string;
 	quoteUrl?: string;
 	oneOf?: IQuestionChoice[];

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

@@ -1,12 +1,12 @@
-import Koa from 'koa';
 import { performance } from 'perf_hooks';
-import { limiter } from './limiter.js';
+import Koa from 'koa';
 import { CacheableLocalUser, User } from '@/models/entities/user.js';
+import { AccessToken } from '@/models/entities/access-token.js';
+import { getIpHash } from '@/misc/get-ip-hash.js';
+import { limiter } from './limiter.js';
 import endpoints, { IEndpointMeta } from './endpoints.js';
 import { ApiError } from './error.js';
 import { apiLogger } from './logger.js';
-import { AccessToken } from '@/models/entities/access-token.js';
-import { getIpHash } from '@/misc/get-ip-hash.js';
 
 const accessDenied = {
 	message: 'Access denied.',
@@ -33,7 +33,7 @@ export default async (endpoint: string, user: CacheableLocalUser | null | undefi
 		throw new ApiError(accessDenied);
 	}
 
-	if (ep.meta.limit && !isModerator) {
+	if (ep.meta.limit) {
 		// koa will automatically load the `X-Forwarded-For` header if `proxy: true` is configured in the app.
 		let limitActor: string;
 		if (user) {
@@ -120,20 +120,20 @@ export default async (endpoint: string, user: CacheableLocalUser | null | undefi
 		if (e instanceof ApiError) {
 			throw e;
 		} else {
-			apiLogger.error(`Internal error occurred in ${ep.name}: ${e?.message}`, {
+			apiLogger.error(`Internal error occurred in ${ep.name}: ${e.message}`, {
 				ep: ep.name,
 				ps: data,
 				e: {
-					message: e?.message,
-					code: e?.name,
-					stack: e?.stack,
+					message: e.message,
+					code: e.name,
+					stack: e.stack,
 				},
 			});
 			throw new ApiError(null, {
 				e: {
-					message: e?.message,
-					code: e?.name,
-					stack: e?.stack,
+					message: e.message,
+					code: e.name,
+					stack: e.stack,
 				},
 			});
 		}

packages/backend/src/server/api/common/generate-visibility-query.ts

@@ -3,6 +3,7 @@ import { Followings } from '@/models/index.js';
 import { Brackets, SelectQueryBuilder } from 'typeorm';
 
 export function generateVisibilityQuery(q: SelectQueryBuilder<any>, me?: { id: User['id'] } | null) {
+	// This code must always be synchronized with the checks in Notes.isVisibleForMe.
 	if (me == null) {
 		q.andWhere(new Brackets(qb => { qb
 			.where(`note.visibility = 'public'`)
@@ -11,7 +12,7 @@ export function generateVisibilityQuery(q: SelectQueryBuilder<any>, me?: { id: U
 	} else {
 		const followingQuery = Followings.createQueryBuilder('following')
 			.select('following.followeeId')
-			.where('following.followerId = :followerId', { followerId: me.id });
+			.where('following.followerId = :meId');
 
 		q.andWhere(new Brackets(qb => { qb
 			// 公開投稿である
@@ -20,21 +21,22 @@ export function generateVisibilityQuery(q: SelectQueryBuilder<any>, me?: { id: U
 				.orWhere(`note.visibility = 'home'`);
 			}))
 			// または 自分自身
-			.orWhere('note.userId = :userId1', { userId1: me.id })
+			.orWhere('note.userId = :meId')
 			// または 自分宛て
-			.orWhere(`'{"${me.id}"}' <@ note.visibleUserIds`)
+			.orWhere(':meId = ANY(note.visibleUserIds)')
+			.orWhere(':meId = ANY(note.mentions)')
 			.orWhere(new Brackets(qb => { qb
 				// または フォロワー宛ての投稿であり、
-				.where('note.visibility = \'followers\'')
+				.where(`note.visibility = 'followers'`)
 				.andWhere(new Brackets(qb => { qb
 					// 自分がフォロワーである
 					.where(`note.userId IN (${ followingQuery.getQuery() })`)
 					// または 自分の投稿へのリプライ
-					.orWhere('note.replyUserId = :userId3', { userId3: me.id });
+					.orWhere('note.replyUserId = :meId');
 				}));
 			}));
 		}));
 
-		q.setParameters(followingQuery.getParameters());
+		q.setParameters({ meId: me.id });
 	}
 }

packages/backend/src/server/api/common/read-notification.ts

@@ -9,6 +9,8 @@ export async function readNotification(
 	userId: User['id'],
 	notificationIds: Notification['id'][]
 ) {
+	if (notificationIds.length === 0) return;
+
 	// Update documents
 	await Notifications.update({
 		id: In(notificationIds),

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

@@ -1,5 +1,5 @@
-import define from '../define.js';
 import { Announcements, AnnouncementReads } from '@/models/index.js';
+import define from '../define.js';
 import { makePaginationQuery } from '../common/make-pagination-query.js';
 
 export const meta = {

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

@@ -1,6 +1,6 @@
-import define from '../define.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { DriveFiles } from '@/models/index.js';
+import define from '../define.js';
 
 export const meta = {
 	tags: ['drive', 'account'],

packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts

@@ -9,6 +9,8 @@ export const meta = {
 
 	kind: 'read:drive',
 
+	description: 'Find the notes to which the given file is attached.',
+
 	res: {
 		type: 'array',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/drive/files/check-existence.ts

@@ -8,6 +8,8 @@ export const meta = {
 
 	kind: 'read:drive',
 
+	description: 'Check if a given file exists.',
+
 	res: {
 		type: 'boolean',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/drive/files/create.ts

@@ -20,6 +20,8 @@ export const meta = {
 
 	kind: 'write:drive',
 
+	description: 'Upload a new drive file.',
+
 	res: {
 		type: 'object',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/drive/files/delete.ts

@@ -11,6 +11,8 @@ export const meta = {
 
 	kind: 'write:drive',
 
+	description: 'Delete an existing drive file.',
+
 	errors: {
 		noSuchFile: {
 			message: 'No such file.',

packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts

@@ -8,6 +8,8 @@ export const meta = {
 
 	kind: 'read:drive',
 
+	description: 'Search for a drive file by a hash of the contents.',
+
 	res: {
 		type: 'array',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/drive/files/find.ts

@@ -9,6 +9,8 @@ export const meta = {
 
 	kind: 'read:drive',
 
+	description: 'Search for a drive file by the given parameters.',
+
 	res: {
 		type: 'array',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/drive/files/show.ts

@@ -10,6 +10,8 @@ export const meta = {
 
 	kind: 'read:drive',
 
+	description: 'Show the properties of a drive file.',
+
 	res: {
 		type: 'object',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/drive/files/update.ts

@@ -11,6 +11,8 @@ export const meta = {
 
 	kind: 'write:drive',
 
+	description: 'Update the properties of a drive file.',
+
 	errors: {
 		invalidFileName: {
 			message: 'Invalid file name.',

packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts

@@ -13,6 +13,8 @@ export const meta = {
 		max: 60,
 	},
 
+	description: 'Request the server to download a new drive file from the specified URL.',
+
 	requireCredential: true,
 
 	kind: 'write:drive',

packages/backend/src/server/api/endpoints/export-custom-emojis.ts

@@ -1,6 +1,6 @@
-import define from '../define.js';
-import { createExportCustomEmojisJob } from '@/queue/index.js';
 import ms from 'ms';
+import { createExportCustomEmojisJob } from '@/queue/index.js';
+import define from '../define.js';
 
 export const meta = {
 	secure: true,

packages/backend/src/server/api/endpoints/get-online-users-count.ts

@@ -1,6 +1,6 @@
+import { MoreThan } from 'typeorm';
 import { USER_ONLINE_THRESHOLD } from '@/const.js';
 import { Users } from '@/models/index.js';
-import { MoreThan } from 'typeorm';
 import define from '../define.js';
 
 export const meta = {

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

@@ -1,5 +1,5 @@
-import define from '../define.js';
 import { Users } from '@/models/index.js';
+import define from '../define.js';
 
 export const meta = {
 	tags: ['account'],

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

@@ -1,17 +1,22 @@
+import { Brackets } from 'typeorm';
+import { Notifications, Followings, Mutings, Users } from '@/models/index.js';
+import { notificationTypes } from '@/types.js';
+import read from '@/services/note/read.js';
 import { readNotification } from '../../common/read-notification.js';
 import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 import { generateMutedInstanceNotificationQuery } from '../../common/generate-muted-instance-query.js';
-import { Notifications, Followings, Mutings, Users } from '@/models/index.js';
-import { notificationTypes } from '@/types.js';
-import read from '@/services/note/read.js';
-import { Brackets } from 'typeorm';
 
 export const meta = {
 	tags: ['account', 'notifications'],
 
 	requireCredential: true,
 
+	limit: {
+		duration: 60000,
+		max: 10,
+	},
+
 	kind: 'read:notifications',
 
 	res: {
@@ -67,7 +72,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		.where('users.isSuspended = TRUE');
 
 	const query = makePaginationQuery(Notifications.createQueryBuilder('notification'), ps.sinceId, ps.untilId)
-		.andWhere(`notification.notifieeId = :meId`, { meId: user.id })
+		.andWhere('notification.notifieeId = :meId', { meId: user.id })
 		.leftJoinAndSelect('notification.notifier', 'notifier')
 		.leftJoinAndSelect('notification.note', 'note')
 		.leftJoinAndSelect('notifier.avatar', 'notifierAvatar')
@@ -103,13 +108,13 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	if (ps.includeTypes && ps.includeTypes.length > 0) {
-		query.andWhere(`notification.type IN (:...includeTypes)`, { includeTypes: ps.includeTypes });
+		query.andWhere('notification.type IN (:...includeTypes)', { includeTypes: ps.includeTypes });
 	} else if (ps.excludeTypes && ps.excludeTypes.length > 0) {
-		query.andWhere(`notification.type NOT IN (:...excludeTypes)`, { excludeTypes: ps.excludeTypes });
+		query.andWhere('notification.type NOT IN (:...excludeTypes)', { excludeTypes: ps.excludeTypes });
 	}
 
 	if (ps.unreadOnly) {
-		query.andWhere(`notification.isRead = false`);
+		query.andWhere('notification.isRead = false');
 	}
 
 	const notifications = await query.take(ps.limit).getMany();

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

@@ -1,10 +1,10 @@
+import { IsNull, MoreThan } from 'typeorm';
 import config from '@/config/index.js';
-import define from '../define.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { Ads, Emojis, Users } from '@/models/index.js';
 import { DB_MAX_NOTE_TEXT_LENGTH } from '@/misc/hard-limits.js';
-import { IsNull, MoreThan } from 'typeorm';
 import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
+import define from '../define.js';
 
 export const meta = {
 	tags: ['meta'],

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

@@ -1,6 +1,6 @@
+import { Notes } from '@/models/index.js';
 import define from '../define.js';
 import { makePaginationQuery } from '../common/make-pagination-query.js';
-import { Notes } from '@/models/index.js';
 
 export const meta = {
 	tags: ['notes'],
@@ -34,8 +34,8 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps) => {
 	const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
-		.andWhere(`note.visibility = 'public'`)
-		.andWhere(`note.localOnly = FALSE`)
+		.andWhere('note.visibility = \'public\'')
+		.andWhere('note.localOnly = FALSE')
 		.innerJoinAndSelect('note.user', 'user')
 		.leftJoinAndSelect('user.avatar', 'avatar')
 		.leftJoinAndSelect('user.banner', 'banner')
@@ -61,7 +61,7 @@ export default define(meta, paramDef, async (ps) => {
 	}
 
 	if (ps.withFiles !== undefined) {
-		query.andWhere(ps.withFiles ? `note.fileIds != '{}'` : `note.fileIds = '{}'`);
+		query.andWhere(ps.withFiles ? 'note.fileIds != \'{}\'' : 'note.fileIds = \'{}\'');
 	}
 
 	if (ps.poll !== undefined) {

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

@@ -1,9 +1,9 @@
+import { Brackets } from 'typeorm';
+import { Notes } from '@/models/index.js';
 import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
-import { Brackets } from 'typeorm';
-import { Notes } from '@/models/index.js';
 import { generateBlockedUserQuery } from '../../common/generate-block-query.js';
 import { generateMutedInstanceQuery } from '../../common/generate-muted-instance-query.js';
 
@@ -38,13 +38,13 @@ export const paramDef = {
 export default define(meta, paramDef, async (ps, user) => {
 	const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
 		.andWhere(new Brackets(qb => { qb
-			.where(`note.replyId = :noteId`, { noteId: ps.noteId })
+			.where('note.replyId = :noteId', { noteId: ps.noteId })
 			.orWhere(new Brackets(qb => { qb
-				.where(`note.renoteId = :noteId`, { noteId: ps.noteId })
+				.where('note.renoteId = :noteId', { noteId: ps.noteId })
 				.andWhere(new Brackets(qb => { qb
-					.where(`note.text IS NOT NULL`)
-					.orWhere(`note.fileIds != '{}'`)
-					.orWhere(`note.hasPoll = TRUE`);
+					.where('note.text IS NOT NULL')
+					.orWhere('note.fileIds != \'{}\'')
+					.orWhere('note.hasPoll = TRUE');
 				}));
 			}));
 		}))

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

@@ -1,8 +1,8 @@
-import define from '../../define.js';
+import { In } from 'typeorm';
 import { ClipNotes, Clips } from '@/models/index.js';
+import define from '../../define.js';
 import { getNote } from '../../common/getters.js';
 import { ApiError } from '../../error.js';
-import { In } from 'typeorm';
 
 export const meta = {
 	tags: ['clips', 'notes'],

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

@@ -1,8 +1,8 @@
+import { Note } from '@/models/entities/note.js';
+import { Notes } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
 import { getNote } from '../../common/getters.js';
-import { Note } from '@/models/entities/note.js';
-import { Notes } from '@/models/index.js';
 
 export const meta = {
 	tags: ['notes'],

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

@@ -1,9 +1,9 @@
-import deleteNote from '@/services/note/delete.js';
-import define from '../../define.js';
 import ms from 'ms';
+import deleteNote from '@/services/note/delete.js';
+import { Users } from '@/models/index.js';
+import define from '../../define.js';
 import { getNote } from '../../common/getters.js';
 import { ApiError } from '../../error.js';
-import { Users } from '@/models/index.js';
 
 export const meta = {
 	tags: ['notes'],

packages/backend/src/server/api/endpoints/notes/favorites/create.ts

@@ -1,8 +1,8 @@
+import { NoteFavorites } from '@/models/index.js';
+import { genId } from '@/misc/gen-id.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 import { getNote } from '../../../common/getters.js';
-import { NoteFavorites } from '@/models/index.js';
-import { genId } from '@/misc/gen-id.js';
 
 export const meta = {
 	tags: ['notes', 'favorites'],

packages/backend/src/server/api/endpoints/notes/favorites/delete.ts

@@ -1,7 +1,7 @@
+import { NoteFavorites } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 import { getNote } from '../../../common/getters.js';
-import { NoteFavorites } from '@/models/index.js';
 
 export const meta = {
 	tags: ['notes', 'favorites'],

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

@@ -1,6 +1,6 @@
+import { Notes } from '@/models/index.js';
 import define from '../../define.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
-import { Notes } from '@/models/index.js';
 import { generateBlockedUserQuery } from '../../common/generate-block-query.js';
 
 export const meta = {
@@ -36,9 +36,9 @@ export default define(meta, paramDef, async (ps, user) => {
 	const query = Notes.createQueryBuilder('note')
 		.addSelect('note.score')
 		.where('note.userHost IS NULL')
-		.andWhere(`note.score > 0`)
-		.andWhere(`note.createdAt > :date`, { date: new Date(Date.now() - day) })
-		.andWhere(`note.visibility = 'public'`)
+		.andWhere('note.score > 0')
+		.andWhere('note.createdAt > :date', { date: new Date(Date.now() - day) })
+		.andWhere('note.visibility = \'public\'')
 		.innerJoinAndSelect('note.user', 'user')
 		.leftJoinAndSelect('user.avatar', 'avatar')
 		.leftJoinAndSelect('user.banner', 'banner')

packages/backend/src/server/api/endpoints/notes/global-timeline.ts

@@ -1,11 +1,11 @@
-import define from '../../define.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
+import { Notes, Users } from '@/models/index.js';
+import { activeUsersChart } from '@/services/chart/index.js';
+import define from '../../define.js';
 import { ApiError } from '../../error.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { Notes, Users } from '@/models/index.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
 import { generateMutedInstanceQuery } from '../../common/generate-muted-instance-query.js';
-import { activeUsersChart } from '@/services/chart/index.js';
 import { generateRepliesQuery } from '../../common/generate-replies-query.js';
 import { generateMutedNoteQuery } from '../../common/generate-muted-note-query.js';
 import { generateBlockedUserQuery } from '../../common/generate-block-query.js';
@@ -60,7 +60,7 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	//#region Construct query
 	const query = makePaginationQuery(Notes.createQueryBuilder('note'),
-			ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
+		ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
 		.andWhere('note.visibility = \'public\'')
 		.andWhere('note.channelId IS NULL')
 		.innerJoinAndSelect('note.user', 'user')

packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts

@@ -1,13 +1,13 @@
-import define from '../../define.js';
+import { Brackets } from 'typeorm';
 import { fetchMeta } from '@/misc/fetch-meta.js';
+import { Followings, Notes, Users } from '@/models/index.js';
+import { activeUsersChart } from '@/services/chart/index.js';
+import define from '../../define.js';
 import { ApiError } from '../../error.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { Followings, Notes, Users } from '@/models/index.js';
-import { Brackets } from 'typeorm';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
 import { generateMutedInstanceQuery } from '../../common/generate-muted-instance-query.js';
-import { activeUsersChart } from '@/services/chart/index.js';
 import { generateRepliesQuery } from '../../common/generate-replies-query.js';
 import { generateMutedNoteQuery } from '../../common/generate-muted-note-query.js';
 import { generateChannelQuery } from '../../common/generate-channel-query.js';
@@ -70,7 +70,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		.where('following.followerId = :followerId', { followerId: user.id });
 
 	const query = makePaginationQuery(Notes.createQueryBuilder('note'),
-			ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
+		ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
 		.andWhere(new Brackets(qb => {
 			qb.where(`((note.userId IN (${ followingQuery.getQuery() })) OR (note.userId = :meId))`, { meId: user.id })
 				.orWhere('(note.visibility = \'public\') AND (note.userHost IS NULL)');

packages/backend/src/server/api/endpoints/notes/local-timeline.ts

@@ -1,12 +1,12 @@
-import define from '../../define.js';
+import { Brackets } from 'typeorm';
 import { fetchMeta } from '@/misc/fetch-meta.js';
-import { ApiError } from '../../error.js';
 import { Notes, Users } from '@/models/index.js';
+import { activeUsersChart } from '@/services/chart/index.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
-import { activeUsersChart } from '@/services/chart/index.js';
-import { Brackets } from 'typeorm';
 import { generateRepliesQuery } from '../../common/generate-replies-query.js';
 import { generateMutedNoteQuery } from '../../common/generate-muted-note-query.js';
 import { generateChannelQuery } from '../../common/generate-channel-query.js';
@@ -66,7 +66,7 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	//#region Construct query
 	const query = makePaginationQuery(Notes.createQueryBuilder('note'),
-			ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
+		ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
 		.andWhere('(note.visibility = \'public\') AND (note.userHost IS NULL)')
 		.innerJoinAndSelect('note.user', 'user')
 		.leftJoinAndSelect('user.avatar', 'avatar')

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

@@ -1,10 +1,10 @@
-import define from '../../define.js';
+import { Brackets } from 'typeorm';
 import read from '@/services/note/read.js';
 import { Notes, Followings } from '@/models/index.js';
+import define from '../../define.js';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { Brackets } from 'typeorm';
 import { generateBlockedUserQuery } from '../../common/generate-block-query.js';
 import { generateMutedNoteThreadQuery } from '../../common/generate-muted-note-thread-query.js';
 

packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts

@@ -1,6 +1,6 @@
-import define from '../../../define.js';
-import { Polls, Mutings, Notes, PollVotes } from '@/models/index.js';
 import { Brackets, In } from 'typeorm';
+import { Polls, Mutings, Notes, PollVotes } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['notes'],
@@ -31,8 +31,8 @@ export const paramDef = {
 export default define(meta, paramDef, async (ps, user) => {
 	const query = Polls.createQueryBuilder('poll')
 		.where('poll.userHost IS NULL')
-		.andWhere(`poll.userId != :meId`, { meId: user.id })
-		.andWhere(`poll.noteVisibility = 'public'`)
+		.andWhere('poll.userId != :meId', { meId: user.id })
+		.andWhere('poll.noteVisibility = \'public\'')
 		.andWhere(new Brackets(qb => { qb
 			.where('poll.expiresAt IS NULL')
 			.orWhere('poll.expiresAt > :now', { now: new Date() });

packages/backend/src/server/api/endpoints/notes/polls/vote.ts

@@ -1,16 +1,16 @@
+import { Not } from 'typeorm';
 import { publishNoteStream } from '@/services/stream.js';
 import { createNotification } from '@/services/create-notification.js';
-import define from '../../../define.js';
-import { ApiError } from '../../../error.js';
-import { getNote } from '../../../common/getters.js';
 import { deliver } from '@/queue/index.js';
 import { renderActivity } from '@/remote/activitypub/renderer/index.js';
 import renderVote from '@/remote/activitypub/renderer/vote.js';
 import { deliverQuestionUpdate } from '@/services/note/polls/update.js';
 import { PollVotes, NoteWatchings, Users, Polls, Blockings } from '@/models/index.js';
-import { Not } from 'typeorm';
 import { IRemoteUser } from '@/models/entities/user.js';
 import { genId } from '@/misc/gen-id.js';
+import { getNote } from '../../../common/getters.js';
+import { ApiError } from '../../../error.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['notes'],

packages/backend/src/server/api/endpoints/notes/reactions/delete.ts

@@ -1,6 +1,6 @@
-import define from '../../../define.js';
 import ms from 'ms';
 import deleteReaction from '@/services/note/reaction/delete.js';
+import define from '../../../define.js';
 import { getNote } from '../../../common/getters.js';
 import { ApiError } from '../../../error.js';
 

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

@@ -1,10 +1,10 @@
+import { Notes } from '@/models/index.js';
 import define from '../../define.js';
 import { getNote } from '../../common/getters.js';
 import { ApiError } from '../../error.js';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { Notes } from '@/models/index.js';
 import { generateBlockedUserQuery } from '../../common/generate-block-query.js';
 
 export const meta = {
@@ -50,7 +50,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
-		.andWhere(`note.renoteId = :renoteId`, { renoteId: note.id })
+		.andWhere('note.renoteId = :renoteId', { renoteId: note.id })
 		.innerJoinAndSelect('note.user', 'user')
 		.leftJoinAndSelect('user.avatar', 'avatar')
 		.leftJoinAndSelect('user.banner', 'banner')

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

@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Notes } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';

packages/backend/src/server/api/endpoints/notes/search-by-tag.ts

@@ -1,11 +1,11 @@
-import define from '../../define.js';
-import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { Notes } from '@/models/index.js';
-import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
-import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
 import { Brackets } from 'typeorm';
+import { Notes } from '@/models/index.js';
 import { safeForSql } from '@/misc/safe-for-sql.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
+import define from '../../define.js';
+import { makePaginationQuery } from '../../common/make-pagination-query.js';
+import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
+import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
 import { generateBlockedUserQuery } from '../../common/generate-block-query.js';
 
 export const meta = {

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

@@ -1,8 +1,8 @@
+import { In } from 'typeorm';
+import { Notes } from '@/models/index.js';
+import config from '@/config/index.js';
 import es from '../../../../db/elasticsearch.js';
 import define from '../../define.js';
-import { Notes } from '@/models/index.js';
-import { In } from 'typeorm';
-import config from '@/config/index.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
@@ -99,7 +99,7 @@ export default define(meta, paramDef, async (ps, me) => {
 					userHost: ps.host,
 				},
 			}] : []
-		: [];
+			: [];
 
 		const result = await es.search({
 			index: config.elasticsearch.index || 'misskey_note',

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

@@ -1,7 +1,7 @@
+import { Notes } from '@/models/index.js';
 import define from '../../define.js';
 import { getNote } from '../../common/getters.js';
 import { ApiError } from '../../error.js';
-import { Notes } from '@/models/index.js';
 
 export const meta = {
 	tags: ['notes'],

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

@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { NoteFavorites, Notes, NoteThreadMutings, NoteWatchings } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['notes'],

packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts

@@ -1,9 +1,9 @@
-import define from '../../../define.js';
-import { getNote } from '../../../common/getters.js';
-import { ApiError } from '../../../error.js';
 import { Notes, NoteThreadMutings } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
 import readNote from '@/services/note/read.js';
+import define from '../../../define.js';
+import { getNote } from '../../../common/getters.js';
+import { ApiError } from '../../../error.js';
 
 export const meta = {
 	tags: ['notes'],

packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts

@@ -1,7 +1,7 @@
+import { NoteThreadMutings } from '@/models/index.js';
 import define from '../../../define.js';
 import { getNote } from '../../../common/getters.js';
 import { ApiError } from '../../../error.js';
-import { NoteThreadMutings } from '@/models/index.js';
 
 export const meta = {
 	tags: ['notes'],

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

@@ -1,11 +1,11 @@
+import { Brackets } from 'typeorm';
+import { Notes, Followings } from '@/models/index.js';
+import { activeUsersChart } from '@/services/chart/index.js';
 import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { Notes, Followings } from '@/models/index.js';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
 import { generateMutedInstanceQuery } from '../../common/generate-muted-instance-query.js';
-import { activeUsersChart } from '@/services/chart/index.js';
-import { Brackets } from 'typeorm';
 import { generateRepliesQuery } from '../../common/generate-replies-query.js';
 import { generateMutedNoteQuery } from '../../common/generate-muted-note-query.js';
 import { generateChannelQuery } from '../../common/generate-channel-query.js';
@@ -62,10 +62,10 @@ export default define(meta, paramDef, async (ps, user) => {
 		.where('following.followerId = :followerId', { followerId: user.id });
 
 	const query = makePaginationQuery(Notes.createQueryBuilder('note'),
-			ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
+		ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
 		.andWhere(new Brackets(qb => { qb
 			.where('note.userId = :meId', { meId: user.id });
-			if (hasFollowing) qb.orWhere(`note.userId IN (${ followingQuery.getQuery() })`);
+		if (hasFollowing) qb.orWhere(`note.userId IN (${ followingQuery.getQuery() })`);
 		}))
 		.innerJoinAndSelect('note.user', 'user')
 		.leftJoinAndSelect('user.avatar', 'avatar')

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

@@ -1,9 +1,9 @@
-import deleteNote from '@/services/note/delete.js';
-import define from '../../define.js';
 import ms from 'ms';
+import deleteNote from '@/services/note/delete.js';
+import { Notes, Users } from '@/models/index.js';
+import define from '../../define.js';
 import { getNote } from '../../common/getters.js';
 import { ApiError } from '../../error.js';
-import { Notes, Users } from '@/models/index.js';
 
 export const meta = {
 	tags: ['notes'],

packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts

@@ -1,10 +1,10 @@
+import { Brackets } from 'typeorm';
+import { UserLists, UserListJoinings, Notes } from '@/models/index.js';
+import { activeUsersChart } from '@/services/chart/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { UserLists, UserListJoinings, Notes } from '@/models/index.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
-import { activeUsersChart } from '@/services/chart/index.js';
-import { Brackets } from 'typeorm';
 
 export const meta = {
 	tags: ['notes', 'lists'],

packages/backend/src/server/api/endpoints/notes/watching/create.ts

@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import watch from '@/services/note/watch.js';
+import define from '../../../define.js';
 import { getNote } from '../../../common/getters.js';
 import { ApiError } from '../../../error.js';
 

packages/backend/src/server/api/endpoints/notes/watching/delete.ts

@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import unwatch from '@/services/note/unwatch.js';
+import define from '../../../define.js';
 import { getNote } from '../../../common/getters.js';
 import { ApiError } from '../../../error.js';
 

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

@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { createNotification } from '@/services/create-notification.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['notifications'],

packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts

@@ -1,7 +1,7 @@
 import { publishMainStream } from '@/services/stream.js';
 import { pushNotification } from '@/services/push-notification.js';
-import define from '../../define.js';
 import { Notifications } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['notifications', 'account'],

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

@@ -2,17 +2,14 @@ import define from '../../define.js';
 import { readNotification } from '../../common/read-notification.js';
 
 export const meta = {
-	desc: {
-		'ja-JP': '通知を既読にします。',
-		'en-US': 'Mark a notification as read.'
-	},
-
 	tags: ['notifications', 'account'],
 
 	requireCredential: true,
 
 	kind: 'write:notifications',
 
+	description: 'Mark a notification as read.',
+
 	errors: {
 		noSuchNotification: {
 			message: 'No such notification.',
@@ -34,7 +31,11 @@ export const paramDef = {
 		{
 			type: 'object',
 			properties: {
-				notificationIds: { type: 'array', items: { type: 'string', format: 'misskey:id' } },
+				notificationIds: {
+					type: 'array',
+					items: { type: 'string', format: 'misskey:id' },
+					maxItems: 100,
+				},
 			},
 			required: ['notificationIds'],
 		},

packages/backend/src/server/api/endpoints/page-push.ts

@@ -1,6 +1,6 @@
-import define from '../define.js';
 import { publishMainStream } from '@/services/stream.js';
 import { Users, Pages } from '@/models/index.js';
+import define from '../define.js';
 import { ApiError } from '../error.js';
 
 export const meta = {

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

@@ -1,8 +1,8 @@
 import ms from 'ms';
-import define from '../../define.js';
 import { Pages, DriveFiles } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { Page } from '@/models/entities/page.js';
+import define from '../../define.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -51,7 +51,7 @@ export const paramDef = {
 		} },
 		script: { type: 'string' },
 		eyeCatchingImageId: { type: 'string', format: 'misskey:id', nullable: true },
-		font: { type: 'string', enum: ['serif', 'sans-serif'], default: "sans-serif" },
+		font: { type: 'string', enum: ['serif', 'sans-serif'], default: 'sans-serif' },
 		alignCenter: { type: 'boolean', default: false },
 		hideTitleWhenPinned: { type: 'boolean', default: false },
 	},

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

@@ -1,6 +1,6 @@
+import { Pages } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Pages } from '@/models/index.js';
 
 export const meta = {
 	tags: ['pages'],

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

@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Pages } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['pages'],

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

@@ -1,7 +1,7 @@
-import define from '../../define.js';
-import { ApiError } from '../../error.js';
 import { Pages, PageLikes } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['pages'],

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

@@ -1,6 +1,6 @@
+import { Pages, PageLikes } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Pages, PageLikes } from '@/models/index.js';
 
 export const meta = {
 	tags: ['pages'],

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

@@ -1,8 +1,8 @@
 import ms from 'ms';
+import { Not } from 'typeorm';
+import { Pages, DriveFiles } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Pages, DriveFiles } from '@/models/index.js';
-import { Not } from 'typeorm';
 
 export const meta = {
 	tags: ['pages'],

packages/backend/src/server/api/endpoints/pinned-users.ts

@@ -1,9 +1,9 @@
-import define from '../define.js';
+import { IsNull } from 'typeorm';
 import { Users } from '@/models/index.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import * as Acct from '@/misc/acct.js';
 import { User } from '@/models/entities/user.js';
-import { IsNull } from 'typeorm';
+import define from '../define.js';
 
 export const meta = {
 	tags: ['users'],

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

@@ -1,8 +1,8 @@
+import { PromoReads } from '@/models/index.js';
+import { genId } from '@/misc/gen-id.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
 import { getNote } from '../../common/getters.js';
-import { PromoReads } from '@/models/index.js';
-import { genId } from '@/misc/gen-id.js';
 
 export const meta = {
 	tags: ['notes'],

packages/backend/src/server/api/endpoints/request-reset-password.ts

@@ -1,17 +1,21 @@
-import { publishMainStream } from '@/services/stream.js';
-import define from '../define.js';
 import rndstr from 'rndstr';
-import config from '@/config/index.js';
 import ms from 'ms';
+import { IsNull } from 'typeorm';
+import { publishMainStream } from '@/services/stream.js';
+import config from '@/config/index.js';
 import { Users, UserProfiles, PasswordResetRequests } from '@/models/index.js';
 import { sendEmail } from '@/services/send-email.js';
-import { ApiError } from '../error.js';
 import { genId } from '@/misc/gen-id.js';
-import { IsNull } from 'typeorm';
+import { ApiError } from '../error.js';
+import define from '../define.js';
 
 export const meta = {
+	tags: ['reset password'],
+
 	requireCredential: false,
 
+	description: 'Request a users password to be reset.',
+
 	limit: {
 		duration: ms('1hour'),
 		max: 3,

packages/backend/src/server/api/endpoints/reset-db.ts

@@ -1,10 +1,14 @@
+import { resetDb } from '@/db/postgre.js';
 import define from '../define.js';
 import { ApiError } from '../error.js';
-import { resetDb } from '@/db/postgre.js';
 
 export const meta = {
+	tags: ['non-productive'],
+
 	requireCredential: false,
 
+	description: 'Only available when running with <code>NODE_ENV=testing</code>. Reset the database and flush Redis.',
+
 	errors: {
 
 	},

packages/backend/src/server/api/endpoints/reset-password.ts

@@ -1,12 +1,16 @@
 import bcrypt from 'bcryptjs';
 import { publishMainStream } from '@/services/stream.js';
-import define from '../define.js';
 import { Users, UserProfiles, PasswordResetRequests } from '@/models/index.js';
+import define from '../define.js';
 import { ApiError } from '../error.js';
 
 export const meta = {
+	tags: ['reset password'],
+
 	requireCredential: false,
 
+	description: 'Complete the password reset that was previously requested.',
+
 	errors: {
 
 	},

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

@@ -1,5 +1,5 @@
-import define from '../define.js';
 import { Instances, NoteReactions, Notes, Users } from '@/models/index.js';
+import define from '../define.js';
 import { } from '@/services/chart/index.js';
 import { IsNull } from 'typeorm';
 

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

@@ -1,13 +1,15 @@
-import define from '../../define.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { genId } from '@/misc/gen-id.js';
 import { SwSubscriptions } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['account'],
 
 	requireCredential: true,
 
+	description: 'Register to receive push notifications.',
+
 	res: {
 		type: 'object',
 		optional: false, nullable: false,

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

@@ -1,10 +1,12 @@
-import define from '../../define.js';
 import { SwSubscriptions } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['account'],
 
 	requireCredential: true,
+
+	description: 'Unregister from receiving push notifications.',
 } as const;
 
 export const paramDef = {

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

@@ -1,6 +1,10 @@
 import define from '../define.js';
 
 export const meta = {
+	tags: ['non-productive'],
+
+	description: 'Endpoint for testing input validation.',
+
 	requireCredential: false,
 } as const;
 

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

@@ -1,6 +1,6 @@
-import define from '../../define.js';
-import { Users, UsedUsernames } from '@/models/index.js';
 import { IsNull } from 'typeorm';
+import { Users, UsedUsernames } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['users'],

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

@@ -1,5 +1,5 @@
-import define from '../define.js';
 import { Users } from '@/models/index.js';
+import define from '../define.js';
 import { generateMutedUserQueryForUsers } from '../common/generate-muted-user-query.js';
 import { generateBlockQueryForUsers } from '../common/generate-block-query.js';
 
@@ -25,8 +25,8 @@ export const paramDef = {
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 		offset: { type: 'integer', default: 0 },
 		sort: { type: 'string', enum: ['+follower', '-follower', '+createdAt', '-createdAt', '+updatedAt', '-updatedAt'] },
-		state: { type: 'string', enum: ['all', 'admin', 'moderator', 'adminOrModerator', 'alive'], default: "all" },
-		origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: "local" },
+		state: { type: 'string', enum: ['all', 'admin', 'moderator', 'adminOrModerator', 'alive'], default: 'all' },
+		origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'local' },
 	},
 	required: [],
 } as const;

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

@@ -1,9 +1,21 @@
-import define from '../../define.js';
 import { Clips } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
 	tags: ['users', 'clips'],
+
+	description: 'Show all clips this user owns.',
+
+	res: {
+		type: 'array',
+		optional: false, nullable: false,
+		items: {
+			type: 'object',
+			optional: false, nullable: false,
+			ref: 'Clip',
+		},
+	},
 } as const;
 
 export const paramDef = {
@@ -20,7 +32,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	const query = makePaginationQuery(Clips.createQueryBuilder('clip'), ps.sinceId, ps.untilId)
-		.andWhere(`clip.userId = :userId`, { userId: ps.userId })
+		.andWhere('clip.userId = :userId', { userId: ps.userId })
 		.andWhere('clip.isPublic = true');
 
 	const clips = await query

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

@@ -1,15 +1,17 @@
+import { IsNull } from 'typeorm';
+import { Users, Followings, UserProfiles } from '@/models/index.js';
+import { toPunyNullable } from '@/misc/convert-host.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Users, Followings, UserProfiles } from '@/models/index.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { toPunyNullable } from '@/misc/convert-host.js';
-import { IsNull } from 'typeorm';
 
 export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
 
+	description: 'Show everyone that follows this user.',
+
 	res: {
 		type: 'array',
 		optional: false, nullable: false,
@@ -94,7 +96,7 @@ export default define(meta, paramDef, async (ps, me) => {
 	}
 
 	const query = makePaginationQuery(Followings.createQueryBuilder('following'), ps.sinceId, ps.untilId)
-		.andWhere(`following.followeeId = :userId`, { userId: user.id })
+		.andWhere('following.followeeId = :userId', { userId: user.id })
 		.innerJoinAndSelect('following.follower', 'follower');
 
 	const followings = await query

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

@@ -1,15 +1,17 @@
+import { IsNull } from 'typeorm';
+import { Users, Followings, UserProfiles } from '@/models/index.js';
+import { toPunyNullable } from '@/misc/convert-host.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Users, Followings, UserProfiles } from '@/models/index.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { toPunyNullable } from '@/misc/convert-host.js';
-import { IsNull } from 'typeorm';
 
 export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
 
+	description: 'Show everyone that this user is following.',
+
 	res: {
 		type: 'array',
 		optional: false, nullable: false,
@@ -94,7 +96,7 @@ export default define(meta, paramDef, async (ps, me) => {
 	}
 
 	const query = makePaginationQuery(Followings.createQueryBuilder('following'), ps.sinceId, ps.untilId)
-		.andWhere(`following.followerId = :userId`, { userId: user.id })
+		.andWhere('following.followerId = :userId', { userId: user.id })
 		.innerJoinAndSelect('following.followee', 'followee');
 
 	const followings = await query

packages/backend/src/server/api/endpoints/users/gallery/posts.ts

@@ -4,6 +4,18 @@ import { makePaginationQuery } from '../../../common/make-pagination-query.js';
 
 export const meta = {
 	tags: ['users', 'gallery'],
+
+	description: 'Show all gallery posts by the given user.',
+
+	res: {
+		type: 'array',
+		optional: false, nullable: false,
+		items: {
+			type: 'object',
+			optional: false, nullable: false,
+			ref: 'GalleryPost',
+		},
+	},
 } as const;
 
 export const paramDef = {

packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts

@@ -1,15 +1,17 @@
-import define from '../../define.js';
+import { Not, In, IsNull } from 'typeorm';
 import { maximum } from '@/prelude/array.js';
+import { Notes, Users } from '@/models/index.js';
+import define from '../../define.js';
 import { ApiError } from '../../error.js';
 import { getUser } from '../../common/getters.js';
-import { Not, In, IsNull } from 'typeorm';
-import { Notes, Users } from '@/models/index.js';
 
 export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
 
+	description: 'Get a list of other users that the specified user frequently replies to.',
+
 	res: {
 		type: 'array',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/users/groups/create.ts

@@ -1,8 +1,8 @@
-import define from '../../../define.js';
 import { UserGroups, UserGroupJoinings } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { UserGroup } from '@/models/entities/user-group.js';
 import { UserGroupJoining } from '@/models/entities/user-group-joining.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['groups'],
@@ -11,6 +11,8 @@ export const meta = {
 
 	kind: 'write:user-groups',
 
+	description: 'Create a new group.',
+
 	res: {
 		type: 'object',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/users/groups/delete.ts

@@ -1,6 +1,6 @@
+import { UserGroups } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { UserGroups } from '@/models/index.js';
 
 export const meta = {
 	tags: ['groups'],
@@ -9,6 +9,8 @@ export const meta = {
 
 	kind: 'write:user-groups',
 
+	description: 'Delete an existing group.',
+
 	errors: {
 		noSuchGroup: {
 			message: 'No such group.',

packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts

@@ -1,8 +1,8 @@
-import define from '../../../../define.js';
-import { ApiError } from '../../../../error.js';
 import { UserGroupJoinings, UserGroupInvitations } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { UserGroupJoining } from '@/models/entities/user-group-joining.js';
+import { ApiError } from '../../../../error.js';
+import define from '../../../../define.js';
 
 export const meta = {
 	tags: ['groups', 'users'],
@@ -11,6 +11,8 @@ export const meta = {
 
 	kind: 'write:user-groups',
 
+	description: 'Join a group the authenticated user has been invited to.',
+
 	errors: {
 		noSuchInvitation: {
 			message: 'No such invitation.',

packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts

@@ -1,6 +1,6 @@
+import { UserGroupInvitations } from '@/models/index.js';
 import define from '../../../../define.js';
 import { ApiError } from '../../../../error.js';
-import { UserGroupInvitations } from '@/models/index.js';
 
 export const meta = {
 	tags: ['groups', 'users'],
@@ -9,6 +9,8 @@ export const meta = {
 
 	kind: 'write:user-groups',
 
+	description: 'Delete an existing group invitation for the authenticated user without joining the group.',
+
 	errors: {
 		noSuchInvitation: {
 			message: 'No such invitation.',

packages/backend/src/server/api/endpoints/users/groups/invite.ts

@@ -1,10 +1,10 @@
-import define from '../../../define.js';
-import { ApiError } from '../../../error.js';
-import { getUser } from '../../../common/getters.js';
 import { UserGroups, UserGroupJoinings, UserGroupInvitations } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { UserGroupInvitation } from '@/models/entities/user-group-invitation.js';
 import { createNotification } from '@/services/create-notification.js';
+import { getUser } from '../../../common/getters.js';
+import { ApiError } from '../../../error.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['groups', 'users'],
@@ -13,6 +13,8 @@ export const meta = {
 
 	kind: 'write:user-groups',
 
+	description: 'Invite a user to an existing group.',
+
 	errors: {
 		noSuchGroup: {
 			message: 'No such group.',

packages/backend/src/server/api/endpoints/users/groups/joined.ts

@@ -1,6 +1,6 @@
-import define from '../../../define.js';
-import { UserGroups, UserGroupJoinings } from '@/models/index.js';
 import { Not, In } from 'typeorm';
+import { UserGroups, UserGroupJoinings } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['groups', 'account'],
@@ -9,6 +9,8 @@ export const meta = {
 
 	kind: 'read:user-groups',
 
+	description: 'List the groups that the authenticated user is a member of.',
+
 	res: {
 		type: 'array',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/users/groups/leave.ts

@@ -1,6 +1,6 @@
+import { UserGroups, UserGroupJoinings } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { UserGroups, UserGroupJoinings } from '@/models/index.js';
 
 export const meta = {
 	tags: ['groups', 'users'],
@@ -9,6 +9,8 @@ export const meta = {
 
 	kind: 'write:user-groups',
 
+	description: 'Leave a group. The owner of a group can not leave. They must transfer ownership or delete the group instead.',
+
 	errors: {
 		noSuchGroup: {
 			message: 'No such group.',

packages/backend/src/server/api/endpoints/users/groups/owned.ts

@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { UserGroups } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['groups', 'account'],
@@ -8,6 +8,8 @@ export const meta = {
 
 	kind: 'read:user-groups',
 
+	description: 'List the groups that the authenticated user is the owner of.',
+
 	res: {
 		type: 'array',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/users/groups/pull.ts

@@ -1,7 +1,7 @@
+import { UserGroups, UserGroupJoinings } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 import { getUser } from '../../../common/getters.js';
-import { UserGroups, UserGroupJoinings } from '@/models/index.js';
 
 export const meta = {
 	tags: ['groups', 'users'],
@@ -10,6 +10,8 @@ export const meta = {
 
 	kind: 'write:user-groups',
 
+	description: 'Removes a specified user from a group. The owner can not be removed.',
+
 	errors: {
 		noSuchGroup: {
 			message: 'No such group.',

packages/backend/src/server/api/endpoints/users/groups/show.ts

@@ -1,6 +1,6 @@
+import { UserGroups, UserGroupJoinings } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { UserGroups, UserGroupJoinings } from '@/models/index.js';
 
 export const meta = {
 	tags: ['groups', 'account'],
@@ -9,6 +9,8 @@ export const meta = {
 
 	kind: 'read:user-groups',
 
+	description: 'Show the properties of a group.',
+
 	res: {
 		type: 'object',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/users/groups/transfer.ts

@@ -1,7 +1,7 @@
+import { UserGroups, UserGroupJoinings } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 import { getUser } from '../../../common/getters.js';
-import { UserGroups, UserGroupJoinings } from '@/models/index.js';
 
 export const meta = {
 	tags: ['groups', 'users'],
@@ -10,6 +10,8 @@ export const meta = {
 
 	kind: 'write:user-groups',
 
+	description: 'Transfer ownership of a group from the authenticated user to another user.',
+
 	res: {
 		type: 'object',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/users/groups/update.ts

@@ -1,6 +1,6 @@
+import { UserGroups } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { UserGroups } from '@/models/index.js';
 
 export const meta = {
 	tags: ['groups'],
@@ -9,6 +9,8 @@ export const meta = {
 
 	kind: 'write:user-groups',
 
+	description: 'Update the properties of a group.',
+
 	res: {
 		type: 'object',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/users/lists/create.ts

@@ -1,7 +1,7 @@
-import define from '../../../define.js';
 import { UserLists } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { UserList } from '@/models/entities/user-list.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['lists'],
@@ -10,6 +10,8 @@ export const meta = {
 
 	kind: 'write:account',
 
+	description: 'Create a new list of users.',
+
 	res: {
 		type: 'object',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/users/lists/delete.ts

@@ -1,6 +1,6 @@
+import { UserLists } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { UserLists } from '@/models/index.js';
 
 export const meta = {
 	tags: ['lists'],
@@ -9,6 +9,8 @@ export const meta = {
 
 	kind: 'write:account',
 
+	description: 'Delete an existing list of users.',
+
 	errors: {
 		noSuchList: {
 			message: 'No such list.',

packages/backend/src/server/api/endpoints/users/lists/list.ts

@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { UserLists } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['lists', 'account'],
@@ -8,6 +8,8 @@ export const meta = {
 
 	kind: 'read:account',
 
+	description: 'Show all lists that the authenticated user has created.',
+
 	res: {
 		type: 'array',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/users/lists/pull.ts

@@ -1,8 +1,8 @@
 import { publishUserListStream } from '@/services/stream.js';
+import { UserLists, UserListJoinings, Users } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 import { getUser } from '../../../common/getters.js';
-import { UserLists, UserListJoinings, Users } from '@/models/index.js';
 
 export const meta = {
 	tags: ['lists', 'users'],
@@ -11,6 +11,8 @@ export const meta = {
 
 	kind: 'write:account',
 
+	description: 'Remove a user from a list.',
+
 	errors: {
 		noSuchList: {
 			message: 'No such list.',

packages/backend/src/server/api/endpoints/users/lists/push.ts

@@ -1,8 +1,8 @@
+import { pushUserToUserList } from '@/services/user-list/push.js';
+import { UserLists, UserListJoinings, Blockings } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 import { getUser } from '../../../common/getters.js';
-import { pushUserToUserList } from '@/services/user-list/push.js';
-import { UserLists, UserListJoinings, Blockings } from '@/models/index.js';
 
 export const meta = {
 	tags: ['lists', 'users'],
@@ -11,6 +11,8 @@ export const meta = {
 
 	kind: 'write:account',
 
+	description: 'Add a user to an existing list.',
+
 	errors: {
 		noSuchList: {
 			message: 'No such list.',

packages/backend/src/server/api/endpoints/users/lists/show.ts

@@ -1,6 +1,6 @@
+import { UserLists } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { UserLists } from '@/models/index.js';
 
 export const meta = {
 	tags: ['lists', 'account'],
@@ -9,6 +9,8 @@ export const meta = {
 
 	kind: 'read:account',
 
+	description: 'Show the properties of a list.',
+
 	res: {
 		type: 'object',
 		optional: false, nullable: false,

packages/backend/src/server/api/endpoints/users/lists/update.ts

@@ -1,6 +1,6 @@
+import { UserLists } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { UserLists } from '@/models/index.js';
 
 export const meta = {
 	tags: ['lists'],
@@ -9,6 +9,8 @@ export const meta = {
 
 	kind: 'write:account',
 
+	description: 'Update the properties of a list.',
+
 	res: {
 		type: 'object',
 		optional: false, nullable: false,