From 67b28f9b6e52ca1cc5e294a3d1b2bb33ecbc2b85 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 20 Aug 2018 19:58:32 +0000
Subject: fix(package): update vue-js-modal to version 1.3.18

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 85b72a421f..db7f8da965 100644
--- a/package.json
+++ b/package.json
@@ -206,7 +206,7 @@
 		"v-animate-css": "0.0.2",
 		"vue": "2.5.17",
 		"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.3.0",
 		"vue-router": "3.0.1",
-- 
cgit v1.3.1-freya


From 3bc9a40b48e806a87da15479a0dc0c7b43d8e616 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Wed, 22 Aug 2018 09:56:30 +0000
Subject: fix(package): update webpack to version 4.17.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 03bb4796ed..3492b2c9fb 100644
--- a/package.json
+++ b/package.json
@@ -218,7 +218,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",
-- 
cgit v1.3.1-freya


From cdab596240280fe4b83a042cd206f32219d815bc Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Aug 2018 03:24:06 +0900
Subject: 7.4.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 3b40ed1767..a4cb798aef 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "7.3.0",
-	"clientVersion": "1.0.8741",
+	"version": "7.4.0",
+	"clientVersion": "1.0.8790",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From dbd3a750f55d091037fbbd1feafea0aaffc07264 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Aug 2018 03:45:04 +0900
Subject: 7.4.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index a4cb798aef..517f49adf1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "7.4.0",
+	"version": "7.4.1",
 	"clientVersion": "1.0.8790",
 	"codename": "nighthike",
 	"main": "./built/index.js",
-- 
cgit v1.3.1-freya


From 8fc1e07136d5ee203cbd1a1bc2ec00dfeb0e8cf0 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Aug 2018 15:40:24 +0900
Subject: 1時間単位での集計を追加
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cli/migration/8.0.0.js                  | 144 ++++++++++++++++++++++++++++++++
 package.json                            |   2 +-
 src/models/stats.ts                     |   2 +
 src/server/api/endpoints/admin/chart.ts |   2 +
 src/services/update-chart.ts            | 106 +++++++++++++----------
 5 files changed, 212 insertions(+), 44 deletions(-)
 create mode 100644 cli/migration/8.0.0.js

(limited to 'package.json')

diff --git a/cli/migration/8.0.0.js b/cli/migration/8.0.0.js
new file mode 100644
index 0000000000..fd6cb24525
--- /dev/null
+++ b/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();
diff --git a/package.json b/package.json
index 03f63a029d..077d30b96a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "7.4.1",
+	"version": "8.0.0",
 	"clientVersion": "1.0.8790",
 	"codename": "nighthike",
 	"main": "./built/index.js",
