diff --git a/package.json b/package.json index 4e3da7d0b..3f9e49738 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "misskey", "author": "syuilo <i@syuilo.com>", "version": "0.0.4224", + "codename": "nighthike", "license": "MIT", "description": "A miniblog-based SNS", "bugs": "https://github.com/syuilo/misskey/issues", diff --git a/src/index.ts b/src/index.ts index 218455d6f..a8181acda 100644 --- a/src/index.ts +++ b/src/index.ts @@ -89,7 +89,6 @@ function workerMain() { */ async function init(): Promise<Config> { Logger.info('Welcome to Misskey!'); - Logger.info(chalk.bold('Misskey <aoi>')); Logger.info('Initializing...'); EnvironmentInfo.show(); diff --git a/src/web/app/common/views/widgets/version.vue b/src/web/app/common/views/widgets/version.vue index 5072d9b74..30b632b39 100644 --- a/src/web/app/common/views/widgets/version.vue +++ b/src/web/app/common/views/widgets/version.vue @@ -1,16 +1,17 @@ <template> -<p>ver {{ v }} (葵 aoi)</p> +<p>ver {{ version }} ({{ codename }})</p> </template> <script lang="ts"> -import { version } from '../../../config'; +import { version, codename } from '../../../config'; import define from '../../../common/define-widget'; export default define({ name: 'version' }).extend({ data() { return { - v: version + version, + codename }; } }); diff --git a/src/web/app/config.ts b/src/web/app/config.ts index 8ea6f7010..522d7ff05 100644 --- a/src/web/app/config.ts +++ b/src/web/app/config.ts @@ -7,13 +7,13 @@ declare const _DOCS_URL_: string; declare const _STATS_URL_: string; declare const _STATUS_URL_: string; declare const _DEV_URL_: string; -declare const _CH_URL_: string; declare const _LANG_: string; declare const _RECAPTCHA_SITEKEY_: string; declare const _SW_PUBLICKEY_: string; declare const _THEME_COLOR_: string; declare const _COPYRIGHT_: string; declare const _VERSION_: string; +declare const _CODENAME_: string; declare const _LICENSE_: string; declare const _GOOGLE_MAPS_API_KEY_: string; @@ -26,12 +26,12 @@ export const docsUrl = _DOCS_URL_; export const statsUrl = _STATS_URL_; export const statusUrl = _STATUS_URL_; export const devUrl = _DEV_URL_; -export const chUrl = _CH_URL_; export const lang = _LANG_; export const recaptchaSitekey = _RECAPTCHA_SITEKEY_; export const swPublickey = _SW_PUBLICKEY_; export const themeColor = _THEME_COLOR_; export const copyright = _COPYRIGHT_; export const version = _VERSION_; +export const codename = _CODENAME_; export const license = _LICENSE_; export const googleMapsApiKey = _GOOGLE_MAPS_API_KEY_; diff --git a/src/web/app/init.ts b/src/web/app/init.ts index 521dade86..3e5c38961 100644 --- a/src/web/app/init.ts +++ b/src/web/app/init.ts @@ -14,7 +14,7 @@ import ElementLocaleJa from 'element-ui/lib/locale/lang/ja'; import App from './app.vue'; import checkForUpdate from './common/scripts/check-for-update'; import MiOS, { API } from './common/mios'; -import { version, hostname, lang } from './config'; +import { version, codename, hostname, lang } from './config'; let elementLocale; switch (lang) { @@ -51,7 +51,7 @@ Vue.mixin({ * APP ENTRY POINT! */ -console.info(`Misskey v${version} (葵 aoi)`); +console.info(`Misskey v${version} (${codename})`); console.info( '%cここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。', 'color: red; background: yellow; font-size: 16px; font-weight: bold;'); diff --git a/src/web/app/mobile/views/pages/settings.vue b/src/web/app/mobile/views/pages/settings.vue index 3250999e1..a945a21c5 100644 --- a/src/web/app/mobile/views/pages/settings.vue +++ b/src/web/app/mobile/views/pages/settings.vue @@ -12,19 +12,20 @@ <ul> <li><a @click="signout">%fa:power-off%%i18n:mobile.tags.mk-settings-page.signout%</a></li> </ul> - <p><small>ver {{ v }} (葵 aoi)</small></p> + <p><small>ver {{ version }} ({{ codename }})</small></p> </div> </mk-ui> </template> <script lang="ts"> import Vue from 'vue'; -import { version } from '../../../config'; +import { version, codename } from '../../../config'; export default Vue.extend({ data() { return { - v: version + version, + codename }; }, mounted() { diff --git a/swagger.js b/swagger.js index 0cfd2fff0..f6c2ca7fd 100644 --- a/swagger.js +++ b/swagger.js @@ -23,7 +23,7 @@ const defaultSwagger = { "swagger": "2.0", "info": { "title": "Misskey API", - "version": "aoi" + "version": "nighthike" }, "host": "api.misskey.xyz", "schemes": [ @@ -218,8 +218,8 @@ options.apis = files.map(c => {return `${apiRoot}/${c}`;}); if(fs.existsSync('.config/config.yml')){ var config = yaml.safeLoad(fs.readFileSync('./.config/config.yml', 'utf8')); options.swaggerDefinition.host = `api.${config.url.match(/\:\/\/(.+)$/)[1]}`; - options.swaggerDefinition.schemes = config.https.enable ? - ['https'] : + options.swaggerDefinition.schemes = config.https.enable ? + ['https'] : ['http']; } diff --git a/webpack.config.ts b/webpack.config.ts index 9a952c8ef..88af49eb5 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -20,6 +20,7 @@ import { licenseHtml } from './src/common/build/license'; import locales from './locales'; const meta = require('./package.json'); const version = meta.version; +const codename = meta.codename; //#region Replacer definitions global['faReplacement'] = faReplacement; @@ -76,13 +77,13 @@ module.exports = entries.map(x => { _THEME_COLOR_: constants.themeColor, _COPYRIGHT_: constants.copyright, _VERSION_: version, + _CODENAME_: codename, _STATUS_URL_: config.status_url, _STATS_URL_: config.stats_url, _DOCS_URL_: config.docs_url, _API_URL_: config.api_url, _WS_URL_: config.ws_url, _DEV_URL_: config.dev_url, - _CH_URL_: config.ch_url, _LANG_: lang, _HOST_: config.host, _HOSTNAME_: config.hostname,