Merge pull request #2450 from syuilo/develop

8.8.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,27 +941,22 @@ desktop/views/pages/admin/admin.unverify-user.vue:
 
 desktop/views/pages/admin/admin.chart.vue:
   title: "チャート"
-  per-day: "1時間ごと"
-  per-hour: "1日ごと"
+  per-day: "1日ごと"
+  per-hour: "1時間ごと"
   notes: "投稿"
   users: "ユーザー"
   drive: "ドライブ"
-  local-notes: "ローカルの投稿"
-  remote-notes: "リモートの投稿"
-  local-notes-total: "ローカルの投稿 (累計)"
-  remote-notes-total: "リモートの投稿 (累計)"
-  local-users: "ローカルのユーザー"
-  remote-users: "リモートのユーザー"
-  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: "リモートのドライブのファイル数 (累計)"
+  charts:
+    notes: "投稿の増減 (統合)"
+    local-notes: "投稿の増減 (ローカル)"
+    remote-notes: "投稿の増減 (リモート)"
+    notes-total: "投稿の累計"
+    users: "ユーザーの増減"
+    users-total: "ユーザーの累計"
+    drive: "ドライブ使用量の増減"
+    drive-total: "ドライブ使用量の累計"
+    drive-files: "ドライブのファイル数の増減"
+    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.3.0",
-	"clientVersion": "1.0.8825",
+	"version": "8.8.0",
+	"clientVersion": "1.0.8842",
 	"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'];
