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

cli/migration/8.0.0.js

@@ -0,0 +1,144 @@
+const { default: Stats } = require('../../built/models/stats');
+const { default: User } = require('../../built/models/user');
+const { default: Note } = require('../../built/models/note');
+const { default: DriveFile } = require('../../built/models/drive-file');
+
+const now = new Date();
+const y = now.getFullYear();
+const m = now.getMonth();
+const d = now.getDate();
+const h = now.getHours();
+const date = new Date(y, m, d, h);
+
+async function main() {
+	await Stats.update({}, {
+		$set: {
+			span: 'day'
+		}
+	}, {
+		multi: true
+	});
+
+	const localUsersCount = await User.count({
+		host: null
+	});
+
+	const remoteUsersCount = await User.count({
+		host: { $ne: null }
+	});
+
+	const localNotesCount = await Note.count({
+		'_user.host': null
+	});
+
+	const remoteNotesCount = await Note.count({
+		'_user.host': { $ne: null }
+	});
+
+	const localDriveFilesCount = await DriveFile.count({
+		'metadata._user.host': null
+	});
+
+	const remoteDriveFilesCount = await DriveFile.count({
+		'metadata._user.host': { $ne: null }
+	});
+
+	const localDriveFilesSize = await DriveFile
+		.aggregate([{
+			$match: {
+				'metadata._user.host': null,
+				'metadata.deletedAt': { $exists: false }
+			}
+		}, {
+			$project: {
+				length: true
+			}
+		}, {
+			$group: {
+				_id: null,
+				usage: { $sum: '$length' }
+			}
+		}])
+		.then(aggregates => {
+			if (aggregates.length > 0) {
+				return aggregates[0].usage;
+			}
+			return 0;
+		});
+
+	const remoteDriveFilesSize = await DriveFile
+		.aggregate([{
+			$match: {
+				'metadata._user.host': { $ne: null },
+				'metadata.deletedAt': { $exists: false }
+			}
+		}, {
+			$project: {
+				length: true
+			}
+		}, {
+			$group: {
+				_id: null,
+				usage: { $sum: '$length' }
+			}
+		}])
+		.then(aggregates => {
+			if (aggregates.length > 0) {
+				return aggregates[0].usage;
+			}
+			return 0;
+		});
+
+	await Stats.insert({
+		date: date,
+		span: 'hour',
+		users: {
+			local: {
+				total: localUsersCount,
+				diff: 0
+			},
+			remote: {
+				total: remoteUsersCount,
+				diff: 0
+			}
+		},
+		notes: {
+			local: {
+				total: localNotesCount,
+				diff: 0,
+				diffs: {
+					normal: 0,
+					reply: 0,
+					renote: 0
+				}
+			},
+			remote: {
+				total: remoteNotesCount,
+				diff: 0,
+				diffs: {
+					normal: 0,
+					reply: 0,
+					renote: 0
+				}
+			}
+		},
+		drive: {
+			local: {
+				totalCount: localDriveFilesCount,
+				totalSize: localDriveFilesSize,
+				diffCount: 0,
+				diffSize: 0
+			},
+			remote: {
+				totalCount: remoteDriveFilesCount,
+				totalSize: remoteDriveFilesSize,
+				diffCount: 0,
+				diffSize: 0
+			}
+		}
+	});
+
+	console.log('done');
+}
+
+main();

locales/ja-JP.yml

@@ -939,20 +939,29 @@ desktop/views/pages/admin/admin.unverify-user.vue:
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
 
