diff options
| author | syuilo⭐️ <Syuilotan@yahoo.co.jp> | 2017-02-22 04:20:44 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-22 04:20:44 +0900 |
| commit | e7f3325cb67cbad71bc4228add8cd59f4e1dee4e (patch) | |
| tree | d62b2e92a3a1cfae3798cf8e676a2f740dabadb2 /src/config.ts | |
| parent | Clean up (diff) | |
| parent | well done (diff) | |
| download | sharkey-e7f3325cb67cbad71bc4228add8cd59f4e1dee4e.tar.gz sharkey-e7f3325cb67cbad71bc4228add8cd59f4e1dee4e.tar.bz2 sharkey-e7f3325cb67cbad71bc4228add8cd59f4e1dee4e.zip | |
Merge pull request #194 from syuilo/no-build-requires-config
No build requires config
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); |