-	if (v == 0) return '0Byte';
+	const sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
+	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,13 +22,19 @@ export default Vue.extend({
 	},
 	methods: {
 		render() {
-			this.renderChart(this.data, Object.assign({
-				responsive: false,
+			this.renderChart(this.data, mergeOptions({
+				responsive: true,
+				maintainAspectRatio: false,
 				scales: {
 					xAxes: [{
 						type: 'time',
 						distribution: 'series'
 					}]
+				},
+				tooltips: {
+					intersect: false,
+					mode: 'x',
+					position: 'nearest'
 				}
 			}, this.opts || {}));
 		}

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

@@ -4,33 +4,29 @@
 		<b>%i18n:@title%:</b>
 		<select v-model="chartType">
 			<optgroup label="%i18n:@users%">
-				<option value="local-users">%i18n:@local-users%</option>
-				<option value="remote-users">%i18n:@remote-users%</option>
-				<option value="local-users-total">%i18n:@local-users-total%</option>
-				<option value="remote-users-total">%i18n:@remote-users-total%</option>
+				<option value="users">%i18n:@charts.users%</option>
+				<option value="users-total">%i18n:@charts.users-total%</option>
 			</optgroup>
 			<optgroup label="%i18n:@notes%">
-				<option value="local-notes">%i18n:@local-notes%</option>
-				<option value="remote-notes">%i18n:@remote-notes%</option>
-				<option value="local-notes-total">%i18n:@local-notes-total%</option>
-				<option value="remote-notes-total">%i18n:@remote-notes-total%</option>
+				<option value="notes">%i18n:@charts.notes%</option>
+				<option value="local-notes">%i18n:@charts.local-notes%</option>
+				<option value="remote-notes">%i18n:@charts.remote-notes%</option>
+				<option value="notes-total">%i18n:@charts.notes-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>
+				<option value="drive-files">%i18n:@charts.drive-files%</option>
+				<option value="drive-files-total">%i18n:@charts.drive-files-total%</option>
+				<option value="drive">%i18n:@charts.drive%</option>
+				<option value="drive-total">%i18n:@charts.drive-total%</option>
 			</optgroup>
 		</select>
 		<div>
-			<a @click="span = 'day'">%i18n:@per-day%</a> | <a @click="span = 'hour'">%i18n:@per-hour%</a>
+			<span @click="span = 'day'" :class="{ active: span == 'day' }">%i18n:@per-day%</span> | <span @click="span = 'hour'" :class="{ active: span == 'hour' }">%i18n:@per-hour%</span>
 		</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>
 
@@ -42,14 +38,10 @@ export default Vue.extend({
 	components: {
 		XChart
 	},
-	props: {
-		chart: {
-			required: true
-		}
-	},
 	data() {
 		return {
-			chartType: 'local-notes',
+			chart: null,
+			chartType: 'notes',
 			span: 'hour'
 		};
 	},
@@ -57,22 +49,16 @@ export default Vue.extend({
 		data(): any {
 			if (this.chart == null) return null;
 			switch (this.chartType) {
-				case 'local-users': return this.usersChart(true, false);
-				case 'remote-users': return this.usersChart(false, false);
-				case 'local-users-total': return this.usersChart(true, true);
-				case 'remote-users-total': return this.usersChart(false, true);
-				case 'local-notes': return this.notesChart(true);
-				case 'remote-notes': return this.notesChart(false);
-				case 'local-notes-total': return this.notesTotalChart(true);
-				case 'remote-notes-total': return this.notesTotalChart(false);
-				case 'local-drive': return this.driveChart(true, false);
-				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);
+				case 'users': return this.usersChart(false);
+				case 'users-total': return this.usersChart(true);
+				case 'notes': return this.notesChart('combined');
+				case 'local-notes': return this.notesChart('local');
+				case 'remote-notes': return this.notesChart('remote');
+				case 'notes-total': return this.notesTotalChart();
+				case 'drive': return this.driveChart(false);
+				case 'drive-total': return this.driveChart(true);
+				case 'drive-files': return this.driveFilesChart(false);
+				case 'drive-files-total': return this.driveFilesChart(true);
 			}
 		},
 		stats(): any[] {
@@ -83,14 +69,19 @@ export default Vue.extend({
 			);
 		}
 	},
+	created() {
+		(this as any).api('chart').then(chart => {
+			this.chart = chart;
+		});
+	},
 	methods: {
-		notesChart(local: boolean): any {
+		notesChart(type: string): any {
 			const data = this.stats.slice().reverse().map(x => ({
 				date: new Date(x.date),
-				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,
-				all: local ? x.notes.local.diff : x.notes.remote.diff
+				normal: type == 'local' ? x.notes.local.diffs.normal : type == 'remote' ? x.notes.remote.diffs.normal : x.notes.local.diffs.normal + x.notes.remote.diffs.normal,
+				reply: type == 'local' ? x.notes.local.diffs.reply : type == 'remote' ? x.notes.remote.diffs.reply : x.notes.local.diffs.reply + x.notes.remote.diffs.reply,
+				renote: type == 'local' ? x.notes.local.diffs.renote : type == 'remote' ? x.notes.remote.diffs.renote : x.notes.local.diffs.renote + x.notes.remote.diffs.renote,
+				all: type == 'local' ? x.notes.local.diff : type == 'remote' ? x.notes.remote.diff : x.notes.local.diff + x.notes.remote.diff
 			}));
 
 			return [{
@@ -99,128 +90,286 @@ export default Vue.extend({
 					fill: false,
 					borderColor: '#555',
 					borderWidth: 2,
+					borderDash: [4, 4],
 					pointBackgroundColor: '#fff',
 					lineTension: 0,
 					data: data.map(x => ({ t: x.date, y: x.all }))
 				}, {
-					label: 'Normal',
-					fill: false,
-					borderColor: '#41ddde',
+					label: 'Renotes',
+					fill: true,
+					backgroundColor: 'rgba(161, 222, 65, 0.1)',
+					borderColor: '#a1de41',
 					borderWidth: 2,
 					pointBackgroundColor: '#fff',
 					lineTension: 0,
-					data: data.map(x => ({ t: x.date, y: x.normal }))
+					data: data.map(x => ({ t: x.date, y: x.renote }))
 				}, {
 					label: 'Replies',
-					fill: false,
+					fill: true,
+					backgroundColor: 'rgba(247, 121, 108, 0.1)',
 					borderColor: '#f7796c',
 					borderWidth: 2,
 					pointBackgroundColor: '#fff',
 					lineTension: 0,
 					data: data.map(x => ({ t: x.date, y: x.reply }))
 				}, {
-					label: 'Renotes',
-					fill: false,
-					borderColor: '#a1de41',
+					label: 'Normal',
+					fill: true,
+					backgroundColor: 'rgba(65, 221, 222, 0.1)',
+					borderColor: '#41ddde',
 					borderWidth: 2,
 					pointBackgroundColor: '#fff',
 					lineTension: 0,
-					data: data.map(x => ({ t: x.date, y: x.renote }))
-				}]
-			}];
-		},
-
-		notesTotalChart(local: boolean): any {
-			const data = this.stats.slice().reverse().map(x => ({
-				date: new Date(x.date),
-				count: local ? x.notes.local.total : x.notes.remote.total,
-			}));
-
-			return [{
-				datasets: [{
-					label: local ? 'Local Notes' : 'Remote Notes',
-					fill: false,
-					borderColor: '#f6584f',
-					borderWidth: 2,
-					pointBackgroundColor: '#fff',
-					lineTension: 0,
-					data: data.map(x => ({ t: x.date, y: x.count }))
-				}]
-			}];
-		},
-
-		usersChart(local: boolean, total: boolean): any {
-			const data = this.stats.slice().reverse().map(x => ({
-				date: new Date(x.date),
-				count: local ?
-					total ? x.users.local.total : x.users.local.diff :
-					total ? x.users.remote.total : x.users.remote.diff
-			}));
-
-			return [{
-				datasets: [{
-					label: local ? 'Local Users' : 'Remote Users',
-					fill: false,
-					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),
-				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 }))
+					data: data.map(x => ({ t: x.date, y: x.normal }))
 				}]
 			}, {
 				scales: {
 					yAxes: [{
 						ticks: {
-							callback: (value) => {
-								return Vue.filter('bytes')(value);
+							callback: value => {
+								return Vue.filter('number')(value);
 							}
 						}
 					}]
+				},
+				tooltips: {
+					callbacks: {
+						label: (tooltipItem, data) => {
+							const label = data.datasets[tooltipItem.datasetIndex].label || '';
+							return `${label}: ${Vue.filter('number')(tooltipItem.yLabel)}`;
+						}
+					}
 				}
 			}];
 		},
 
-		driveFilesChart(local: boolean, total: boolean): any {
+		notesTotalChart(): 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
+				localCount: x.notes.local.total,
+				remoteCount: x.notes.remote.total
 			}));
 
 			return [{
 				datasets: [{
-					label: local ? 'Local Drive Files' : 'Remote Drive Files',
+					label: 'Notes',
 					fill: false,
+					borderColor: '#555',
+					borderWidth: 2,
+					borderDash: [4, 4],
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteCount + x.localCount }))
+				}, {
+					label: 'Remote Notes',
+					fill: true,
+					backgroundColor: 'rgba(65, 221, 222, 0.1)',
+					borderColor: '#41ddde',
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteCount }))
+				}, {
+					label: 'Local Notes',
+					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 }))
+					data: data.map(x => ({ t: x.date, y: x.localCount }))
 				}]