-desktop/views/pages/admin/admin.notes-chart.vue:
+desktop/views/pages/admin/admin.chart.vue:
-  title: "投稿"
+  title: "チャート"
-  local: "ローカル"
+  per-day: "1日ごと"
-  remote: "リモート"
+  per-hour: "1時間ごと"
-
+  notes: "投稿"
-desktop/views/pages/admin/admin.users-chart.vue:
+  users: "ユーザー"
-  title: "ユーザー"
+  drive: "ドライブ"
-  local: "ローカル"
+  local-notes: "ローカルの投稿の増減"
-  remote: "リモート"
+  remote-notes: "リモートの投稿の増減"
-
+  local-notes-total: "ローカルの投稿の累計"
-desktop/views/pages/admin/admin.drive-chart.vue:
+  remote-notes-total: "リモートの投稿の累計"
-  title: "ドライブ"
+  local-users: "ローカルのユーザーの増減"
-  local: "ローカル"
+  remote-users: "リモートのユーザーの増減"
-  remote: "リモート"
+  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": "7.4.1",
+	"version": "8.6.0",
-	"clientVersion": "1.0.8790",
+	"clientVersion": "1.0.8838",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -89,6 +89,7 @@
 		"bootstrap-vue": "2.0.0-rc.11",
 		"cafy": "11.3.0",
 		"chalk": "2.4.1",
+		"chart.js": "2.7.2",
 		"commander": "2.17.1",
 		"crc-32": "1.2.0",
 		"css-loader": "1.0.0",
@@ -149,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",
@@ -206,8 +208,9 @@
 		"uuid": "3.3.2",
 		"v-animate-css": "0.0.2",
 		"vue": "2.5.17",
+		"vue-chartjs": "3.4.0",
 		"vue-cropperjs": "2.2.1",
-		"vue-js-modal": "1.3.17",
+		"vue-js-modal": "1.3.18",
 		"vue-json-tree-view": "2.1.4",
 		"vue-loader": "15.4.0",
 		"vue-router": "3.0.1",
@@ -218,7 +221,7 @@
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.2",
 		"webfinger.js": "2.6.6",
-		"webpack": "4.17.0",
+		"webpack": "4.17.1",
 		"webpack-cli": "3.1.0",
 		"websocket": "1.0.26",
 		"ws": "6.0.0",

src/client/app/common/views/components/url-preview.vue

@@ -176,7 +176,7 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-.twitter
+.player
 	position relative
 	width 100%
 

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

@@ -0,0 +1,40 @@
+import Vue from 'vue';
+import { Line } from 'vue-chartjs';
+import * as mergeOptions from 'merge-options';
+
+export default Vue.extend({
+	extends: Line,
+	props: {
+		data: {
+			required: true
+		},
+		opts: {
+			required: false
+		}
+	},
+	watch: {
+		data() {
+			this.render();
+		}
+	},
+	mounted() {
+		this.render();
+	},
+	methods: {
+		render() {
+			this.renderChart(this.data, mergeOptions({
+				responsive: true,
+				maintainAspectRatio: false,
+				scales: {
+					xAxes: [{
+						type: 'time',
+						distribution: 'series'
+					}]
+				},
+				tooltips: {
+					intersect: false
+				}
+			}, this.opts || {}));
+		}
+	}
+});

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

@@ -0,0 +1,265 @@
+<template>
+<div class="card gkgckalzgidaygcxnugepioremxvxvpt">
+	<header>
+		<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>
+			</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>
+			</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'">%i18n:@per-day%</a> | <a @click="span = 'hour'">%i18n:@per-hour%</a>
+		</div>
+	</header>
+	<div>
+		<x-chart v-if="chart" :data="data[0]" :opts="data[1]"/>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import XChart from './admin.chart.chart.ts';
+
+export default Vue.extend({
+	components: {
+		XChart
+	},
+	data() {
+		return {
+			chart: null,
+			chartType: 'local-notes',
+			span: 'hour'
+		};
+	},
+	computed: {
+		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);
+			}
+		},
+		stats(): any[] {
+			return (
+				this.span == 'day' ? this.chart.perDay :
+				this.span == 'hour' ? this.chart.perHour :
+				null
+			);
+		}
+	},
+	created() {
+		(this as any).api('chart').then(chart => {
+			this.chart = chart;
+		});
+	},
+	methods: {
+		notesChart(local: boolean): 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
+			}));
+
+			return [{
+				datasets: [{
+					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',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.normal }))
+				}, {
+					label: 'Replies',
+					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: 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.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: 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 }))
+				}]
+			}];
+		},
+
+		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: 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,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.count }))
+				}]
+			}];
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+.gkgckalzgidaygcxnugepioremxvxvpt
+	*
+		user-select none
+
+	> header
+		display flex
+
+		> b
+			margin-right 8px
+
+		> *:last-child
+			margin-left auto
+
+	> div
+		> *
+			display block
+			height 300px
+
+</style>

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

