This commit is contained in:
syuilo
2019-02-07 21:02:33 +09:00
parent 27768081e2
commit 5448c22031
19 changed files with 125 additions and 194 deletions

View File

@ -46,7 +46,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
description: instance.description,
langs: instance.langs,
secure: config.https.isJust(),
secure: config.https != null,
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.isJust(),
elasticsearch: config.elasticsearch ? true : false,
recaptcha: instance.enableRecaptcha,
objectStorage: config.drive.storage === 'minio',
objectStorage: config.drive && config.drive.storage === 'minio',
twitter: instance.enableTwitterIntegration,
github: instance.enableGithubIntegration,
discord: instance.enableDiscordIntegration,

View File

@ -50,7 +50,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
request({
url: url,
proxy: config.proxy.getOrElse(null),
proxy: config.proxy,
timeout: timeout,
json: true,
followRedirect: true,

View File

@ -23,10 +23,10 @@ module.exports = (server: http.Server) => {
let ev: EventEmitter;
if (config.redis.isJust()) {
if (config.redis) {
// Connect to Redis
const subscriber = redis.createClient(
config.redis.get().port, config.redis.get().host);
config.redis.port, config.redis.host);
subscriber.subscribe('misskey');