Merge pull request #2445 from syuilo/develop

8.6.0

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
 -----
 

locales/ja-JP.yml

@@ -941,18 +941,27 @@ desktop/views/pages/admin/admin.unverify-user.vue:
 
 desktop/views/pages/admin/admin.chart.vue:
   title: "チャート"
-  local-notes: "ローカルの投稿"
+  per-day: "1日ごと"
-  remote-notes: "リモートの投稿"
+  per-hour: "1時間ごと"
-  local-notes-total: "ローカルの投稿 (累計)"
+  notes: "投稿"
-  remote-notes-total: "リモートの投稿 (累計)"
+  users: "ユーザー"
-  local-users: "ローカルのユーザー"
+  drive: "ドライブ"
-  remote-users: "リモートのユーザー"
+  local-notes: "ローカルの投稿の増減"
-  local-users-total: "ローカルのユーザー (累計)"
+  remote-notes: "リモートの投稿の増減"
-  remote-users-total: "リモートのユーザー (累計)"
+  local-notes-total: "ローカルの投稿の累計"
-  local-drive: "ローカルのドライブ使用量"
+  remote-notes-total: "リモートの投稿の累計"
-  remote-drive: "リモートのドライブ使用量"
+  local-users: "ローカルのユーザーの増減"
-  local-drive-total: "ローカルのドライブ使用量 (累計)"
+  remote-users: "リモートのユーザーの増減"
-  remote-drive-total: "リモートのドライブ使用量 (累計)"
+  local-users-total: "ローカルのユーザーの累計"
+  remote-users-total: "リモートのユーザーの累計"
+  local-drive: "ローカルのドライブ使用量の増減"
+  remote-drive: "リモートのドライブ使用量の増減"
+  local-drive-total: "ローカルのドライブ使用量の累計"
+  remote-drive-total: "リモートのドライブ使用量の累計"
+  local-drive-files: "ローカルのドライブのファイル数の増減"
+  remote-drive-files: "リモートのドライブのファイル数の増減"
+  local-drive-files-total: "ローカルのドライブのファイル数の累計"
+  remote-drive-files-total: "リモートのドライブのファイル数の累計"
 
 desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "メディア投稿のみ"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.2.0",
+	"version": "8.6.0",
-	"clientVersion": "1.0.8818",
+	"clientVersion": "1.0.8838",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -150,6 +150,7 @@
 		"loader-utils": "1.1.0",
 		"lodash.assign": "4.2.0",
 		"mecab-async": "0.1.2",
+		"merge-options": "1.0.1",
 		"minio": "7.0.0",
 		"mkdirp": "0.5.1",
 		"mocha": "5.2.0",

src/client/app/common/views/filters/bytes.ts

@@ -1,8 +1,10 @@
 import Vue from 'vue';
 
 Vue.filter('bytes', (v, digits = 0) => {
-	const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
+	const sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
-	if (v == 0) return '0Byte';
+	if (v == 0) return '0';
+	const isMinus = v < 0;
+	if (isMinus) v = -v;
 	const i = Math.floor(Math.log(v) / Math.log(1024));
-	return (v / Math.pow(1024, i)).toFixed(digits).replace(/\.0+$/, '') + sizes[i];
+	return (isMinus ? '-' : '') + (v / Math.pow(1024, i)).toFixed(digits).replace(/\.0+$/, '') + sizes[i];
 });

src/client/app/desktop/views/pages/admin/admin.chart.chart.ts

