summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-08-19 22:32:58 +0900
committerGitHub <noreply@github.com>2018-08-19 22:32:58 +0900
commit208dec25d937397d1933ebf95485b1261ae1e583 (patch)
treea7cdeed42e56cc620cc8d748ef3a3bd2b0349737 /src/server/api
parentMerge pull request #2348 from mei23/mei-0819-nsfw3 (diff)
parentwip (diff)
downloadmisskey-208dec25d937397d1933ebf95485b1261ae1e583.tar.gz
misskey-208dec25d937397d1933ebf95485b1261ae1e583.tar.bz2
misskey-208dec25d937397d1933ebf95485b1261ae1e583.zip
Merge pull request #2349 from syuilo/configress-build
設定ファイルなしでビルドできるように
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/endpoints/meta.ts7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index 000a56024d..2b39f26b8e 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -20,6 +20,9 @@ export default () => new Promise(async (res, rej) => {
version: pkg.version,
clientVersion: client.version,
+ name: config.name || 'Misskey',
+ description: config.description,
+
secure: config.https != null,
machine: os.hostname(),
os: os.platform(),
@@ -29,6 +32,8 @@ export default () => new Promise(async (res, rej) => {
cores: os.cpus().length
},
broadcasts: meta.broadcasts,
- disableRegistration: meta.disableRegistration
+ disableRegistration: meta.disableRegistration,
+ recaptchaSitekey: config.recaptcha ? config.recaptcha.site_key : null,
+ swPublickey: config.sw ? config.sw.public_key : null
});
});