Merge branch 'develop'

16 files changed, 532 insertions, 58 deletions

diff --git a/src/server/api/define.ts b/src/server/api/define.ts
index 1e2600add0..f9e9813a87 100644
--- a/src/server/api/define.ts
+++ b/src/server/api/define.ts
@@ -14,7 +14,8 @@ type Params<T extends IEndpointMeta> = {
 export type Response = Record<string, any> | void;
 
 type executor<T extends IEndpointMeta> =
-	(params: Params<T>, user: ILocalUser, app: App, file?: any, cleanup?: Function) => Promise<T['res'] extends undefined ? Response : SchemaType<NonNullable<T['res']>>>;
+	(params: Params<T>, user: ILocalUser, app: App, file?: any, cleanup?: Function) =>
+		Promise<T['res'] extends undefined ? Response : SchemaType<NonNullable<T['res']>>>;
 
 export default function <T extends IEndpointMeta>(meta: T, cb: executor<T>)
 		: (params: any, user: ILocalUser, app: App, file?: any) => Promise<any> {
diff --git a/src/server/api/endpoints/endpoint.ts b/src/server/api/endpoints/endpoint.ts
new file mode 100644
index 0000000000..48e78cd04c
--- /dev/null
+++ b/src/server/api/endpoints/endpoint.ts
@@ -0,0 +1,26 @@
+import $ from 'cafy';
+import define from '../define';
+import endpoints from '../endpoints';
+
+export const meta = {
+	requireCredential: false,
+
+	tags: ['meta'],
+
+	params: {
+		endpoint: {
+			validator: $.str,
+		}
+	},
+};
+
+export default define(meta, async (ps) => {
+	const ep = endpoints.find(x => x.name === ps.endpoint);
+	if (ep == null) return null;
+	return {
+		params: Object.entries(ep.meta.params || {}).map(([k, v]) => ({
+			name: k,
+			type: v.validator.name === 'ID' ? 'String' : v.validator.name
+		}))
+	};
+});
diff --git a/src/server/api/endpoints/hashtags/list.ts b/src/server/api/endpoints/hashtags/list.ts
index 89cc926422..9023f11913 100644
--- a/src/server/api/endpoints/hashtags/list.ts
+++ b/src/server/api/endpoints/hashtags/list.ts
@@ -92,5 +92,5 @@ export default define(meta, async (ps, me) => {
 
 	const tags = await query.take(ps.limit!).getMany();
 
-	return tags;
+	return Hashtags.packMany(tags);
 });
diff --git a/src/server/api/endpoints/hashtags/show.ts b/src/server/api/endpoints/hashtags/show.ts
new file mode 100644
index 0000000000..72a4cc7c87
--- /dev/null
+++ b/src/server/api/endpoints/hashtags/show.ts
@@ -0,0 +1,48 @@
+import $ from 'cafy';
+import define from '../../define';
+import { ApiError } from '../../error';
+import { Hashtags } from '../../../../models';
+import { types, bool } from '../../../../misc/schema';
+
+export const meta = {
+	desc: {
+		'ja-JP': '指定したハッシュタグの情報を取得します。',
+	},
+
+	tags: ['hashtags'],
+
+	requireCredential: false,
+
+	params: {
+		tag: {
+			validator: $.str,
+			desc: {
+				'ja-JP': '対象のハッシュタグ(#なし)',
+				'en-US': 'Target hashtag. (no # prefixed)'
+			}
+		}
+	},
+
+	res: {
+		type: types.object,
+		optional: bool.false, nullable: bool.false,
+		ref: 'Hashtag',
+	},
+
+	errors: {
+		noSuchHashtag: {
+			message: 'No such hashtag.',
+			code: 'NO_SUCH_HASHTAG',
+			id: '110ee688-193e-4a3a-9ecf-c167b2e6981e'
+		}
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	const hashtag = await Hashtags.findOne({ name: ps.tag.toLowerCase() });
+	if (hashtag == null) {
+		throw new ApiError(meta.errors.noSuchHashtag);
+	}
+
+	return await Hashtags.pack(hashtag);
+});
diff --git a/src/server/api/endpoints/hashtags/trend.ts b/src/server/api/endpoints/hashtags/trend.ts
index 84b750f2c1..05d571851e 100644
--- a/src/server/api/endpoints/hashtags/trend.ts
+++ b/src/server/api/endpoints/hashtags/trend.ts
@@ -2,6 +2,7 @@ import define from '../../define';
 import { fetchMeta } from '../../../../misc/fetch-meta';
 import { Notes } from '../../../../models';
 import { Note } from '../../../../models/entities/note';
+import { types, bool } from '../../../../misc/schema';
 
 /*
 トレンドに載るためには「『直近a分間のユニーク投稿数が今からa分前～今からb分前の間のユニーク投稿数のn倍以上』のハッシュタグの上位5位以内に入る」ことが必要
@@ -21,6 +22,33 @@ export const meta = {
 	tags: ['hashtags'],
 
 	requireCredential: false,
+
+	res: {
+		type: types.array,
+		optional: bool.false, nullable: bool.false,
+		items: {
+			type: types.object,
+			optional: bool.false, nullable: bool.false,
+			properties: {
+				tag: {
+					type: types.string,
+					optional: bool.false, nullable: bool.false,
+				},
+				chart: {
+					type: types.array,
+					optional: bool.false, nullable: bool.false,
+					items: {
+						type: types.number,
+						optional: bool.false, nullable: bool.false,
+					}
+				},
+				usersCount: {
+					type: types.number,
+					optional: bool.false, nullable: bool.false,
+				}
+			}
+		}
+	}
 };
 
 export default define(meta, async () => {
diff --git a/src/server/api/endpoints/i/pages.ts b/src/server/api/endpoints/i/pages.ts
new file mode 100644
index 0000000000..5eb4db81b7
--- /dev/null
+++ b/src/server/api/endpoints/i/pages.ts
@@ -0,0 +1,44 @@
+import $ from 'cafy';
+import { ID } from '../../../../misc/cafy-id';
+import define from '../../define';
+import { Pages } from '../../../../models';
+import { makePaginationQuery } from '../../common/make-pagination-query';
+
+export const meta = {
+	desc: {
+		'ja-JP': '自分の作成したページ一覧を取得します。',
+		'en-US': 'Get my pages.'
+	},
+
+	tags: ['account', 'pages'],
+
+	requireCredential: true,
+
+	kind: 'read:pages',
+
+	params: {
+		limit: {
+			validator: $.optional.num.range(1, 100),
+			default: 10
+		},
+
+		sinceId: {
+			validator: $.optional.type(ID),
+		},
+
+		untilId: {
+			validator: $.optional.type(ID),
+		},
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	const query = makePaginationQuery(Pages.createQueryBuilder('page'), ps.sinceId, ps.untilId)
+		.andWhere(`page.userId = :meId`, { meId: user.id });
+
+	const pages = await query
+		.take(ps.limit!)
+		.getMany();
+
+	return await Pages.packMany(pages);
+});
diff --git a/src/server/api/endpoints/notes/global-timeline.ts b/src/server/api/endpoints/notes/global-timeline.ts
index 3631208da7..f46fa208df 100644
--- a/src/server/api/endpoints/notes/global-timeline.ts
+++ b/src/server/api/endpoints/notes/global-timeline.ts
@@ -89,9 +89,11 @@ export default define(meta, async (ps, user) => {
 
 	const timeline = await query.take(ps.limit!).getMany();
 
-	if (user) {
-		activeUsersChart.update(user);
-	}
+	process.nextTick(() => {
+		if (user) {
+			activeUsersChart.update(user);
+		}
+	});
 
 	return await Notes.packMany(timeline, user);
 });
diff --git a/src/server/api/endpoints/notes/hybrid-timeline.ts b/src/server/api/endpoints/notes/hybrid-timeline.ts
index c05c8dedd6..7be13fc47f 100644
--- a/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -192,9 +192,11 @@ export default define(meta, async (ps, user) => {
 
 	const timeline = await query.take(ps.limit!).getMany();
 
-	if (user) {
-		activeUsersChart.update(user);
-	}
+	process.nextTick(() => {
+		if (user) {
+			activeUsersChart.update(user);
+		}
+	});
 
 	return await Notes.packMany(timeline, user);
 });
diff --git a/src/server/api/endpoints/notes/local-timeline.ts b/src/server/api/endpoints/notes/local-timeline.ts
index ca84fc6ef9..73cbebace2 100644
--- a/src/server/api/endpoints/notes/local-timeline.ts
+++ b/src/server/api/endpoints/notes/local-timeline.ts
@@ -125,9 +125,11 @@ export default define(meta, async (ps, user) => {
 
 	const timeline = await query.take(ps.limit!).getMany();
 
-	if (user) {
-		activeUsersChart.update(user);
-	}
+	process.nextTick(() => {
+		if (user) {
+			activeUsersChart.update(user);
+		}
+	});
 
 	return await Notes.packMany(timeline, user);
 });
diff --git a/src/server/api/endpoints/notes/timeline.ts b/src/server/api/endpoints/notes/timeline.ts
index 5e692db389..f9442f8b90 100644
--- a/src/server/api/endpoints/notes/timeline.ts
+++ b/src/server/api/endpoints/notes/timeline.ts
@@ -177,7 +177,11 @@ export default define(meta, async (ps, user) => {
 
 	const timeline = await query.take(ps.limit!).getMany();
 
-	activeUsersChart.update(user);
+	process.nextTick(() => {
+		if (user) {
+			activeUsersChart.update(user);
+		}
+	});
 
 	return await Notes.packMany(timeline, user);
 });
diff --git a/src/server/api/endpoints/pages/create.ts b/src/server/api/endpoints/pages/create.ts
new file mode 100644
index 0000000000..e6b813648b
--- /dev/null
+++ b/src/server/api/endpoints/pages/create.ts
@@ -0,0 +1,108 @@
+import $ from 'cafy';
+import * as ms from 'ms';
+import define from '../../define';
+import { ID } from '../../../../misc/cafy-id';
+import { types, bool } from '../../../../misc/schema';
+import { Pages, DriveFiles } from '../../../../models';
+import { genId } from '../../../../misc/gen-id';
+import { Page } from '../../../../models/entities/page';
+import { ApiError } from '../../error';
+
+export const meta = {
+	desc: {
+		'ja-JP': 'ページを作成します。',
+	},
+
+	tags: ['pages'],
+
+	requireCredential: true,
+
+	kind: 'write:pages',
+
+	limit: {
+		duration: ms('1hour'),
+		max: 300
+	},
+
+	params: {
+		title: {
+			validator: $.str,
+		},
+
+		name: {
+			validator: $.str,
+		},
+
+		summary: {
+			validator: $.optional.nullable.str,
+		},
+
+		content: {
+			validator: $.arr($.obj())
+		},
+
+		variables: {
+			validator: $.arr($.obj())
+		},
+
+		eyeCatchingImageId: {
+			validator: $.optional.nullable.type(ID),
+		},
+
+		font: {
+			validator: $.optional.str.or(['serif', 'sans-serif']),
+			default: 'sans-serif'
+		},
+
+		alignCenter: {
+			validator: $.optional.bool,
+			default: false
+		},
+	},
+
+	res: {
+		type: types.object,
+		optional: bool.false, nullable: bool.false,
+		ref: 'Page',
+	},
+
+	errors: {
+		noSuchFile: {
+			message: 'No such file.',
+			code: 'NO_SUCH_FILE',
+			id: 'b7b97489-0f66-4b12-a5ff-b21bd63f6e1c'
+		},
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	let eyeCatchingImage = null;
+	if (ps.eyeCatchingImageId != null) {
+		eyeCatchingImage = await DriveFiles.findOne({
+			id: ps.eyeCatchingImageId,
+			userId: user.id
+		});
+
+		if (eyeCatchingImage == null) {
+			throw new ApiError(meta.errors.noSuchFile);
+		}
+	}
+
+	const page = await Pages.save(new Page({
+		id: genId(),
+		createdAt: new Date(),
+		updatedAt: new Date(),
+		title: ps.title,
+		name: ps.name,
+		summary: ps.summary,
+		content: ps.content,
+		variables: ps.variables,
+		eyeCatchingImageId: eyeCatchingImage ? eyeCatchingImage.id : null,
+		userId: user.id,
+		visibility: 'public',
+		alignCenter: ps.alignCenter,
+		font: ps.font
+	}));
+
+	return await Pages.pack(page);
+});
diff --git a/src/server/api/endpoints/pages/delete.ts b/src/server/api/endpoints/pages/delete.ts
new file mode 100644
index 0000000000..043805aa33
--- /dev/null
+++ b/src/server/api/endpoints/pages/delete.ts
@@ -0,0 +1,53 @@
+import $ from 'cafy';
+import define from '../../define';
+import { ApiError } from '../../error';
+import { Pages } from '../../../../models';
+import { ID } from '../../../../misc/cafy-id';
+
+export const meta = {
+	desc: {
+		'ja-JP': '指定したページを削除します。',
+	},
+
+	tags: ['pages'],
+
+	requireCredential: true,
+
+	kind: 'write:pages',
+
+	params: {
+		pageId: {
+			validator: $.type(ID),
+			desc: {
+				'ja-JP': '対象のページのID',
+				'en-US': 'Target page ID.'
+			}
+		},
+	},
+
+	errors: {
+		noSuchPage: {
+			message: 'No such page.',
+			code: 'NO_SUCH_PAGE',
+			id: 'eb0c6e1d-d519-4764-9486-52a7e1c6392a'
+		},
+
+		accessDenied: {
+			message: 'Access denied.',
+			code: 'ACCESS_DENIED',
+			id: '8b741b3e-2c22-44b3-a15f-29949aa1601e'
+		},
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	const page = await Pages.findOne(ps.pageId);
+	if (page == null) {
+		throw new ApiError(meta.errors.noSuchPage);
+	}
+	if (page.userId !== user.id) {
+		throw new ApiError(meta.errors.accessDenied);
+	}
+
+	await Pages.delete(page.id);
+});
diff --git a/src/server/api/endpoints/pages/show.ts b/src/server/api/endpoints/pages/show.ts
new file mode 100644
index 0000000000..dd1dc9f255
--- /dev/null
+++ b/src/server/api/endpoints/pages/show.ts
@@ -0,0 +1,74 @@
+import $ from 'cafy';
+import define from '../../define';
+import { ApiError } from '../../error';
+import { Pages, Users } from '../../../../models';
+import { types, bool } from '../../../../misc/schema';
+import { ID } from '../../../../misc/cafy-id';
+import { Page } from '../../../../models/entities/page';
+
+export const meta = {
+	desc: {
+		'ja-JP': '指定したページの情報を取得します。',
+	},
+
+	tags: ['pages'],
+
+	requireCredential: false,
+
+	params: {
+		pageId: {
+			validator: $.optional.type(ID),
+			desc: {
+				'ja-JP': '対象のページのID',
+				'en-US': 'Target page ID.'
+			}
+		},
+
+		name: {
+			validator: $.optional.str,
+		},
+
+		username: {
+			validator: $.optional.str,
+		},
+	},
+
+	res: {
+		type: types.object,
+		optional: bool.false, nullable: bool.false,
+		ref: 'Page',
+	},
+
+	errors: {
+		noSuchPage: {
+			message: 'No such page.',
+			code: 'NO_SUCH_PAGE',
+			id: '222120c0-3ead-4528-811b-b96f233388d7'
+		}
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	let page: Page | undefined;
+
+	if (ps.pageId) {
+		page = await Pages.findOne(ps.pageId);
+	} else if (ps.name && ps.username) {
+		const author = await Users.findOne({
+			host: null,
+			usernameLower: ps.username.toLowerCase()
+		});
+		if (author) {
+			page = await Pages.findOne({
+				name: ps.name,
+				userId: author.id
+			});
+		}
+	}
+
+	if (page == null) {
+		throw new ApiError(meta.errors.noSuchPage);
+	}
+
+	return await Pages.pack(page);
+});
diff --git a/src/server/api/endpoints/pages/update.ts b/src/server/api/endpoints/pages/update.ts
new file mode 100644
index 0000000000..8ee34fc3ba
--- /dev/null
+++ b/src/server/api/endpoints/pages/update.ts
@@ -0,0 +1,123 @@
+import $ from 'cafy';
+import * as ms from 'ms';
+import define from '../../define';
+import { ApiError } from '../../error';
+import { Pages, DriveFiles } from '../../../../models';
+import { ID } from '../../../../misc/cafy-id';
+
+export const meta = {
+	desc: {
+		'ja-JP': '指定したページの情報を更新します。',
+	},
+
+	tags: ['pages'],
+
+	requireCredential: true,
+
+	kind: 'write:pages',
+
+	limit: {
+		duration: ms('1hour'),
+		max: 300
+	},
+
+	params: {
+		pageId: {
+			validator: $.type(ID),
+			desc: {
+				'ja-JP': '対象のページのID',
+				'en-US': 'Target page ID.'
+			}
+		},
+
+		title: {
+			validator: $.str,
+		},
+
+		name: {
+			validator: $.optional.str,
+		},
+
+		summary: {
+			validator: $.optional.nullable.str,
+		},
+
+		content: {
+			validator: $.arr($.obj())
+		},
+
+		variables: {
+			validator: $.arr($.obj())
+		},
+
+		eyeCatchingImageId: {
+			validator: $.optional.nullable.type(ID),
+		},
+
+		font: {
+			validator: $.optional.str.or(['serif', 'sans-serif']),
+		},
+
+		alignCenter: {
+			validator: $.optional.bool,
+		},
+	},
+
+	errors: {
+		noSuchPage: {
+			message: 'No such page.',
+			code: 'NO_SUCH_PAGE',
+			id: '21149b9e-3616-4778-9592-c4ce89f5a864'
+		},
+
+		accessDenied: {
+			message: 'Access denied.',
+			code: 'ACCESS_DENIED',
+			id: '3c15cd52-3b4b-4274-967d-6456fc4f792b'
+		},
+
+		noSuchFile: {
+			message: 'No such file.',
+			code: 'NO_SUCH_FILE',
+			id: 'cfc23c7c-3887-490e-af30-0ed576703c82'
+		},
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	const page = await Pages.findOne(ps.pageId);
+	if (page == null) {
+		throw new ApiError(meta.errors.noSuchPage);
+	}
+	if (page.userId !== user.id) {
+		throw new ApiError(meta.errors.accessDenied);
+	}
+
+	let eyeCatchingImage = null;
+	if (ps.eyeCatchingImageId != null) {
+		eyeCatchingImage = await DriveFiles.findOne({
+			id: ps.eyeCatchingImageId,
+			userId: user.id
+		});
+
+		if (eyeCatchingImage == null) {
+			throw new ApiError(meta.errors.noSuchFile);
+		}
+	}
+
+	await Pages.update(page.id, {
+		updatedAt: new Date(),
+		title: ps.title,
+		name: ps.name === undefined ? page.name : ps.name,
+		summary: ps.name === undefined ? page.summary : ps.summary,
+		content: ps.content,
+		variables: ps.variables,
+		alignCenter: ps.alignCenter === undefined ? page.alignCenter : ps.alignCenter,
+		font: ps.font === undefined ? page.font : ps.font,
+		eyeCatchingImageId: ps.eyeCatchingImageId === null
+			? null
+			: ps.eyeCatchingImageId === undefined
+				? page.eyeCatchingImageId
+				: eyeCatchingImage!.id,
+	});
+});
diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts
index 67b646a35f..38b420c332 100644
--- a/src/server/api/endpoints/users/recommendation.ts
+++ b/src/server/api/endpoints/users/recommendation.ts
@@ -42,8 +42,9 @@ export const meta = {
 export default define(meta, async (ps, me) => {
 	const query = Users.createQueryBuilder('user')
 		.where('user.isLocked = FALSE')
-		.where('user.host IS NULL')
-		.where('user.updatedAt >= :date', { date: new Date(Date.now() - ms('7days')) })
+		.andWhere('user.host IS NULL')
+		.andWhere('user.updatedAt >= :date', { date: new Date(Date.now() - ms('7days')) })
+		.andWhere('user.id != :meId', { meId: me.id })
 		.orderBy('user.followersCount', 'DESC');
 
 	generateMuteQueryForUsers(query, me);
diff --git a/src/server/api/openapi/schemas.ts b/src/server/api/openapi/schemas.ts
index e54f989e74..34e6f8947d 100644
--- a/src/server/api/openapi/schemas.ts
+++ b/src/server/api/openapi/schemas.ts
@@ -11,6 +11,7 @@ import { packedFollowingSchema } from '../../../models/repositories/following';
 import { packedMutingSchema } from '../../../models/repositories/muting';
 import { packedBlockingSchema } from '../../../models/repositories/blocking';
 import { packedNoteReactionSchema } from '../../../models/repositories/note-reaction';
+import { packedHashtagSchema } from '../../../models/repositories/hashtag';
 
 export function convertSchemaToOpenApiSchema(schema: Schema) {
 	const res: any = schema;
@@ -74,48 +75,5 @@ export const schemas = {
 	Muting: convertSchemaToOpenApiSchema(packedMutingSchema),
 	Blocking: convertSchemaToOpenApiSchema(packedBlockingSchema),
 	NoteReaction: convertSchemaToOpenApiSchema(packedNoteReactionSchema),
-
-	Hashtag: {
-		type: 'object',
-		properties: {
-			tag: {
-				type: 'string',
-				description: 'The hashtag name. No # prefixed.',
-				example: 'misskey',
-			},
-			mentionedUsersCount: {
-				type: 'number',
-				description: 'Number of all users using this hashtag.'
-			},
-			mentionedLocalUsersCount: {
-				type: 'number',
-				description: 'Number of local users using this hashtag.'
-			},
-			mentionedRemoteUsersCount: {
-				type: 'number',
-				description: 'Number of remote users using this hashtag.'
-			},
-			attachedUsersCount: {
-				type: 'number',
-				description: 'Number of all users who attached this hashtag to profile.'
-			},
-			attachedLocalUsersCount: {
-				type: 'number',
-				description: 'Number of local users who attached this hashtag to profile.'
-			},
-			attachedRemoteUsersCount: {
-				type: 'number',
-				description: 'Number of remote users who attached this hashtag to profile.'
-			},
-		},
-		required: [
-			'tag',
-			'mentionedUsersCount',
-			'mentionedLocalUsersCount',
-			'mentionedRemoteUsersCount',
-			'attachedUsersCount',
-			'attachedLocalUsersCount',
-			'attachedRemoteUsersCount',
-		]
-	},
+	Hashtag: convertSchemaToOpenApiSchema(packedHashtagSchema),
 };