+			}, {
+				scales: {
+					yAxes: [{
+						ticks: {
+							callback: value => {
+								return Vue.filter('number')(value);
+							}
+						}
+					}]
+				},
+				tooltips: {
+					callbacks: {
+						label: (tooltipItem, data) => {
+							const label = data.datasets[tooltipItem.datasetIndex].label || '';
+							return `${label}: ${Vue.filter('number')(tooltipItem.yLabel)}`;
+						}
+					}
+				}
 			}];
 		},
+
+		usersChart(total: boolean): any {
+			const data = this.stats.slice().reverse().map(x => ({
+				date: new Date(x.date),
+				localCount: total ? x.users.local.total : x.users.local.diff,
+				remoteCount: total ? x.users.remote.total : x.users.remote.diff
+			}));
+
+			return [{
+				datasets: [{
+					label: 'Users',
+					fill: false,
+					borderColor: '#555',
+					borderWidth: 2,
+					borderDash: [4, 4],
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteCount + x.localCount }))
+				}, {
+					label: 'Remote Users',
+					fill: true,
+					backgroundColor: 'rgba(65, 221, 222, 0.1)',
+					borderColor: '#41ddde',
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteCount }))
+				}, {
+					label: 'Local 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.localCount }))
+				}]
+			}, {
+				scales: {
+					yAxes: [{
+						ticks: {
+							callback: value => {
+								return Vue.filter('number')(value);
+							}
+						}
+					}]
+				},
+				tooltips: {
+					callbacks: {
+						label: (tooltipItem, data) => {
+							const label = data.datasets[tooltipItem.datasetIndex].label || '';
+							return `${label}: ${Vue.filter('number')(tooltipItem.yLabel)}`;
+						}
+					}
+				}
+			}];
+		},
+
+		driveChart(total: boolean): any {
+			const data = this.stats.slice().reverse().map(x => ({
+				date: new Date(x.date),
+				localSize: total ? x.drive.local.totalSize : x.drive.local.diffSize,
+				remoteSize: total ? x.drive.remote.totalSize : x.drive.remote.diffSize
+			}));
+
+			return [{
+				datasets: [{
+					label: 'Drive Usage',
+					fill: false,
+					borderColor: '#555',
+					borderWidth: 2,
+					borderDash: [4, 4],
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteSize + x.localSize }))
+				}, {
+					label: 'Remote Drive Usage',
+					fill: true,
+					backgroundColor: 'rgba(65, 221, 222, 0.1)',
+					borderColor: '#41ddde',
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteSize }))
+				}, {
+					label: 'Local 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.localSize }))
+				}]
+			}, {
+				scales: {
+					yAxes: [{
+						ticks: {
+							callback: value => {
+								return Vue.filter('bytes')(value);
+							}
+						}
+					}]
+				},
+				tooltips: {
+					callbacks: {
+						label: (tooltipItem, data) => {
+							const label = data.datasets[tooltipItem.datasetIndex].label || '';
+							return `${label}: ${Vue.filter('bytes')(tooltipItem.yLabel)}`;
+						}
+					}
+				}
+			}];
+		},
+
+		driveFilesChart(total: boolean): any {
+			const data = this.stats.slice().reverse().map(x => ({
+				date: new Date(x.date),
+				localCount: total ? x.drive.local.totalCount : x.drive.local.diffCount,
+				remoteCount: total ? x.drive.remote.totalCount : x.drive.remote.diffCount
+			}));
+
+			return [{
+				datasets: [{
+					label: 'Drive Files',
+					fill: false,
+					borderColor: '#555',
+					borderWidth: 2,
+					borderDash: [4, 4],
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteCount + x.localCount }))
+				}, {
+					label: 'Remote Drive Files',
+					fill: true,
+					backgroundColor: 'rgba(65, 221, 222, 0.1)',
+					borderColor: '#41ddde',
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteCount }))
+				}, {
+					label: 'Local Drive Files',
+					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.localCount }))
+				}]
+			}, {
+				scales: {
+					yAxes: [{
+						ticks: {
+							callback: value => {
+								return Vue.filter('number')(value);
+							}
+						}
+					}]
+				},
+				tooltips: {
+					callbacks: {
+						label: (tooltipItem, data) => {
+							const label = data.datasets[tooltipItem.datasetIndex].label || '';
+							return `${label}: ${Vue.filter('number')(tooltipItem.yLabel)}`;
+						}
+					}
+				}
+			}];
+		}
 	}
 });
 </script>
