Prepare new codename

This commit is contained in:
syuilo 2018-03-28 09:27:57 +09:00
parent 10d828c94f
commit 16f2adf48c
8 changed files with 18 additions and 15 deletions

View file

@ -2,6 +2,7 @@
"name": "misskey", "name": "misskey",
"author": "syuilo <i@syuilo.com>", "author": "syuilo <i@syuilo.com>",
"version": "0.0.4224", "version": "0.0.4224",
"codename": "nighthike",
"license": "MIT", "license": "MIT",
"description": "A miniblog-based SNS", "description": "A miniblog-based SNS",
"bugs": "https://github.com/syuilo/misskey/issues", "bugs": "https://github.com/syuilo/misskey/issues",

View file

@ -89,7 +89,6 @@ function workerMain() {
*/ */
async function init(): Promise<Config> { async function init(): Promise<Config> {
Logger.info('Welcome to Misskey!'); Logger.info('Welcome to Misskey!');
Logger.info(chalk.bold('Misskey <aoi>'));
Logger.info('Initializing...'); Logger.info('Initializing...');
EnvironmentInfo.show(); EnvironmentInfo.show();

View file

@ -1,16 +1,17 @@
<template> <template>
<p>ver {{ v }} ( aoi)</p> <p>ver {{ version }} ({{ codename }})</p>
</template> </template>
<script lang="ts"> <script lang="ts">
import { version } from '../../../config'; import { version, codename } from '../../../config';
import define from '../../../common/define-widget'; import define from '../../../common/define-widget';
export default define({ export default define({
name: 'version' name: 'version'
}).extend({ }).extend({
data() { data() {
return { return {
v: version version,
codename
}; };
} }
}); });

View file

@ -7,13 +7,13 @@ declare const _DOCS_URL_: string;
declare const _STATS_URL_: string; declare const _STATS_URL_: string;
declare const _STATUS_URL_: string; declare const _STATUS_URL_: string;
declare const _DEV_URL_: string; declare const _DEV_URL_: string;
declare const _CH_URL_: string;
declare const _LANG_: string; declare const _LANG_: string;
declare const _RECAPTCHA_SITEKEY_: string; declare const _RECAPTCHA_SITEKEY_: string;
declare const _SW_PUBLICKEY_: string; declare const _SW_PUBLICKEY_: string;
declare const _THEME_COLOR_: string; declare const _THEME_COLOR_: string;
declare const _COPYRIGHT_: string; declare const _COPYRIGHT_: string;
declare const _VERSION_: string; declare const _VERSION_: string;
declare const _CODENAME_: string;
declare const _LICENSE_: string; declare const _LICENSE_: string;
declare const _GOOGLE_MAPS_API_KEY_: string; declare const _GOOGLE_MAPS_API_KEY_: string;
@ -26,12 +26,12 @@ export const docsUrl = _DOCS_URL_;
export const statsUrl = _STATS_URL_; export const statsUrl = _STATS_URL_;
export const statusUrl = _STATUS_URL_; export const statusUrl = _STATUS_URL_;
export const devUrl = _DEV_URL_; export const devUrl = _DEV_URL_;
export const chUrl = _CH_URL_;
export const lang = _LANG_; export const lang = _LANG_;
export const recaptchaSitekey = _RECAPTCHA_SITEKEY_; export const recaptchaSitekey = _RECAPTCHA_SITEKEY_;
export const swPublickey = _SW_PUBLICKEY_; export const swPublickey = _SW_PUBLICKEY_;
export const themeColor = _THEME_COLOR_; export const themeColor = _THEME_COLOR_;
export const copyright = _COPYRIGHT_; export const copyright = _COPYRIGHT_;
export const version = _VERSION_; export const version = _VERSION_;
export const codename = _CODENAME_;
export const license = _LICENSE_; export const license = _LICENSE_;
export const googleMapsApiKey = _GOOGLE_MAPS_API_KEY_; export const googleMapsApiKey = _GOOGLE_MAPS_API_KEY_;

View file

@ -14,7 +14,7 @@ import ElementLocaleJa from 'element-ui/lib/locale/lang/ja';
import App from './app.vue'; import App from './app.vue';
import checkForUpdate from './common/scripts/check-for-update'; import checkForUpdate from './common/scripts/check-for-update';
import MiOS, { API } from './common/mios'; import MiOS, { API } from './common/mios';
import { version, hostname, lang } from './config'; import { version, codename, hostname, lang } from './config';
let elementLocale; let elementLocale;
switch (lang) { switch (lang) {
@ -51,7 +51,7 @@ Vue.mixin({
* APP ENTRY POINT! * APP ENTRY POINT!
*/ */
console.info(`Misskey v${version} (葵 aoi)`); console.info(`Misskey v${version} (${codename})`);
console.info( console.info(
'%cここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。', '%cここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。',
'color: red; background: yellow; font-size: 16px; font-weight: bold;'); 'color: red; background: yellow; font-size: 16px; font-weight: bold;');

View file

@ -12,19 +12,20 @@
<ul> <ul>
<li><a @click="signout">%fa:power-off%%i18n:mobile.tags.mk-settings-page.signout%</a></li> <li><a @click="signout">%fa:power-off%%i18n:mobile.tags.mk-settings-page.signout%</a></li>
</ul> </ul>
<p><small>ver {{ v }} ( aoi)</small></p> <p><small>ver {{ version }} ({{ codename }})</small></p>
</div> </div>
</mk-ui> </mk-ui>
</template> </template>
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import { version } from '../../../config'; import { version, codename } from '../../../config';
export default Vue.extend({ export default Vue.extend({
data() { data() {
return { return {
v: version version,
codename
}; };
}, },
mounted() { mounted() {

View file

@ -23,7 +23,7 @@ const defaultSwagger = {
"swagger": "2.0", "swagger": "2.0",
"info": { "info": {
"title": "Misskey API", "title": "Misskey API",
"version": "aoi" "version": "nighthike"
}, },
"host": "api.misskey.xyz", "host": "api.misskey.xyz",
"schemes": [ "schemes": [
@ -218,8 +218,8 @@ options.apis = files.map(c => {return `${apiRoot}/${c}`;});
if(fs.existsSync('.config/config.yml')){ if(fs.existsSync('.config/config.yml')){
var config = yaml.safeLoad(fs.readFileSync('./.config/config.yml', 'utf8')); var config = yaml.safeLoad(fs.readFileSync('./.config/config.yml', 'utf8'));
options.swaggerDefinition.host = `api.${config.url.match(/\:\/\/(.+)$/)[1]}`; options.swaggerDefinition.host = `api.${config.url.match(/\:\/\/(.+)$/)[1]}`;
options.swaggerDefinition.schemes = config.https.enable ? options.swaggerDefinition.schemes = config.https.enable ?
['https'] : ['https'] :
['http']; ['http'];
} }

View file

@ -20,6 +20,7 @@ import { licenseHtml } from './src/common/build/license';
import locales from './locales'; import locales from './locales';
const meta = require('./package.json'); const meta = require('./package.json');
const version = meta.version; const version = meta.version;
const codename = meta.codename;
//#region Replacer definitions //#region Replacer definitions
global['faReplacement'] = faReplacement; global['faReplacement'] = faReplacement;
@ -76,13 +77,13 @@ module.exports = entries.map(x => {
_THEME_COLOR_: constants.themeColor, _THEME_COLOR_: constants.themeColor,
_COPYRIGHT_: constants.copyright, _COPYRIGHT_: constants.copyright,
_VERSION_: version, _VERSION_: version,
_CODENAME_: codename,
_STATUS_URL_: config.status_url, _STATUS_URL_: config.status_url,
_STATS_URL_: config.stats_url, _STATS_URL_: config.stats_url,
_DOCS_URL_: config.docs_url, _DOCS_URL_: config.docs_url,
_API_URL_: config.api_url, _API_URL_: config.api_url,
_WS_URL_: config.ws_url, _WS_URL_: config.ws_url,
_DEV_URL_: config.dev_url, _DEV_URL_: config.dev_url,
_CH_URL_: config.ch_url,
_LANG_: lang, _LANG_: lang,
_HOST_: config.host, _HOST_: config.host,
_HOSTNAME_: config.hostname, _HOSTNAME_: config.hostname,