diff --git a/src/models/stats.ts b/src/models/stats.ts
index 7bff475c63..c481c3196e 100644
--- a/src/models/stats.ts
+++ b/src/models/stats.ts
@@ -10,6 +10,8 @@ export interface IStats {
 
 	date: Date;
 
+	span: 'day' | 'hour';
+
 	/**
 	 * ユーザーに関する統計
 	 */
diff --git a/src/server/api/endpoints/admin/chart.ts b/src/server/api/endpoints/admin/chart.ts
index a0566b11f5..c351c7167d 100644
--- a/src/server/api/endpoints/admin/chart.ts
+++ b/src/server/api/endpoints/admin/chart.ts
@@ -14,6 +14,7 @@ export default (params: any) => new Promise(async (res, rej) => {
 	const d = now.getDate();
 
 	const stats = await Stats.find({
+		span: 'day',
 		date: {
 			$gt: new Date(y - 1, m, d)
 		}
@@ -44,6 +45,7 @@ export default (params: any) => new Promise(async (res, rej) => {
 			} else {
 				chart.unshift({
 					date: day,
+					span: 'day',
 					users: {
 						local: {
 							total: 0,
diff --git a/src/services/update-chart.ts b/src/services/update-chart.ts
index 6b69adbdc3..0a0f58bb92 100644
--- a/src/services/update-chart.ts
+++ b/src/services/update-chart.ts
@@ -5,49 +5,59 @@ 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 todayStats = await Stats.findOne({
-		date: today
+	const current =
+		span == 'day' ? new Date(y, m, d) :
+		span == 'hour' ? new Date(y, m, d, h) :
+		null;
+
+	// 現在(今日または今のHour)の統計
+	const currentStats = await Stats.findOne({
+		span: span,
+		date: current
 	});
 
-	// 日付が変わってから、初めてのチャート更新なら
-	if (todayStats == null) {
+	if (currentStats) {
+		return currentStats;
+	} else {
+		// 集計期間が変わってから、初めてのチャート更新なら
 		// 最も最近の統計を持ってくる
+		// * 例えば集計期間が「日」である場合で考えると、
 		// * 昨日何もチャートを更新するような出来事がなかった場合は、
-		//   統計がそもそも作られずドキュメントが存在しないということがあり得るため、
-		//   「昨日の」と決め打ちせずに「もっとも最近の」とします
-		const mostRecentStats = await Stats.findOne({}, {
+		// * 統計がそもそも作られずドキュメントが存在しないということがあり得るため、
+		// * 「昨日の」と決め打ちせずに「もっとも最近の」とします
+		const mostRecentStats = await Stats.findOne({
+			span: span
+		}, {
 			sort: {
 				date: -1
 			}
 		});
 
-		// 統計が存在しなかったら
-		// * Misskeyインスタンスを建てて初めてのチャート更新時など
-		if (mostRecentStats == null) {
-			// 空の統計を作成
+		if (mostRecentStats) {
+			// 現在の統計を初期挿入
 			const data: Omit<IStats, '_id'> = {
-				date: today,
+				span: span,
+				date: current,
 				users: {
 					local: {
-						total: 0,
+						total: mostRecentStats.users.local.total,
 						diff: 0
 					},
 					remote: {
-						total: 0,
+						total: mostRecentStats.users.remote.total,
 						diff: 0
 					}
 				},
 				notes: {
 					local: {
-						total: 0,
+						total: mostRecentStats.notes.local.total,
 						diff: 0,
 						diffs: {
 							normal: 0,
@@ -56,7 +66,7 @@ async function getTodayStats(): Promise<IStats> {
 						}
 					},
 					remote: {
-						total: 0,
+						total: mostRecentStats.notes.remote.total,
 						diff: 0,
 						diffs: {
 							normal: 0,
@@ -67,14 +77,14 @@ async function getTodayStats(): Promise<IStats> {
 				},
 				drive: {
 					local: {
-						totalCount: 0,
-						totalSize: 0,
+						totalCount: mostRecentStats.drive.local.totalCount,
+						totalSize: mostRecentStats.drive.local.totalSize,
 						diffCount: 0,
 						diffSize: 0
 					},
 					remote: {
-						totalCount: 0,
-						totalSize: 0,
+						totalCount: mostRecentStats.drive.remote.totalCount,
+						totalSize: mostRecentStats.drive.remote.totalSize,
 						diffCount: 0,
 						diffSize: 0
 					}
@@ -85,22 +95,26 @@ async function getTodayStats(): Promise<IStats> {
 
 			return stats;
 		} else {
-			// 今日の統計を初期挿入
-			const data: Omit<IStats, '_id'> = {
-				date: today,
+			// 統計が存在しなかったら
+			// * Misskeyインスタンスを建てて初めてのチャート更新時など
+
+			// 空の統計を作成
+			const emptyStat: Omit<IStats, '_id'> = {
+				span: span,
+				date: current,
 				users: {
 					local: {
-						total: mostRecentStats.users.local.total,
+						total: 0,
 						diff: 0
 					},
 					remote: {
-						total: mostRecentStats.users.remote.total,
+						total: 0,
 						diff: 0
 					}
 				},
 				notes: {
 					local: {
-						total: mostRecentStats.notes.local.total,
+						total: 0,
 						diff: 0,
 						diffs: {
 							normal: 0,
@@ -109,7 +123,7 @@ async function getTodayStats(): Promise<IStats> {
 						}
 					},
 					remote: {
-						total: mostRecentStats.notes.remote.total,
+						total: 0,
 						diff: 0,
 						diffs: {
 							normal: 0,
@@ -120,36 +134,42 @@ async function getTodayStats(): Promise<IStats> {
 				},
 				drive: {
 					local: {
-						totalCount: mostRecentStats.drive.local.totalCount,
-						totalSize: mostRecentStats.drive.local.totalSize,
+						totalCount: 0,
+						totalSize: 0,
 						diffCount: 0,
 						diffSize: 0
 					},
 					remote: {
-						totalCount: mostRecentStats.drive.remote.totalCount,
-						totalSize: mostRecentStats.drive.remote.totalSize,
+						totalCount: 0,
+						totalSize: 0,
 						diffCount: 0,
 						diffSize: 0
 					}
 				}
 			};
 
-			const stats = await Stats.insert(data);
+			const stats = await Stats.insert(emptyStat);
 
 			return stats;
 		}
-	} else {
-		return todayStats;
 	}
 }
 
-async function update(inc: any) {
-	const stats = await getTodayStats();
+function update(inc: any) {
+	getCurrentStats('day').then(stats => {
+		Stats.findOneAndUpdate({
+			_id: stats._id
+		}, {
+			$inc: inc
+		});
+	});
 
-	await Stats.findOneAndUpdate({
-		_id: stats._id
-	}, {
-		$inc: inc
+	getCurrentStats('hour').then(stats => {
+		Stats.findOneAndUpdate({
+			_id: stats._id
+		}, {
+			$inc: inc
+		});
 	});
 }
 
-- 
cgit v1.3.1-freya


From 31ed8949b951eb5724a9b782f76f5780b385ebee Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Aug 2018 16:37:32 +0900
Subject: 8.1.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 077d30b96a..e2c9283bf0 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.0.0",
-	"clientVersion": "1.0.8790",
+	"version": "8.1.0",
+	"clientVersion": "1.0.8811",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From 4ae10ab33d0b3c29b10013d6fabe3d000ed6daa5 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Thu, 23 Aug 2018 14:46:37 +0000
Subject: fix(package): update vue-js-modal to version 1.3.19

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index e2c9283bf0..5b5e1849d6 100644
--- a/package.json
+++ b/package.json
@@ -207,7 +207,7 @@
 		"v-animate-css": "0.0.2",
 		"vue": "2.5.17",
 		"vue-cropperjs": "2.2.1",
-		"vue-js-modal": "1.3.18",
+		"vue-js-modal": "1.3.19",
 		"vue-json-tree-view": "2.1.4",
 		"vue-loader": "15.4.0",
 		"vue-router": "3.0.1",
-- 
cgit v1.3.1-freya


From 155d49e8ac8c87f5b78d30990f4a474bbfd9b2ef Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Thu, 23 Aug 2018 18:16:46 +0000
Subject: fix(package): update @types/sharp to version 0.17.10

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index e2c9283bf0..53ff31de6a 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
 		"@types/request-promise-native": "1.0.15",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.27",
-		"@types/sharp": "0.17.9",
+		"@types/sharp": "0.17.10",
 		"@types/showdown": "1.7.5",
 		"@types/single-line-log": "1.1.0",
 		"@types/speakeasy": "2.0.2",
-- 
cgit v1.3.1-freya


From b70e9824ac20d6e43ca0148bf00bca7df20e4696 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Thu, 23 Aug 2018 18:26:42 +0000
Subject: fix(package): update @types/webpack to version 4.4.11

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index e2c9283bf0..e19c675651 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
 		"@types/systeminformation": "3.23.0",
 		"@types/tmp": "0.0.33",
 		"@types/uuid": "3.4.3",
-		"@types/webpack": "4.4.10",
+		"@types/webpack": "4.4.11",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.39",
 		"@types/ws": "6.0.0",
-- 
cgit v1.3.1-freya


From 4dee7d91b17148c5c3ee12c3bee193fccaeb22b6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 Aug 2018 05:37:19 +0900
Subject: Better charts

---
 locales/ja-JP.yml                                  |  28 +--
 package.json                                       |   2 +
 .../desktop/views/pages/admin/admin.chart.chart.ts |  40 +++++
 .../app/desktop/views/pages/admin/admin.chart.vue  | 195 +++++++++++++++++++++
 .../views/pages/admin/admin.drive-chart.chart.vue  |  74 --------
 .../views/pages/admin/admin.drive-chart.vue        |  34 ----
 .../views/pages/admin/admin.notes-chart.chart.vue  |  99 -----------
 .../views/pages/admin/admin.notes-chart.vue        |  34 ----
 .../views/pages/admin/admin.users-chart.chart.vue  |  74 --------
 .../views/pages/admin/admin.users-chart.vue        |  34 ----
 src/client/app/desktop/views/pages/admin/admin.vue |  12 +-
 src/server/api/endpoints/admin/chart.ts            |   3 +-
 12 files changed, 255 insertions(+), 374 deletions(-)
 create mode 100644 src/client/app/desktop/views/pages/admin/admin.chart.chart.ts
 create mode 100644 src/client/app/desktop/views/pages/admin/admin.chart.vue
 delete mode 100644 src/client/app/desktop/views/pages/admin/admin.drive-chart.chart.vue
 delete mode 100644 src/client/app/desktop/views/pages/admin/admin.drive-chart.vue
 delete mode 100644 src/client/app/desktop/views/pages/admin/admin.notes-chart.chart.vue
 delete mode 100644 src/client/app/desktop/views/pages/admin/admin.notes-chart.vue
 delete mode 100644 src/client/app/desktop/views/pages/admin/admin.users-chart.chart.vue
 delete mode 100644 src/client/app/desktop/views/pages/admin/admin.users-chart.vue

(limited to 'package.json')

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index dfcdb59e1c..31b81f1d7e 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -939,20 +939,20 @@ desktop/views/pages/admin/admin.unverify-user.vue:
   unverify: "公式アカウントを解除する"
   unverified: "公式アカウントを解除しました"
 
-desktop/views/pages/admin/admin.notes-chart.vue:
-  title: "投稿"
-  local: "ローカル"
-  remote: "リモート"
-
-desktop/views/pages/admin/admin.users-chart.vue:
-  title: "ユーザー"
-  local: "ローカル"
-  remote: "リモート"
-
-desktop/views/pages/admin/admin.drive-chart.vue:
-  title: "ドライブ"
-  local: "ローカル"
-  remote: "リモート"
+desktop/views/pages/admin/admin.chart.vue:
+  title: "チャート"
+  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: "リモートのドライブ使用量 (累計)"
 
 desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "メディア投稿のみ"
diff --git a/package.json b/package.json
index e2c9283bf0..3c95d05416 100644
--- a/package.json
+++ b/package.json
@@ -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",
@@ -206,6 +207,7 @@
 		"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.18",
 		"vue-json-tree-view": "2.1.4",
diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts b/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts
new file mode 100644
index 0000000000..62043b21dc
--- /dev/null
+++ b/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts
@@ -0,0 +1,40 @@
+import Vue from 'vue';
+import { Line } from 'vue-chartjs';
+
+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, Object.assign({
+				responsive: false,
+				scales: {
+					xAxes: [{
+						type: 'time',
+						time: {
+							displayFormats: {
+								quarter: 'YYYY/MM/D h:mm'
+							}
+						},
+						distribution: 'series'
+					}]
+				}
+			}, this.opts || {}));
+		}
+	}
+});
diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.vue b/src/client/app/desktop/views/pages/admin/admin.chart.vue
new file mode 100644
index 0000000000..c92caeb2f0
--- /dev/null
+++ b/src/client/app/desktop/views/pages/admin/admin.chart.vue
@@ -0,0 +1,195 @@
+<template>
+<div class="card gkgckalzgidaygcxnugepioremxvxvpt">
+	<header>
+		<b>%i18n:@title%:</b>
+		<select v-model="chartType">
+			<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="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="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>
+		</select>
+		<div>
+			<a @click="span = 'day'">Per DAY</a> | <a @click="span = 'hour'">Per HOUR</a>
+		</div>
+	</header>
+	<x-chart v-if="chart" :data="data[0]" :opts="data[1]" :width="720" :height="300"/>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import XChart from './admin.chart.chart.ts';
+
+export default Vue.extend({
+	components: {
+		XChart
+	},
+	props: {
+		chart: {
+			required: true
+		}
+	},
+	data() {
+		return {
+			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);
+			}
+		},
+		stats(): any[] {
+			return (
+				this.span == 'day' ? this.chart.perDay :
+				this.span == 'hour' ? this.chart.perHour :
+				null
+			);
+		}
+	},
+	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,
+				total: local ? x.notes.local.diff : x.notes.remote.diff
+			}));
+
+			return [{
+				datasets: [{
+					label: 'Normal',
+					fill: false,
+					borderColor: '#41ddde',
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.normal }))
+				}, {
+					label: 'Replies',
+					fill: false,
+					borderColor: '#f7796c',
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.reply }))
+				}, {
+					label: 'Renotes',
+					fill: false,
+					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: 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 }))
+				}]
+			}, {
+				scales: {
+					yAxes: [{
+						ticks: {
+							callback: (value) => {
+								return Vue.filter('bytes')(value);
+							}
+						}
+					}]
+				}
+			}];
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+.gkgckalzgidaygcxnugepioremxvxvpt
+	> header
+		display flex
+
+		> b
+			margin-right 8px
+
+		> *:last-child
+			margin-left auto
+
+</style>
diff --git a/src/client/app/desktop/views/pages/admin/admin.drive-chart.chart.vue b/src/client/app/desktop/views/pages/admin/admin.drive-chart.chart.vue
deleted file mode 100644
index 97f05571c3..0000000000
--- a/src/client/app/desktop/views/pages/admin/admin.drive-chart.chart.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-<div>
-	<a @click="span = 'day'">Per day</a> | <a @click="span = 'hour'">Per hour</a>
-	<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`">
-		<polyline
-			:points="points"
-			fill="none"
-			stroke-width="0.3"
-			stroke="#555"/>
-	</svg>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		chart: {
-			required: true
-		},
-		type: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			viewBoxX: 100,
-			viewBoxY: 30,
-			points: null,
-			span: 'day'
-		};
-	},
-	computed: {
-		stats(): any[] {
-			return (
-				this.span == 'day' ? this.chart.perDay :
-				this.span == 'hour' ? this.chart.perHour :
-				null
-			);
-		}
-	},
-	watch: {
-		stats() {
-			this.render();
-		}
-	},
-	mounted() {
-		this.render();
-	},
-	methods: {
-		render() {
-			const peak = Math.max.apply(null, this.stats.map(d => this.type == 'local' ? d.drive.local.totalSize : d.drive.remote.totalSize));
-
-			if (peak != 0) {
-				const data = this.stats.slice().reverse().map(x => ({
-					size: this.type == 'local' ? x.drive.local.totalSize : x.drive.remote.totalSize
-				}));
-
-				this.points = data.map((d, i) => `${(this.viewBoxX / data.length) * i},${(1 - (d.size / peak)) * this.viewBoxY}`).join(' ');
-			}
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-svg
-	display block
-	padding 10px
-	width 100%
-
-</style>
diff --git a/src/client/app/desktop/views/pages/admin/admin.drive-chart.vue b/src/client/app/desktop/views/pages/admin/admin.drive-chart.vue
deleted file mode 100644
index 4f94fd2372..0000000000
--- a/src/client/app/desktop/views/pages/admin/admin.drive-chart.vue
+++ /dev/null
@@ -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>
diff --git a/src/client/app/desktop/views/pages/admin/admin.notes-chart.chart.vue b/src/client/app/desktop/views/pages/admin/admin.notes-chart.chart.vue
deleted file mode 100644
index fabb3f1bd1..0000000000
--- a/src/client/app/desktop/views/pages/admin/admin.notes-chart.chart.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-<div>
-	<a @click="span = 'day'">Per day</a> | <a @click="span = 'hour'">Per hour</a>
-	<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`">
-		<polyline
-			:points="pointsNote"
-			fill="none"
-			stroke-width="0.3"
-			stroke="#41ddde"/>
-		<polyline
-			:points="pointsReply"
-			fill="none"
-			stroke-width="0.3"
-			stroke="#f7796c"/>
-		<polyline
-			:points="pointsRenote"
-			fill="none"
-			stroke-width="0.3"
-			stroke="#a1de41"/>
-		<polyline
-			:points="pointsTotal"
-			fill="none"
-			stroke-width="0.3"
-			stroke="#555"
-			stroke-dasharray="1 1"/>
-	</svg>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		chart: {
-			required: true
-		},
-		type: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			viewBoxX: 100,
-			viewBoxY: 30,
-			pointsNote: null,
-			pointsReply: null,
-			pointsRenote: null,
-			pointsTotal: null,
-			span: 'day'
-		};
-	},
-	computed: {
-		stats(): any[] {
-			return (
-				this.span == 'day' ? this.chart.perDay :
-				this.span == 'hour' ? this.chart.perHour :
-				null
-			);
-		}
-	},
-	watch: {
-		stats() {
-			this.render();
-		}
-	},
-	mounted() {
-		this.render();
-	},
-	methods: {
-		render() {
-			const peak = Math.max.apply(null, this.stats.map(d => this.type == 'local' ? d.notes.local.diff : d.notes.remote.diff));
-
-			if (peak != 0) {
-				const data = this.stats.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) => `${(this.viewBoxX / data.length) * i},${(1 - (d.normal / peak)) * this.viewBoxY}`).join(' ');
-				this.pointsReply = data.map((d, i) => `${(this.viewBoxX / data.length) * i},${(1 - (d.reply / peak)) * this.viewBoxY}`).join(' ');
-				this.pointsRenote = data.map((d, i) => `${(this.viewBoxX / data.length) * i},${(1 - (d.renote / peak)) * this.viewBoxY}`).join(' ');
-				this.pointsTotal = data.map((d, i) => `${(this.viewBoxX / data.length) * i},${(1 - (d.total / peak)) * this.viewBoxY}`).join(' ');
-			}
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-svg
-	display block
-	padding 10px
-	width 100%
-
-</style>
diff --git a/src/client/app/desktop/views/pages/admin/admin.notes-chart.vue b/src/client/app/desktop/views/pages/admin/admin.notes-chart.vue
deleted file mode 100644
index e4d396d9c6..0000000000
--- a/src/client/app/desktop/views/pages/admin/admin.notes-chart.vue
+++ /dev/null
@@ -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>
diff --git a/src/client/app/desktop/views/pages/admin/admin.users-chart.chart.vue b/src/client/app/desktop/views/pages/admin/admin.users-chart.chart.vue
deleted file mode 100644
index 45ecc13929..0000000000
--- a/src/client/app/desktop/views/pages/admin/admin.users-chart.chart.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-<div>
-	<a @click="span = 'day'">Per day</a> | <a @click="span = 'hour'">Per hour</a>
-	<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`">
-		<polyline
-			:points="points"
-			fill="none"
-			stroke-width="0.3"
-			stroke="#555"/>
-	</svg>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		chart: {
-			required: true
-		},
-		type: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			viewBoxX: 100,
-			viewBoxY: 30,
-			points: null,
-			span: 'day'
-		};
-	},
-	computed: {
-		stats(): any[] {
-			return (
-				this.span == 'day' ? this.chart.perDay :
-				this.span == 'hour' ? this.chart.perHour :
-				null
-			);
-		}
-	},
-	watch: {
-		stats() {
-			this.render();
-		}
-	},
-	mounted() {
-		this.render();
-	},
-	methods: {
-		render() {
-			const peak = Math.max.apply(null, this.stats.map(d => this.type == 'local' ? d.users.local.diff : d.users.remote.diff));
-
-			if (peak != 0) {
-				const data = this.stats.slice().reverse().map(x => ({
-					count: this.type == 'local' ? x.users.local.diff : x.users.remote.diff
-				}));
-
-				this.points = data.map((d, i) => `${(this.viewBoxX / data.length) * i},${(1 - (d.count / peak)) * this.viewBoxY}`).join(' ');
-			}
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-svg
-	display block
-	padding 10px
-	width 100%
-
-</style>
diff --git a/src/client/app/desktop/views/pages/admin/admin.users-chart.vue b/src/client/app/desktop/views/pages/admin/admin.users-chart.vue
deleted file mode 100644
index e620012702..0000000000
--- a/src/client/app/desktop/views/pages/admin/admin.users-chart.vue
+++ /dev/null
@@ -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>
diff --git a/src/client/app/desktop/views/pages/admin/admin.vue b/src/client/app/desktop/views/pages/admin/admin.vue
index cbb1890cc3..066c1a4f4f 100644
--- a/src/client/app/desktop/views/pages/admin/admin.vue
+++ b/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-notes-chart :chart="chart"/>
-			<x-drive-chart :chart="chart"/>
+			<x-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 XNotesChart from "./admin.notes-chart.vue";
-import XDriveChart from "./admin.drive-chart.vue";
+import XChart from "./admin.chart.vue";
 
 export default Vue.extend({
 	components: {
@@ -45,9 +41,7 @@ export default Vue.extend({
 		XUnsuspendUser,
 		XVerifyUser,
 		XUnverifyUser,
-		XUsersChart,
-		XNotesChart,
-		XDriveChart
+		XChart
 	},
 	data() {
 		return {
diff --git a/src/server/api/endpoints/admin/chart.ts b/src/server/api/endpoints/admin/chart.ts
index 1897879d65..1b88af00bd 100644
--- a/src/server/api/endpoints/admin/chart.ts
+++ b/src/server/api/endpoints/admin/chart.ts
@@ -8,7 +8,7 @@ export const meta = {
 };
 
 export default (params: any) => new Promise(async (res, rej) => {
-	const daysRange = 365;
+	const daysRange = 90;
 	const hoursRange = 24;
 
 	const now = new Date();
@@ -123,7 +123,6 @@ export default (params: any) => new Promise(async (res, rej) => {
 		}
 
 		chart.forEach(x => {
-			delete x.date;
 			delete (x as any).span;
 		});
 
-- 
cgit v1.3.1-freya


From 93b2b82993eaad6b3d3b29f7929389724e19babc Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 Aug 2018 05:37:42 +0900
Subject: 8.2.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 3c95d05416..9b42b71123 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.1.0",
-	"clientVersion": "1.0.8811",
+	"version": "8.2.0",
+	"clientVersion": "1.0.8818",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From 03b20e11ca8c8911a587b7104ce5f261c8d1bbd6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 Aug 2018 06:42:40 +0900
Subject: 8.3.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 9b42b71123..99a672e636 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.2.0",
-	"clientVersion": "1.0.8818",
+	"version": "8.3.0",
+	"clientVersion": "1.0.8825",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From 92cf205c6669abde283ae13491cd1a07da32a98a Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 Aug 2018 07:02:52 +0900
Subject: Fix bug

---
 package.json                                                  | 1 +
 src/client/app/desktop/views/pages/admin/admin.chart.chart.ts | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 99a672e636..e362adbfe3 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts b/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts
index d79b0ba192..c09dc6dd8c 100644
--- a/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts
+++ b/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,7 +22,7 @@ export default Vue.extend({
 	},
 	methods: {
 		render() {
-			this.renderChart(this.data, Object.assign({
+			this.renderChart(this.data, mergeOptions({
 				responsive: false,
 				scales: {
 					xAxes: [{
-- 
cgit v1.3.1-freya


From 027140eccc679c32362b5061a84d9f77a863262d Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 Aug 2018 07:03:25 +0900
Subject: 8.3.1

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index e362adbfe3..d3bfc27cfe 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.3.0",
-	"clientVersion": "1.0.8825",
+	"version": "8.3.1",
+	"clientVersion": "1.0.8828",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From 2bad3865a3955f89106a9e259b7e3840a392e0bf Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 Aug 2018 07:17:40 +0900
Subject: 8.4.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index d3bfc27cfe..6ec8682211 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.3.1",
-	"clientVersion": "1.0.8828",
+	"version": "8.4.0",
+	"clientVersion": "1.0.8831",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From 4517bf7342c6736052333014b338fb4c20cde3aa Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 Aug 2018 07:23:42 +0900
Subject: 8.5.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

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,
-- 
cgit v1.3.1-freya


From 9cda89ec0427515543ca9074966b31a5439b05db Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 Aug 2018 08:35:38 +0900
Subject: 8.5.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 9c20b519c9..bed188faaf 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.5.0",
+	"version": "8.5.1",
 	"clientVersion": "1.0.8834",
 	"codename": "nighthike",
 	"main": "./built/index.js",
-- 
cgit v1.3.1-freya


From 69fa2373cbce946b642f6fa41c9ecdae547da672 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 Aug 2018 08:57:31 +0900
Subject: 8.6.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index bed188faaf..1b34609ab0 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.5.1",
-	"clientVersion": "1.0.8834",
+	"version": "8.6.0",
+	"clientVersion": "1.0.8838",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From fd497ef1054abc9c21ee73f0699e1a1f2b5e9742 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 Aug 2018 09:39:37 +0900
Subject: 8.7.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 1b34609ab0..45b10ebf82 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.6.0",
-	"clientVersion": "1.0.8838",
+	"version": "8.7.0",
+	"clientVersion": "1.0.8840",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From d6753f2cf2fc3b31a118301919cbb984699d25b7 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 24 Aug 2018 00:40:11 +0000
Subject: fix(package): update @types/node to version 10.9.1

Closes #2431
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 1b34609ab0..054b22a630 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
 		"@types/mocha": "5.2.3",
 		"@types/mongodb": "3.1.4",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.7.1",
+		"@types/node": "10.9.1",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.2.0",
-- 
cgit v1.3.1-freya


From b70e22c150d7468024f50049bb50f5026da13bba Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 Aug 2018 15:01:30 +0900
Subject: 8.8.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 45b10ebf82..f859120dee 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.7.0",
-	"clientVersion": "1.0.8840",
+	"version": "8.8.0",
+	"clientVersion": "1.0.8842",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From 94ba9c84371e6945ab8ca4fc0c3dd2119695ad8c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 Aug 2018 08:40:16 +0900
Subject: 8.9.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index ee70c97513..32cafda27d 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.8.0",
-	"clientVersion": "1.0.8842",
+	"version": "8.9.0",
+	"clientVersion": "1.0.8950",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From d7fa92d58f11fed0a4aeaf4e72edf04f5e0c65d3 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 Aug 2018 10:28:28 +0900
Subject: 8.9.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 32cafda27d..16d4637d73 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.9.0",
+	"version": "8.9.1",
 	"clientVersion": "1.0.8950",
 	"codename": "nighthike",
 	"main": "./built/index.js",
-- 
cgit v1.3.1-freya


From fb4aa9bc1ceafc216602f2fac32af83094c54b6f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 Aug 2018 11:10:38 +0900
Subject: 8.9.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 16d4637d73..484051d7b6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.9.1",
+	"version": "8.9.2",
 	"clientVersion": "1.0.8950",
 	"codename": "nighthike",
 	"main": "./built/index.js",
-- 
cgit v1.3.1-freya


From 86e76358b1466263aad4b0b3eb27d2ed4c9dad06 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 Aug 2018 12:44:06 +0900
Subject: 8.10.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 484051d7b6..89954c7bae 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.9.2",
-	"clientVersion": "1.0.8950",
+	"version": "8.10.0",
+	"clientVersion": "1.0.8972",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From 366e0d6bde2996d109ff7b2e7f2a0c2c8b92a07c Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 25 Aug 2018 04:40:46 +0000
Subject: fix(package): update @types/node to version 10.9.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 89954c7bae..c55a677bea 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
 		"@types/mocha": "5.2.3",
 		"@types/mongodb": "3.1.4",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.9.1",
+		"@types/node": "10.9.2",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.2.0",
-- 
cgit v1.3.1-freya


From 2b556aba03abc954d2ba412e038b3ca23d505f9e Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 Aug 2018 15:34:10 +0900
Subject: 8.11.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index c55a677bea..eac4025388 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.10.0",
-	"clientVersion": "1.0.8972",
+	"version": "8.11.0",
+	"clientVersion": "1.0.8979",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From a149c121fb1f71e5ffc2e0553a271f87681f21c1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 Aug 2018 15:40:47 +0900
Subject: 8.11.1

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index eac4025388..e9cb7c8d2a 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.11.0",
-	"clientVersion": "1.0.8979",
+	"version": "8.11.1",
+	"clientVersion": "1.0.8981",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From 990a583e5e0d9f96b23e46c5ab9b166226783504 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 25 Aug 2018 16:34:41 +0900
Subject: 8.12.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index e9cb7c8d2a..fde0f82802 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.11.1",
+	"version": "8.12.0",
 	"clientVersion": "1.0.8981",
 	"codename": "nighthike",
 	"main": "./built/index.js",
-- 
cgit v1.3.1-freya


From ce2d2a10c10f9980c49f97d0cd9e28bf3b788fad Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 25 Aug 2018 08:56:01 +0000
Subject: fix(package): update systeminformation to version 3.43.0

Closes #2477
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index fde0f82802..f1e7cccc2c 100644
--- a/package.json
+++ b/package.json
@@ -194,7 +194,7 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.1.4",
-		"systeminformation": "3.42.9",
+		"systeminformation": "3.43.0",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
 		"tmp": "0.0.33",
-- 
cgit v1.3.1-freya


From a84fa307740b48aee3626779b9462f647fcda999 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 Aug 2018 19:46:12 +0900
Subject: 8.13.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index fde0f82802..7ac8b3ddcb 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.12.0",
-	"clientVersion": "1.0.8981",
+	"version": "8.13.0",
+	"clientVersion": "1.0.9001",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From bc9c7efe8578d6e82bf874b1f3cebe9763cececf Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 25 Aug 2018 11:19:17 +0000
Subject: fix(package): update systeminformation to version 3.44.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 8562e6f6c4..296e8e0ef4 100644
--- a/package.json
+++ b/package.json
@@ -194,7 +194,7 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.1.4",
-		"systeminformation": "3.43.0",
+		"systeminformation": "3.44.0",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
 		"tmp": "0.0.33",
-- 
cgit v1.3.1-freya


From c624da70ef72ddb72d27554591f6efab75fdaf78 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 25 Aug 2018 12:45:23 +0000
Subject: fix(package): update nan to version 2.11.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 8562e6f6c4..4b94cee39d 100644
--- a/package.json
+++ b/package.json
@@ -158,7 +158,7 @@
 		"mongodb": "3.1.1",
 		"monk": "6.0.6",
 		"ms": "2.1.1",
-		"nan": "2.10.0",
+		"nan": "2.11.0",
 		"nested-property": "0.0.7",
 		"node-sass": "4.9.3",
 		"node-sass-json-importer": "3.3.1",
-- 
cgit v1.3.1-freya


From ecf2eb473817779172f9dbaab34635461f52c676 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 26 Aug 2018 02:33:04 +0900
Subject: 8.14.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 8562e6f6c4..8bde6935b8 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.13.0",
-	"clientVersion": "1.0.9001",
+	"version": "8.14.0",
+	"clientVersion": "1.0.9022",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From 6806eafaed968fd362e906f23fba15196e9fa887 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sun, 26 Aug 2018 02:26:22 +0000
Subject: fix(package): update vue-loader to version 15.4.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 8bde6935b8..f41a631f3e 100644
--- a/package.json
+++ b/package.json
@@ -212,7 +212,7 @@
 		"vue-cropperjs": "2.2.1",
 		"vue-js-modal": "1.3.19",
 		"vue-json-tree-view": "2.1.4",
-		"vue-loader": "15.4.0",
+		"vue-loader": "15.4.1",
 		"vue-router": "3.0.1",
 		"vue-style-loader": "4.1.2",
 		"vue-template-compiler": "2.5.17",
-- 
cgit v1.3.1-freya


From 8e5ce7f8e3757d848440fc1368735935b7e81539 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 27 Aug 2018 04:56:38 +0900
Subject: 8.15.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 8bde6935b8..c84f01fc51 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.14.0",
-	"clientVersion": "1.0.9022",
+	"version": "8.15.0",
+	"clientVersion": "1.0.9031",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
-- 
cgit v1.3.1-freya


From ba6cd874aa41230e4cc98800d0d407bf3e94a55b Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 27 Aug 2018 15:41:07 +0000
Subject: fix(package): update vue-js-modal to version 1.3.20

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index c84f01fc51..a3b50c5713 100644
--- a/package.json
+++ b/package.json
@@ -210,7 +210,7 @@
 		"vue": "2.5.17",
 		"vue-chartjs": "3.4.0",
 		"vue-cropperjs": "2.2.1",
-		"vue-js-modal": "1.3.19",
+		"vue-js-modal": "1.3.20",
 		"vue-json-tree-view": "2.1.4",
 		"vue-loader": "15.4.0",
 		"vue-router": "3.0.1",
-- 
cgit v1.3.1-freya


From c7bda6f908c355bde3d7bf4cf0d4c706a968d606 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 27 Aug 2018 18:05:30 +0000
Subject: fix(package): update style-loader to version 0.23.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index c84f01fc51..83f63ee0a6 100644
--- a/package.json
+++ b/package.json
@@ -190,7 +190,7 @@
 		"single-line-log": "1.1.2",
 		"speakeasy": "2.0.0",
 		"stringz": "1.0.0",
-		"style-loader": "0.22.1",
+		"style-loader": "0.23.0",
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.1.4",
-- 
cgit v1.3.1-freya


From f8340be3bfc2dc0a28aad3bcb27a537a9e5647f0 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 28 Aug 2018 20:36:04 +0000
Subject: fix(package): update @types/elasticsearch to version 5.0.26

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index c68983411e..e08bfae57b 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
 		"@types/debug": "0.0.30",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.0",
-		"@types/elasticsearch": "5.0.25",
+		"@types/elasticsearch": "5.0.26",
 		"@types/file-type": "5.2.1",
 		"@types/gulp": "3.8.36",
 		"@types/gulp-htmlmin": "1.3.32",
-- 
cgit v1.3.1-freya


From b99eabb2cf196cadaecdce1eb9cef083777aa1ce Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Wed, 29 Aug 2018 00:57:08 +0000
Subject: fix(package): update vue-js-modal to version 1.3.23

Closes #2517
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index e08bfae57b..8f5824f2dc 100644
--- a/package.json
+++ b/package.json
@@ -210,7 +210,7 @@
 		"vue": "2.5.17",
 		"vue-chartjs": "3.4.0",
 		"vue-cropperjs": "2.2.1",
-		"vue-js-modal": "1.3.20",
+		"vue-js-modal": "1.3.23",
 		"vue-json-tree-view": "2.1.4",
 		"vue-loader": "15.4.1",
 		"vue-router": "3.0.1",
-- 
cgit v1.3.1-freya


From 9bef723346a3c45727634d50831c9f99e2244b2e Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Wed, 29 Aug 2018 01:08:49 +0000
Subject: fix(package): update systeminformation to version 3.44.2

Closes #2519
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index e08bfae57b..d39e195e2e 100644
--- a/package.json
+++ b/package.json
@@ -194,7 +194,7 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.1.4",
-		"systeminformation": "3.44.0",
+		"systeminformation": "3.44.2",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
 		"tmp": "0.0.33",
-- 
cgit v1.3.1-freya


From 62f966dc27fc74eb34fc92b50b64a35ba4e473cf Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Wed, 29 Aug 2018 02:19:40 +0000
Subject: fix(package): update @types/node to version 10.9.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index e85fe41363..eea3f363c3 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
 		"@types/mocha": "5.2.3",
 		"@types/mongodb": "3.1.4",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.9.2",
+		"@types/node": "10.9.3",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.2.0",
-- 
cgit v1.3.1-freya