From 94ef03db9ee66d1f29577fb78aafc15d5cf74431 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 24 Oct 2018 06:44:09 +0900
Subject: [PATCH] Implement federation chart

---
 locales/ja-JP.yml                             |  3 ++
 .../app/desktop/views/components/charts.vue   | 43 +++++++++++++++----
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index c2b0df6ce..6b26df069 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -606,6 +606,9 @@ desktop/views/components/charts.vue:
   drive: "ドライブ"
   network: "ネットワーク"
   charts:
+    federation: "フェデレーション"
+    federation-instances: "インスタンスの増減"
+    federation-instances-total: "インスタンスの積算"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
diff --git a/src/client/app/desktop/views/components/charts.vue b/src/client/app/desktop/views/components/charts.vue
index 8dde0cc87..2601e830e 100644
--- a/src/client/app/desktop/views/components/charts.vue
+++ b/src/client/app/desktop/views/components/charts.vue
@@ -3,6 +3,10 @@
 	<header>
 		<b>%i18n:@title%:</b>
 		<select v-model="chartType">
+			<optgroup label="%i18n:@federation%">
+				<option value="federation-instances">%i18n:@charts.federation-instances%</option>
+				<option value="federation-instances-total">%i18n:@charts.federation-instances-total%</option>
+			</optgroup>
 			<optgroup label="%i18n:@users%">
 				<option value="users">%i18n:@charts.users%</option>
 				<option value="users-total">%i18n:@charts.users-total%</option>
@@ -79,6 +83,8 @@ export default Vue.extend({
 		data(): any {
 			if (this.chart == null) return null;
 			switch (this.chartType) {
+				case 'federation-instances': return this.federationInstancesChart(false);
+				case 'federation-instances-total': return this.federationInstancesChart(true);
 				case 'users': return this.usersChart(false);
 				case 'users-total': return this.usersChart(true);
 				case 'notes': return this.notesChart('combined');
@@ -109,11 +115,13 @@ export default Vue.extend({
 		this.now = new Date();
 
 		const [perHour, perDay] = await Promise.all([Promise.all([
+			(this as any).api('charts/federation', { limit: limit, span: 'hour' }),
 			(this as any).api('charts/users', { limit: limit, span: 'hour' }),
 			(this as any).api('charts/notes', { limit: limit, span: 'hour' }),
 			(this as any).api('charts/drive', { limit: limit, span: 'hour' }),
 			(this as any).api('charts/network', { limit: limit, span: 'hour' })
 		]), Promise.all([
+			(this as any).api('charts/federation', { limit: limit, span: 'day' }),
 			(this as any).api('charts/users', { limit: limit, span: 'day' }),
 			(this as any).api('charts/notes', { limit: limit, span: 'day' }),
 			(this as any).api('charts/drive', { limit: limit, span: 'day' }),
@@ -122,16 +130,18 @@ export default Vue.extend({
 
 		const chart = {
 			perHour: {
-				users: perHour[0],
-				notes: perHour[1],
-				drive: perHour[2],
-				network: perHour[3]
+				federation: perHour[0],
+				users: perHour[1],
+				notes: perHour[2],
+				drive: perHour[3],
+				network: perHour[4]
 			},
 			perDay: {
-				users: perDay[0],
-				notes: perDay[1],
-				drive: perDay[2],
-				network: perDay[3]
+				federation: perDay[0],
+				users: perDay[1],
+				notes: perDay[2],
+				drive: perDay[3],
+				network: perDay[4]
 			}
 		};
 
@@ -156,6 +166,23 @@ export default Vue.extend({
 			return arr.map((v, i) => ({ t: this.getDate(i).getTime(), y: v }));
 		},
 
+		federationInstancesChart(total: boolean): any {
+			return [{
+				datasets: [{
+					label: 'Instances',
+					fill: true,
+					backgroundColor: rgba(colors.localPlus),
+					borderColor: colors.localPlus,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: this.format(total
+						? this.stats.federation.instance.total
+						: sum(this.stats.federation.instance.inc, negate(this.stats.federation.instance.dec)))
+				}]
+			}];
+		},
+
 		notesChart(type: string): any {
 			return [{
 				datasets: [{