From 96bc17aa1014983d5e6bf8b4c05d898156995a0d Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Wed, 6 Feb 2019 22:44:55 +0900 Subject: Check config on load (#4170) Co-authored-by: syuilo --- src/server/api/endpoints/meta.ts | 6 +++--- src/server/api/endpoints/users/recommendation.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/api/endpoints') diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index 91cb095c92..d08d0b0734 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -46,7 +46,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => { description: instance.description, langs: instance.langs, - secure: config.https != null, + secure: config.https.isJust(), machine: os.hostname(), os: os.platform(), node: process.version, @@ -83,9 +83,9 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => { registration: !instance.disableRegistration, localTimeLine: !instance.disableLocalTimeline, globalTimeLine: !instance.disableGlobalTimeline, - elasticsearch: config.elasticsearch ? true : false, + elasticsearch: config.elasticsearch.isJust(), recaptcha: instance.enableRecaptcha, - objectStorage: config.drive && config.drive.storage === 'minio', + objectStorage: config.drive.storage === 'minio', twitter: instance.enableTwitterIntegration, github: instance.enableGithubIntegration, discord: instance.enableDiscordIntegration, diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts index e3a03888b6..d07c4b08f0 100644 --- a/src/server/api/endpoints/users/recommendation.ts +++ b/src/server/api/endpoints/users/recommendation.ts @@ -50,7 +50,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => { request({ url: url, - proxy: config.proxy, + proxy: config.proxy.getOrElse(null), timeout: timeout, json: true, followRedirect: true, -- cgit v1.2.3-freya