diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-02-06 22:49:42 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-02-06 22:49:42 +0900 |
| commit | cf304f88d46873d5e3aa3f62424b187d5478a0bf (patch) | |
| tree | 8f5742f58def0b64bd5ef0f57bb4e030f0ca2934 /src/server/api/endpoints | |
| parent | Fix cofig for ci (diff) | |
| parent | Check config on load (#4170) (diff) | |
| download | misskey-cf304f88d46873d5e3aa3f62424b187d5478a0bf.tar.gz misskey-cf304f88d46873d5e3aa3f62424b187d5478a0bf.tar.bz2 misskey-cf304f88d46873d5e3aa3f62424b187d5478a0bf.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/server/api/endpoints')
| -rw-r--r-- | src/server/api/endpoints/meta.ts | 6 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/recommendation.ts | 2 |
2 files changed, 4 insertions, 4 deletions
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, |