メンテナ情報をDBに保存するように

3 files changed, 25 insertions, 3 deletions

diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts
index f541409274..bcfa420ed8 100644
--- a/src/server/api/endpoints/admin/update-meta.ts
+++ b/src/server/api/endpoints/admin/update-meta.ts
@@ -114,7 +114,21 @@ export const meta = {
 		proxyAccount: {
 			validator: $.str.optional.nullable,
 			desc: {
-				'ja-JP': 'Proxy account username'
+				'ja-JP': 'プロキシアカウントのユーザー名'
+			}
+		},
+
+		maintainerName: {
+			validator: $.str.optional,
+			desc: {
+				'ja-JP': 'インスタンスの管理者名'
+			}
+		},
+
+		maintainerEmail: {
+			validator: $.str.optional.nullable,
+			desc: {
+				'ja-JP': 'インスタンス管理者の連絡先メールアドレス'
 			}
 		}
 	}
@@ -183,6 +197,14 @@ export default define(meta, (ps) => new Promise(async (res, rej) => {
 		set.proxyAccount = ps.proxyAccount;
 	}
 
+	if (ps.maintainerName !== undefined) {
+		set['maintainer.name'] = ps.maintainerName;
+	}
+
+	if (ps.maintainerEmail !== undefined) {
+		set['maintainer.email'] = ps.maintainerEmail;
+	}
+
 	await Meta.update({}, {
 		$set: set
 	}, { upsert: true });
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index 03d2d9c6eb..ae07b944c2 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -36,7 +36,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 	});
 
 	const response: any = {
-		maintainer: config.maintainer,
+		maintainer: instance.maintainer,
 
 		version: pkg.version,
 		clientVersion: client.version,
diff --git a/src/server/api/mastodon/index.ts b/src/server/api/mastodon/index.ts
index 98e9c20be1..0e9203aa5a 100644
--- a/src/server/api/mastodon/index.ts
+++ b/src/server/api/mastodon/index.ts
@@ -48,7 +48,7 @@ router.get('/v1/instance', async ctx => { // TODO: This is a temporary implement
 		uri: config.hostname,
 		title: meta.name || 'Misskey',
 		description: meta.description || '',
-		email: config.maintainer.email || config.maintainer.url.startsWith('mailto:') ? config.maintainer.url.slice(7) : '',
+		email: meta.maintainer.email,
 		version: `0.0.0:compatible:misskey:${pkg.version}`, // TODO: How to tell about that this is an api for compatibility?
 		thumbnail: meta.bannerUrl,
 		/*