サーバーのバージョンとクライアントのバージョンを分けた

This commit is contained in:
syuilo 2018-04-22 21:32:09 +09:00
parent 8682fd21c4
commit 0b99483ccb
8 changed files with 16 additions and 22 deletions

View file

@ -105,8 +105,8 @@
const meta = await res.json();
// Compare versions
if (meta.version != ver) {
localStorage.setItem('v', meta.version);
if (meta.clientVersion != ver) {
localStorage.setItem('v', meta.clientVersion);
alert(
'Misskeyの新しいバージョンがあります。ページを再度読み込みします。' +

View file

@ -3,7 +3,7 @@ import { version as current } from '../../config';
export default async function(mios: MiOS, force = false, silent = false) {
const meta = await mios.getMeta(force);
const newer = meta.version;
const newer = meta.clientVersion;
if (newer != current) {
localStorage.setItem('should-refresh', 'true');

View file

@ -2,10 +2,12 @@
* Module dependencies
*/
import * as os from 'os';
import version from '../../../version';
import config from '../../../config';
import Meta from '../../../models/meta';
const pkg = require('../../../../package.json');
const client = require('../../../../built/client/meta.json');
/**
* @swagger
* /meta:
@ -41,7 +43,10 @@ module.exports = (params) => new Promise(async (res, rej) => {
res({
maintainer: config.maintainer,
version: version,
version: pkg.version,
clientVersion: client.version,
secure: config.https != null,
machine: os.hostname(),
os: os.platform(),

View file

@ -1,7 +0,0 @@
/**
* Version
*/
const meta = require('../version.json');
export default meta.version as string;