sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

実行時にpackage.jsonを参照しないように (#5418)

Browse Source 
* 実行時にpackage.jsonを参照しないように

* nodeinfo

* move meta.json

* add dummy

* lowercase
This commit is contained in:
MeiMei
2019-11-01 22:34:26 +09:00
committed by syuilo
parent 5b0dfa6130
commit 92af4401e2
10 changed files with 43 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/config/load.ts
View File

@ -5,7 +5,7 @@
import * as fs from 'fs';
import * as yaml from 'js-yaml';
import { Source, Mixin } from './types';
import * as pkg from '../../package.json';
import * as meta from '../meta.json';
/**
* Path of configuration directory
@ -30,6 +30,7 @@ export default function load() {
config.port = config.port || parseInt(process.env.PORT || '', 10);
mixin.version = meta.version;
mixin.host = url.host;
mixin.hostname = url.hostname;
mixin.scheme = url.protocol.replace(/:$/, '');
@ -38,7 +39,7 @@ export default function load() {
mixin.apiUrl = `${mixin.scheme}://${mixin.host}/api`;
mixin.authUrl = `${mixin.scheme}://${mixin.host}/auth`;
mixin.driveUrl = `${mixin.scheme}://${mixin.host}/files`;
mixin.userAgent = `Misskey/${pkg.version} (${config.url})`;
mixin.userAgent = `Misskey/${meta.version} (${config.url})`;
if (config.autoAdmin == null) config.autoAdmin = false;

1
src/config/types.ts
View File

@ -58,6 +58,7 @@ export type Source = {
* Misskeyが自動的に(ユーザーが設定した情報から推論して)設定する情報
*/
export type Mixin = {
version: string;
host: string;
hostname: string;
scheme: string;