oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

ドメインは常にPunycodeで保存するように

Browse source
This commit is contained in:
syuilo 2019-04-09 23:59:32 +09:00
parent 4d64fd665e
commit 33a9783ae5
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
11 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/config/load.ts
View file

@ -7,6 +7,7 @@ import { URL } from 'url';
import * as yaml from 'js-yaml';
import { Source, Mixin } from './types';
import * as pkg from '../../package.json';
import { toPuny } from '../misc/convert-host';
/**
* Path of configuration directory
@ -27,12 +28,12 @@ export default function load() {
const url = validateUrl(config.url);
config.url = normalizeUrl(config.url);
config.url = toPuny(normalizeUrl(config.url));
config.port = config.port || parseInt(process.env.PORT, 10);
mixin.host = url.host;
mixin.hostname = url.hostname;
mixin.host = toPuny(url.host);
mixin.hostname = toPuny(url.hostname);
mixin.scheme = url.protocol.replace(/:$/, '');
mixin.wsScheme = mixin.scheme.replace('http', 'ws');
mixin.wsUrl = `${mixin.wsScheme}://${mixin.host}`;