@@ -1,51 +0,0 @@
-<template>
-<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`">
-	<polyline
-		:points="points"
-		fill="none"
-		stroke-width="1"
-		stroke="#555"/>
-</svg>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		chart: {
-			required: true
-		},
-		type: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			viewBoxX: 365,
-			viewBoxY: 70,
-			points: null
-		};
-	},
-	created() {
-		const peak = Math.max.apply(null, this.chart.map(d => this.type == 'local' ? d.drive.local.totalSize : d.drive.remote.totalSize));
-
-		if (peak != 0) {
-			const data = this.chart.slice().reverse().map(x => ({
-				size: this.type == 'local' ? x.drive.local.totalSize : x.drive.remote.totalSize
-			}));
-
-			this.points = data.map((d, i) => `${i},${(1 - (d.size / peak)) * this.viewBoxY}`).join(' ');
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-svg
-	display block
-	padding 10px
-	width 100%
-
-</style>

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

@@ -1,34 +0,0 @@
-<template>
-<div class="card">
-	<header>%i18n:@title%</header>
-	<div class="card">
-		<header>%i18n:@local%</header>
-		<x-chart v-if="chart" :chart="chart" type="local"/>
-	</div>
-	<div class="card">
-		<header>%i18n:@remote%</header>
-		<x-chart v-if="chart" :chart="chart" type="remote"/>
-	</div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from "vue";
-import XChart from "./admin.drive-chart.chart.vue";
-
-export default Vue.extend({
-	components: {
-		XChart
-	},
-	props: {
-		chart: {
-			required: true
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-@import '~const.styl'
-
-</style>

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

@@ -1,76 +0,0 @@
-<template>
-<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`">
-	<polyline
-		:points="pointsNote"
-		fill="none"
-		stroke-width="1"
-		stroke="#41ddde"/>
-	<polyline
-		:points="pointsReply"
-		fill="none"
-		stroke-width="1"
-		stroke="#f7796c"/>
-	<polyline
-		:points="pointsRenote"
-		fill="none"
-		stroke-width="1"
-		stroke="#a1de41"/>
-	<polyline
-		:points="pointsTotal"
-		fill="none"
-		stroke-width="1"
-		stroke="#555"
-		stroke-dasharray="2 2"/>
-</svg>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		chart: {
-			required: true
-		},
-		type: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			viewBoxX: 365,
-			viewBoxY: 70,
-			pointsNote: null,
-			pointsReply: null,
-			pointsRenote: null,
-			pointsTotal: null
-		};
-	},
-	created() {
-		const peak = Math.max.apply(null, this.chart.map(d => this.type == 'local' ? d.notes.local.diff : d.notes.remote.diff));
-
-		if (peak != 0) {
-			const data = this.chart.slice().reverse().map(x => ({
-				normal: this.type == 'local' ? x.notes.local.diffs.normal : x.notes.remote.diffs.normal,
-				reply: this.type == 'local' ? x.notes.local.diffs.reply : x.notes.remote.diffs.reply,
-				renote: this.type == 'local' ? x.notes.local.diffs.renote : x.notes.remote.diffs.renote,
-				total: this.type == 'local' ? x.notes.local.diff : x.notes.remote.diff
-			}));
-
-			this.pointsNote = data.map((d, i) => `${i},${(1 - (d.normal / peak)) * this.viewBoxY}`).join(' ');
-			this.pointsReply = data.map((d, i) => `${i},${(1 - (d.reply / peak)) * this.viewBoxY}`).join(' ');
-			this.pointsRenote = data.map((d, i) => `${i},${(1 - (d.renote / peak)) * this.viewBoxY}`).join(' ');
-			this.pointsTotal = data.map((d, i) => `${i},${(1 - (d.total / peak)) * this.viewBoxY}`).join(' ');
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-svg
-	display block
-	padding 10px
-	width 100%
-
-</style>

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

@@ -1,34 +0,0 @@
-<template>
-<div class="card">
-	<header>%i18n:@title%</header>
-	<div class="card">
-		<header>%i18n:@local%</header>
-		<x-chart v-if="chart" :chart="chart" type="local"/>
-	</div>
-	<div class="card">
-		<header>%i18n:@remote%</header>
-		<x-chart v-if="chart" :chart="chart" type="remote"/>
-	</div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from "vue";
-import XChart from "./admin.notes-chart.chart.vue";
-
-export default Vue.extend({
-	components: {
-		XChart
-	},
-	props: {
-		chart: {
-			required: true
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-@import '~const.styl'
-
-</style>

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

@@ -1,51 +0,0 @@
-<template>
-<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`">
-	<polyline
-		:points="points"
-		fill="none"
-		stroke-width="1"
-		stroke="#555"/>
-</svg>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		chart: {
-			required: true
-		},
-		type: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			viewBoxX: 365,
-			viewBoxY: 70,
-			points: null
-		};
-	},
-	created() {
-		const peak = Math.max.apply(null, this.chart.map(d => this.type == 'local' ? d.users.local.diff : d.users.remote.diff));
-
-		if (peak != 0) {
-			const data = this.chart.slice().reverse().map(x => ({
-				count: this.type == 'local' ? x.users.local.diff : x.users.remote.diff
-			}));
-
-			this.points = data.map((d, i) => `${i},${(1 - (d.count / peak)) * this.viewBoxY}`).join(' ');
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-svg
-	display block
-	padding 10px
-	width 100%
-
-</style>

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

@@ -1,34 +0,0 @@
-<template>
-<div class="card">
-	<header>%i18n:@title%</header>
-	<div class="card">
-		<header>%i18n:@local%</header>
-		<x-chart v-if="chart" :chart="chart" type="local"/>
-	</div>
-	<div class="card">
-		<header>%i18n:@remote%</header>
-		<x-chart v-if="chart" :chart="chart" type="remote"/>
-	</div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from "vue";
-import XChart from "./admin.users-chart.chart.vue";
-
-export default Vue.extend({
-	components: {
-		XChart
-	},
-	props: {
-		chart: {
-			required: true
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-@import '~const.styl'
-
-</style>

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

@@ -11,9 +11,7 @@
 	<main>
 		<div v-show="page == 'dashboard'">
 			<x-dashboard/>
-			<x-users-chart :chart="chart"/>
+			<x-chart/>
-			<x-notes-chart :chart="chart"/>
-			<x-drive-chart :chart="chart"/>
 		</div>
 		<div v-if="page == 'users'">
 			<x-suspend-user/>
@@ -34,9 +32,7 @@ import XSuspendUser from "./admin.suspend-user.vue";
 import XUnsuspendUser from "./admin.unsuspend-user.vue";
 import XVerifyUser from "./admin.verify-user.vue";
 import XUnverifyUser from "./admin.unverify-user.vue";
-import XUsersChart from "./admin.users-chart.vue";
+import XChart from "./admin.chart.vue";
-import XNotesChart from "./admin.notes-chart.vue";
-import XDriveChart from "./admin.drive-chart.vue";
 
 export default Vue.extend({
 	components: {
@@ -45,9 +41,7 @@ export default Vue.extend({
 		XUnsuspendUser,
 		XVerifyUser,
 		XUnverifyUser,
-		XUsersChart,
+		XChart
-		XNotesChart,
-		XDriveChart
 	},
 	data() {
 		return {
@@ -55,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/models/stats.ts

@@ -10,6 +10,8 @@ export interface IStats {
 
 	date: Date;
 
+	span: 'day' | 'hour';
+
 	/**
 	 * ユーザーに関する統計
 	 */

src/remote/resolve-user.ts

@@ -15,7 +15,7 @@ export default async (username: string, _host: string, option?: any): Promise<IU
 	const host = toUnicode(hostAscii);
 
 	if (config.host == host) {
-		return await User.findOne({ usernameLower });
+		return await User.findOne({ usernameLower, host: null });
 	}
 
 	let user = await User.findOne({ usernameLower, host }, option);

src/server/api/endpoints/admin/chart.ts

@@ -1,101 +0,0 @@
-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 now = new Date();
-	const y = now.getFullYear();
-	const m = now.getMonth();
-	const d = now.getDate();
-
-	const stats = await Stats.find({
-		date: {
-			$gt: new Date(y - 1, m, d)
-		}
-	}, {
-		sort: {
-			date: -1
-		},
-		fields: {
-			_id: 0
-		}
-	});
-
-	const chart: Array<Omit<IStats, '_id'>> = [];
-
-	for (let i = 364; i >= 0; i--) {
-		const day = new Date(y, m, d - i);
-
-		const stat = stats.find(s => s.date.getTime() == day.getTime());
-
-		if (stat) {
-			chart.unshift(stat);
-		} else { // 隙間埋め
-			const mostRecent = stats.find(s => s.date.getTime() < day.getTime());
-			if (mostRecent) {
-				chart.unshift(Object.assign({}, mostRecent, {
-					date: day
-				}));
-			} else {
-				chart.unshift({
-					date: day,
-					users: {
-						local: {
-							total: 0,
-							diff: 0
-						},
-						remote: {
-							total: 0,
-							diff: 0
-						}
-					},
-					notes: {
-						local: {
-							total: 0,
-							diff: 0,
-							diffs: {
-								normal: 0,
-								reply: 0,
-								renote: 0
-							}
-						},
-						remote: {
-							total: 0,
-							diff: 0,
-							diffs: {
-								normal: 0,
-								reply: 0,
-								renote: 0
-							}
-						}
-					},
-					drive: {
-						local: {
-							totalCount: 0,
-							totalSize: 0,
-							diffCount: 0,
-							diffSize: 0
-						},
-						remote: {
-							totalCount: 0,
-							totalSize: 0,
-							diffCount: 0,
-							diffSize: 0
-						}
-					}
-				});
-			}
-		}
-	}
-
-	chart.forEach(x => {
-		delete x.date;
-	});
-
-	res(chart);
-});

src/server/api/endpoints/chart.ts

@@ -0,0 +1,134 @@
+import Stats, { IStats } from '../../../models/stats';
+
+type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+
+export const meta = {
+};
+
+export default (params: any) => new Promise(async (res, rej) => {
+	const daysRange = 90;
+	const hoursRange = 24;
+
+	const now = new Date();
+	const y = now.getFullYear();
+	const m = now.getMonth();
+	const d = now.getDate();
+	const h = now.getHours();
+
+	const [statsPerDay, statsPerHour] = await Promise.all([
+		Stats.find({
+			span: 'day',
+			date: {
+				$gt: new Date(y, m, d - daysRange)
+			}
+		}, {
+			sort: {
+				date: -1
+			},
+			fields: {
+				_id: 0
+			}
+		}),
+		Stats.find({
+			span: 'hour',
+			date: {
+				$gt: new Date(y, m, d, h - hoursRange)
+			}
+		}, {
+			sort: {
+				date: -1
+			},
+			fields: {
+				_id: 0
+			}
+		}),
+	]);
+
+	const format = (src: IStats[], span: 'day' | 'hour') => {
+		const chart: Array<Omit<Omit<IStats, '_id'>, 'span'>> = [];
+
+		const range =
+			span == 'day' ? daysRange :
+			span == 'hour' ? hoursRange :
+			null;
+
+		for (let i = (range - 1); i >= 0; i--) {
+			const current =
+				span == 'day' ? new Date(y, m, d - i) :
+				span == 'hour' ? new Date(y, m, d, h - i) :
+				null;
+
+			const stat = src.find(s => s.date.getTime() == current.getTime());
+
+			if (stat) {
+				chart.unshift(stat);
+			} else { // 隙間埋め
+				const mostRecent = src.find(s => s.date.getTime() < current.getTime());
+				if (mostRecent) {
+					chart.unshift(Object.assign({}, mostRecent, {
+						date: current
+					}));
+				} else {
+					chart.unshift({
+						date: current,
+						users: {
+							local: {
+								total: 0,
+								diff: 0
+							},
+							remote: {
+								total: 0,
+								diff: 0
+							}
+						},
+						notes: {
+							local: {
+								total: 0,
+								diff: 0,
+								diffs: {
+									normal: 0,
+									reply: 0,
+									renote: 0
+								}
+							},
+							remote: {
+								total: 0,
+								diff: 0,
+								diffs: {
+									normal: 0,
+									reply: 0,
+									renote: 0
+								}
+							}
+						},
+						drive: {
+							local: {
+								totalCount: 0,
+								totalSize: 0,
+								diffCount: 0,
+								diffSize: 0
+							},
+							remote: {
+								totalCount: 0,
+								totalSize: 0,
+								diffCount: 0,
+								diffSize: 0
+							}
+						}
+					});
+				}
+			}
+		}
+
+		chart.forEach(x => {
+			delete (x as any).span;
+		});
+
+		return chart;
+	};
+
+	res({
+		perDay: format(statsPerDay, 'day'),
+		perHour: format(statsPerHour, 'hour')
+	});
+});

src/server/api/endpoints/following/requests/cancel.ts

@@ -27,7 +27,11 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 		return rej('followee not found');
 	}
 
-	await cancelFollowRequest(followee, user);
+	try {
+		await cancelFollowRequest(followee, user);
+	} catch (e) {
+		return rej(e);
+	}
 
 	// Send response
 	res(await pack(followee._id, user));

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,

src/services/following/requests/cancel.ts

@@ -12,6 +12,15 @@ export default async function(followee: IUser, follower: IUser) {
 		deliver(follower as ILocalUser, content, followee.inbox);
 	}
 
+	const request = await FollowRequest.findOne({
+		followeeId: followee._id,
+		followerId: follower._id
+	});
+
+	if (request == null) {
+		throw 'request not found';
+	}
+
 	await FollowRequest.remove({
 		followeeId: followee._id,
 		followerId: follower._id

src/services/update-chart.ts

@@ -5,89 +5,46 @@ import { IDriveFile } from '../models/drive-file';
 
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
-async function getTodayStats(): Promise<IStats> {
+async function getCurrentStats(span: 'day' | 'hour'): Promise<IStats> {
 	const now = new Date();
 	const y = now.getFullYear();
 	const m = now.getMonth();
 	const d = now.getDate();
-	const today = new Date(y, m, d);
+	const h = now.getHours();
 
-	// 今日の統計
+	const current =
-	const todayStats = await Stats.findOne({
+		span == 'day' ? new Date(y, m, d) :
-		date: today
+		span == 'hour' ? new Date(y, m, d, h) :
+		null;
+
+	// 現在(今日または今のHour)の統計
+	const currentStats = await Stats.findOne({
+		span: span,
+		date: current
 	});
 
-	// 日付が変わってから、初めてのチャート更新なら
+	if (currentStats) {
-	if (todayStats == null) {
+		return currentStats;
+	} else {
+		// 集計期間が変わってから、初めてのチャート更新なら
 		// 最も最近の統計を持ってくる
+		// * 例えば集計期間が「日」である場合で考えると、
 		// * 昨日何もチャートを更新するような出来事がなかった場合は、
-		//   統計がそもそも作られずドキュメントが存在しないということがあり得るため、
+		// * 統計がそもそも作られずドキュメントが存在しないということがあり得るため、
-		//   「昨日の」と決め打ちせずに「もっとも最近の」とします
+		// * 「昨日の」と決め打ちせずに「もっとも最近の」とします
-		const mostRecentStats = await Stats.findOne({}, {
+		const mostRecentStats = await Stats.findOne({
+			span: span
+		}, {
 			sort: {
 				date: -1
 			}
 		});
 
-		// 統計が存在しなかったら
+		if (mostRecentStats) {
-		// * Misskeyインスタンスを建てて初めてのチャート更新時など
+			// 現在の統計を初期挿入
-		if (mostRecentStats == null) {
-			// 空の統計を作成
 			const data: Omit<IStats, '_id'> = {
-				date: today,
+				span: span,
-				users: {
+				date: current,
-					local: {
-						total: 0,
-						diff: 0
-					},
-					remote: {
-						total: 0,
-						diff: 0
-					}
-				},
-				notes: {
-					local: {
-						total: 0,
-						diff: 0,
-						diffs: {
-							normal: 0,
-							reply: 0,
-							renote: 0
-						}
-					},
-					remote: {
-						total: 0,
-						diff: 0,
-						diffs: {
-							normal: 0,
-							reply: 0,
-							renote: 0
-						}
-					}
-				},
-				drive: {
-					local: {
-						totalCount: 0,
-						totalSize: 0,
-						diffCount: 0,
-						diffSize: 0
-					},
-					remote: {
-						totalCount: 0,
-						totalSize: 0,
-						diffCount: 0,
-						diffSize: 0
-					}
-				}
-			};
-
-			const stats = await Stats.insert(data);
-
-			return stats;
-		} else {
-			// 今日の統計を初期挿入
-			const data: Omit<IStats, '_id'> = {
-				date: today,
 				users: {
 					local: {
 						total: mostRecentStats.users.local.total,
@@ -136,20 +93,83 @@ async function getTodayStats(): Promise<IStats> {
 
 			const stats = await Stats.insert(data);
 
+			return stats;
+		} else {
+			// 統計が存在しなかったら
+			// * Misskeyインスタンスを建てて初めてのチャート更新時など
+
+			// 空の統計を作成
+			const emptyStat: Omit<IStats, '_id'> = {
+				span: span,
+				date: current,
+				users: {
+					local: {
+						total: 0,
+						diff: 0
+					},
+					remote: {
+						total: 0,
+						diff: 0
+					}
+				},
+				notes: {
+					local: {
+						total: 0,
+						diff: 0,
+						diffs: {
+							normal: 0,
+							reply: 0,
+							renote: 0
+						}
+					},
+					remote: {
+						total: 0,
+						diff: 0,
+						diffs: {
+							normal: 0,
+							reply: 0,
+							renote: 0
+						}
+					}
+				},
+				drive: {
+					local: {
+						totalCount: 0,
+						totalSize: 0,
+						diffCount: 0,
+						diffSize: 0
+					},
+					remote: {
+						totalCount: 0,
+						totalSize: 0,
+						diffCount: 0,
+						diffSize: 0
+					}
+				}
+			};
+
+			const stats = await Stats.insert(emptyStat);
+
 			return stats;
 		}
-	} else {
-		return todayStats;
 	}
 }
 
-async function update(inc: any) {
+function update(inc: any) {
-	const stats = await getTodayStats();
+	getCurrentStats('day').then(stats => {
+		Stats.findOneAndUpdate({
+			_id: stats._id
+		}, {
+			$inc: inc
+		});
+	});
 
-	await Stats.findOneAndUpdate({
+	getCurrentStats('hour').then(stats => {
-		_id: stats._id
+		Stats.findOneAndUpdate({
-	}, {
+			_id: stats._id
-		$inc: inc
+		}, {
+			$inc: inc
+		});
 	});
 }