summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/endpoints/meta.ts6
-rw-r--r--src/server/api/endpoints/users/recommendation.ts2
-rw-r--r--src/server/api/streaming.ts4
3 files changed, 6 insertions, 6 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,
diff --git a/src/server/api/streaming.ts b/src/server/api/streaming.ts
index f8f3c0ff4a..d70cec03dc 100644
--- a/src/server/api/streaming.ts
+++ b/src/server/api/streaming.ts
@@ -23,10 +23,10 @@ module.exports = (server: http.Server) => {
let ev: EventEmitter;
- if (config.redis) {
+ if (config.redis.isJust()) {
// Connect to Redis
const subscriber = redis.createClient(
- config.redis.port, config.redis.host);
+ config.redis.get().port, config.redis.get().host);
subscriber.subscribe('misskey');