@@ -229,6 +378,9 @@ export default Vue.extend({
 @import '~const.styl'
 
 .gkgckalzgidaygcxnugepioremxvxvpt
+	*
+		user-select none
+
 	> header
 		display flex
 
@@ -238,4 +390,14 @@ export default Vue.extend({
 		> *:last-child
 			margin-left auto
 
+			*
+				&:not(.active)
+					color $theme-color
+					cursor pointer
+
+	> 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,15 +1,13 @@
-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) => {
-	const daysRange = 90;
-	const hoursRange = 24;
+	const daysRange = 30;
+	const hoursRange = 30;
 
 	const now = new Date();
 	const y = now.getFullYear();
@@ -67,9 +65,53 @@ export default (params: any) => new Promise(async (res, rej) => {
 			} else { // 隙間埋め
 				const mostRecent = src.find(s => s.date.getTime() < current.getTime());
 				if (mostRecent) {
-					chart.unshift(Object.assign({}, mostRecent, {
-						date: current
-					}));
+					chart.unshift({
+						date: current,
+						users: {
+							local: {
+								total: mostRecent.users.local.total,
+								diff: 0
+							},
+							remote: {
+								total: mostRecent.users.remote.total,
+								diff: 0
+							}
+						},
+						notes: {
+							local: {
+								total: mostRecent.notes.local.total,
+								diff: 0,
+								diffs: {
+									normal: 0,
+									reply: 0,
+									renote: 0
+								}
+							},
+							remote: {
+								total: mostRecent.notes.remote.total,
+								diff: 0,
+								diffs: {
+									normal: 0,
+									reply: 0,
+									renote: 0
+								}
+							}
+						},
+						drive: {
+							local: {
+								totalCount: mostRecent.drive.local.totalCount,
+								totalSize: mostRecent.drive.local.totalSize,
+								diffCount: 0,
+								diffSize: 0
+							},
+							remote: {
+								totalCount: mostRecent.drive.remote.totalCount,
+								totalSize: mostRecent.drive.remote.totalSize,
+								diffCount: 0,
+								diffSize: 0
+							}
+						}
+					});
 				} else {
 					chart.unshift({
 						date: current,

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,