diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-02-22 02:27:19 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-02-22 02:27:19 +0900 |
| commit | 8b341d5fc7f78df3e08a3340ea93c25324dbb552 (patch) | |
| tree | 4f181b878e84f885a885ef38dec833a0d435f878 /src/config.ts | |
| parent | Merge pull request #193 from syuilo/no-tag-ls (diff) | |
| download | sharkey-8b341d5fc7f78df3e08a3340ea93c25324dbb552.tar.gz sharkey-8b341d5fc7f78df3e08a3340ea93c25324dbb552.tar.bz2 sharkey-8b341d5fc7f78df3e08a3340ea93c25324dbb552.zip | |
wip
Diffstat (limited to 'src/config.ts')
| -rw-r--r-- | src/config.ts | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/config.ts b/src/config.ts index 64a6b7c9bf..d2916c39c4 100644 --- a/src/config.ts +++ b/src/config.ts @@ -14,11 +14,9 @@ const dir = `${__dirname}/../.config`; /** * Path of configuration file */ -export const path = (global as any).MISSKEY_CONFIG_PATH - ? (global as any).MISSKEY_CONFIG_PATH - : process.env.NODE_ENV == 'test' - ? `${dir}/test.yml` - : `${dir}/default.yml`; +export const path = process.env.NODE_ENV == 'test' + ? `${dir}/test.yml` + : `${dir}/default.yml`; /** * ユーザーが設定する必要のある情報 @@ -71,8 +69,6 @@ interface Source { * Misskeyが自動的に(ユーザーが設定した情報から推論して)設定する情報 */ interface Mixin { - themeColor: string; - themeColorForeground: string; host: string; scheme: string; secondary_host: string; @@ -98,8 +94,6 @@ export default function load() { config.url = normalizeUrl(config.url); config.secondary_url = normalizeUrl(config.secondary_url); - mixin.themeColor = '#f76d6c'; - mixin.themeColorForeground = '#fff'; mixin.host = config.url.substr(config.url.indexOf('://') + 3); mixin.scheme = config.url.substr(0, config.url.indexOf('://')); mixin.secondary_host = config.secondary_url.substr(config.secondary_url.indexOf('://') + 3); |