@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import { Line } from 'vue-chartjs';
+import * as mergeOptions from 'merge-options';
 
 export default Vue.extend({
 	extends: Line,
@@ -21,18 +22,17 @@ export default Vue.extend({
 	},
 	methods: {
 		render() {
-			this.renderChart(this.data, Object.assign({
+			this.renderChart(this.data, mergeOptions({
-				responsive: false,
+				responsive: true,
+				maintainAspectRatio: false,
 				scales: {
 					xAxes: [{
 						type: 'time',
-						time: {
-							displayFormats: {
-								quarter: 'YYYY/MM/D h:mm'
-							}
-						},
 						distribution: 'series'
 					}]
+				},
+				tooltips: {
+					intersect: false
 				}
 			}, this.opts || {}));
 		}

src/client/app/desktop/views/pages/admin/admin.chart.vue

@@ -3,24 +3,36 @@
 	<header>
 		<b>%i18n:@title%:</b>
 		<select v-model="chartType">
-			<option value="local-users">%i18n:@local-users%</option>
+			<optgroup label="%i18n:@users%">
-			<option value="remote-users">%i18n:@remote-users%</option>
+				<option value="local-users">%i18n:@local-users%</option>
-			<option value="local-users-total">%i18n:@local-users-total%</option>
+				<option value="remote-users">%i18n:@remote-users%</option>
-			<option value="remote-users-total">%i18n:@remote-users-total%</option>
+				<option value="local-users-total">%i18n:@local-users-total%</option>
-			<option value="local-notes">%i18n:@local-notes%</option>
+				<option value="remote-users-total">%i18n:@remote-users-total%</option>
-			<option value="remote-notes">%i18n:@remote-notes%</option>
+			</optgroup>
-			<option value="local-notes-total">%i18n:@local-notes-total%</option>
+			<optgroup label="%i18n:@notes%">
-			<option value="remote-notes-total">%i18n:@remote-notes-total%</option>
+				<option value="local-notes">%i18n:@local-notes%</option>
-			<option value="local-drive">%i18n:@local-drive%</option>
+				<option value="remote-notes">%i18n:@remote-notes%</option>
-			<option value="remote-drive">%i18n:@remote-drive%</option>
+				<option value="local-notes-total">%i18n:@local-notes-total%</option>
-			<option value="local-drive-total">%i18n:@local-drive-total%</option>
+				<option value="remote-notes-total">%i18n:@remote-notes-total%</option>
-			<option value="remote-drive-total">%i18n:@remote-drive-total%</option>
+			</optgroup>
+			<optgroup label="%i18n:@drive%">
+				<option value="local-drive-files">%i18n:@local-drive-files%</option>
+				<option value="remote-drive-files">%i18n:@remote-drive-files%</option>
+				<option value="local-drive-files-total">%i18n:@local-drive-files-total%</option>
+				<option value="remote-drive-files-total">%i18n:@remote-drive-files-total%</option>
+				<option value="local-drive">%i18n:@local-drive%</option>
+				<option value="remote-drive">%i18n:@remote-drive%</option>
+				<option value="local-drive-total">%i18n:@local-drive-total%</option>
+				<option value="remote-drive-total">%i18n:@remote-drive-total%</option>
+			</optgroup>
 		</select>
 		<div>
-			<a @click="span = 'day'">Per DAY</a> | <a @click="span = 'hour'">Per HOUR</a>
+			<a @click="span = 'day'">%i18n:@per-day%</a> | <a @click="span = 'hour'">%i18n:@per-hour%</a>
 		</div>
 	</header>
-	<x-chart v-if="chart" :data="data[0]" :opts="data[1]" :width="720" :height="300"/>
+	<div>
+		<x-chart v-if="chart" :data="data[0]" :opts="data[1]"/>
+	</div>
 </div>
 </template>
 
@@ -32,13 +44,9 @@ export default Vue.extend({
 	components: {
 		XChart
 	},
-	props: {
-		chart: {
-			required: true
-		}
-	},
 	data() {
 		return {
+			chart: null,
 			chartType: 'local-notes',
 			span: 'hour'
 		};
@@ -59,6 +67,10 @@ export default Vue.extend({
 				case 'remote-drive': return this.driveChart(false, false);
 				case 'local-drive-total': return this.driveChart(true, true);
 				case 'remote-drive-total': return this.driveChart(false, true);
+				case 'local-drive-files': return this.driveFilesChart(true, false);
+				case 'remote-drive-files': return this.driveFilesChart(false, false);
+				case 'local-drive-files-total': return this.driveFilesChart(true, true);
+				case 'remote-drive-files-total': return this.driveFilesChart(false, true);
 			}
 		},
 		stats(): any[] {
@@ -69,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 => ({
@@ -76,13 +93,22 @@ export default Vue.extend({
 				normal: local ? x.notes.local.diffs.normal : x.notes.remote.diffs.normal,
 				reply: local ? x.notes.local.diffs.reply : x.notes.remote.diffs.reply,
 				renote: local ? x.notes.local.diffs.renote : x.notes.remote.diffs.renote,
-				total: local ? x.notes.local.diff : x.notes.remote.diff
+				all: local ? x.notes.local.diff : x.notes.remote.diff
 			}));
 
 			return [{
 				datasets: [{
-					label: 'Normal',
+					label: 'All',
 					fill: false,
+					borderColor: '#555',
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.all }))
+				}, {
+					label: 'Normal',
+					fill: true,
+					backgroundColor: 'rgba(65, 221, 222, 0.1)',
 					borderColor: '#41ddde',
 					borderWidth: 2,
 					pointBackgroundColor: '#fff',
@@ -90,7 +116,8 @@ export default Vue.extend({
 					data: data.map(x => ({ t: x.date, y: x.normal }))
 				}, {
 					label: 'Replies',
-					fill: false,
+					fill: true,
+					backgroundColor: 'rgba(247, 121, 108, 0.1)',
 					borderColor: '#f7796c',
 					borderWidth: 2,
 					pointBackgroundColor: '#fff',
@@ -98,7 +125,8 @@ export default Vue.extend({
 					data: data.map(x => ({ t: x.date, y: x.reply }))
 				}, {
 					label: 'Renotes',
-					fill: false,
+					fill: true,
+					backgroundColor: 'rgba(161, 222, 65, 0.1)',
 					borderColor: '#a1de41',
 					borderWidth: 2,
 					pointBackgroundColor: '#fff',
@@ -107,6 +135,7 @@ export default Vue.extend({
 				}]
 			}];
 		},
+
 		notesTotalChart(local: boolean): any {
 			const data = this.stats.slice().reverse().map(x => ({
 				date: new Date(x.date),
@@ -116,7 +145,8 @@ export default Vue.extend({
 			return [{
 				datasets: [{
 					label: local ? 'Local Notes' : 'Remote Notes',
-					fill: false,
+					fill: true,
+					backgroundColor: 'rgba(246, 88, 79, 0.1)',
 					borderColor: '#f6584f',
 					borderWidth: 2,
 					pointBackgroundColor: '#fff',
@@ -125,6 +155,7 @@ export default Vue.extend({
 				}]
 			}];
 		},
+
 		usersChart(local: boolean, total: boolean): any {
 			const data = this.stats.slice().reverse().map(x => ({
 				date: new Date(x.date),
@@ -136,6 +167,67 @@ export default Vue.extend({
 			return [{
 				datasets: [{
 					label: local ? 'Local Users' : 'Remote Users',
+					fill: true,
+					backgroundColor: 'rgba(246, 88, 79, 0.1)',
+					borderColor: '#f6584f',
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.count }))
+				}]
+			}];
+		},
+
+		driveChart(local: boolean, total: boolean): any {
+			const data = this.stats.slice().reverse().map(x => ({
+				date: new Date(x.date),
+				size: local ?
+					total ? x.drive.local.totalSize : x.drive.local.diffSize :
+					total ? x.drive.remote.totalSize : x.drive.remote.diffSize
+			}));
+
+			return [{
+				datasets: [{
+					label: local ? 'Local Drive Usage' : 'Remote Drive Usage',
+					fill: true,
+					backgroundColor: 'rgba(246, 88, 79, 0.1)',
+					borderColor: '#f6584f',
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.size }))
+				}]
+			}, {
+				scales: {
+					yAxes: [{
+						ticks: {
+							callback: value => {
+								return Vue.filter('bytes')(value);
+							}
+						}
+					}]
+				},
+				tooltips: {
+					callbacks: {
+						label: tooltipItem => {
+							return Vue.filter('bytes')(tooltipItem.yLabel);
+						}
+					}
+				}
+			}];
+		},
+
+		driveFilesChart(local: boolean, total: boolean): any {
+			const data = this.stats.slice().reverse().map(x => ({
+				date: new Date(x.date),
+				count: local ?
+					total ? x.drive.local.totalCount : x.drive.local.diffCount :
+					total ? x.drive.remote.totalCount : x.drive.remote.diffCount
+			}));
+
+			return [{
+				datasets: [{
+					label: local ? 'Local Drive Files' : 'Remote Drive Files',
 					fill: false,
 					borderColor: '#f6584f',
 					borderWidth: 2,
@@ -145,36 +237,6 @@ export default Vue.extend({
 				}]
 			}];
 		},
-		driveChart(local: boolean, total: boolean): any {
-			const data = this.stats.slice().reverse().map(x => ({
-				date: new Date(x.date),
-				count: local ?
-					total ? x.drive.local.totalSize : x.drive.local.diffSize :
-					total ? x.drive.remote.totalSize : x.drive.remote.diffSize
-			}));
-
-			return [{
-				datasets: [{
-					label: local ? 'Local Drive Usage' : 'Remote Drive Usage',
-					fill: false,
-					borderColor: '#f6584f',
-					borderWidth: 2,
-					pointBackgroundColor: '#fff',
-					lineTension: 0,
-					data: data.map(x => ({ t: x.date, y: x.count }))
-				}]
-			}, {
-				scales: {
-					yAxes: [{
-						ticks: {
-							callback: (value) => {
-								return Vue.filter('bytes')(value);
-							}
-						}
-					}]
-				}
-			}];
-		}
 	}
 });
 </script>
@@ -183,6 +245,9 @@ export default Vue.extend({
 @import '~const.styl'
 
 .gkgckalzgidaygcxnugepioremxvxvpt
+	*
+		user-select none
+
 	> header
 		display flex
 
@@ -192,4 +257,9 @@ export default Vue.extend({
 		> *:last-child
 			margin-left auto
 
+	> div
+		> *
+			display block
+			height 300px
+
 </style>

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;

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) => {

src/server/api/index.ts

@@ -46,6 +46,11 @@ router.post('/signin', require('./private/signin').default);
 router.use(require('./service/github').routes());
 router.use(require('./service/twitter').routes());
 
+// Return 404 for unknown API
+router.all('*', async ctx => {
+	ctx.status = 404;
+});
+
 // Register router
 app.use(router.routes());
 

src/server/web/index.ts

@@ -122,8 +122,7 @@ router.get('/notes/:note', async ctx => {
 router.get('*', async ctx => {
 	await send(ctx, `app/base.html`, {
 		root: client,
-		maxage: ms('3 days'),
+		maxage: ms('5m')
-		immutable: true
 	});
 });
 

src/services/drive/add-file.ts

@@ -40,7 +40,7 @@ async function save(path: string, name: string, type: string, hash: string, size
 		const thumbnailKey = `${config.drive.prefix}/${uuid.v4()}/${name}.thumbnail.jpg`;
 
 		const baseUrl = config.drive.baseUrl
-			|| `${ config.drive.config.secure ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? ':' + config.drive.config.port : '' }/${ config.drive.bucket }`;
+			|| `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? ':' + config.drive.config.port : '' }/${ config.drive.bucket }`;
 
 		await minio.putObject(config.drive.bucket, key, fs.createReadStream(path), size, {
 			'Content-Type': type,