Merge pull request #2442 from syuilo/develop

8.5.0

5 files changed, 20 insertions, 16 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8879b747a..ef3b5b4939 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ ChangeLog
 
 This document describes breaking changes only.
 
+8.0.0
+-----
+
+### Migration
+
+起動する前に、`node cli/migration/8.0.0`してください。
+
+Please run `node cli/migration/8.0.0` before launch.
+
+
 7.0.0
 -----
 
diff --git a/package.json b/package.json
index 6ec8682211..9c20b519c9 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.4.0",
-	"clientVersion": "1.0.8831",
+	"version": "8.5.0",
+	"clientVersion": "1.0.8834",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.vue b/src/client/app/desktop/views/pages/admin/admin.chart.vue
index f40f89b2e0..b02f6c31b7 100644
--- a/src/client/app/desktop/views/pages/admin/admin.chart.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.chart.vue
@@ -44,13 +44,9 @@ export default Vue.extend({
 	components: {
 		XChart
 	},
-	props: {
-		chart: {
-			required: true
-		}
-	},
 	data() {
 		return {
+			chart: null,
 			chartType: 'local-notes',
 			span: 'hour'
 		};
@@ -85,6 +81,11 @@ export default Vue.extend({
 			);
 		}
 	},
+	created() {
+		(this as any).api('chart').then(chart => {
+			this.chart = chart;
+		});
+	},
 	methods: {
 		notesChart(local: boolean): any {
 			const data = this.stats.slice().reverse().map(x => ({
diff --git a/src/client/app/desktop/views/pages/admin/admin.vue b/src/client/app/desktop/views/pages/admin/admin.vue
index 066c1a4f4f..0bb5ed0a0f 100644
--- a/src/client/app/desktop/views/pages/admin/admin.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.vue
@@ -11,7 +11,7 @@
 	<main>
 		<div v-show="page == 'dashboard'">
 			<x-dashboard/>
-			<x-chart :chart="chart"/>
+			<x-chart/>
 		</div>
 		<div v-if="page == 'users'">
 			<x-suspend-user/>
@@ -49,11 +49,6 @@ export default Vue.extend({
 			chart: null
 		};
 	},
-	created() {
-		(this as any).api('admin/chart').then(chart => {
-			this.chart = chart;
-		});
-	},
 	methods: {
 		nav(page: string) {
 			this.page = page;
diff --git a/src/server/api/endpoints/admin/chart.ts b/src/server/api/endpoints/chart.ts
index 1b88af00bd..a58f0b163e 100644
--- a/src/server/api/endpoints/admin/chart.ts
+++ b/src/server/api/endpoints/chart.ts
@@ -1,10 +1,8 @@
-import Stats, { IStats } from '../../../../models/stats';
+import Stats, { IStats } from '../../../models/stats';
 
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
 export const meta = {
-	requireCredential: true,
-	requireAdmin: true
 };
 
 export default (params: any) => new Promise(async (res, rej) => {