Merge branch 'master' into greenkeeper/@types/chai-http-3.0.2

10 files changed, 482 insertions, 2 deletions

diff --git a/src/web/app/common/scripts/config.js b/src/web/app/common/scripts/config.js
index 16f75d6e16..75a7abba29 100644
--- a/src/web/app/common/scripts/config.js
+++ b/src/web/app/common/scripts/config.js
@@ -8,6 +8,8 @@ const url = `${scheme}//${host}`;
 const apiUrl = `${scheme}//api.${host}`;
 const devUrl = `${scheme}//dev.${host}`;
 const aboutUrl = `${scheme}//about.${host}`;
+const statsUrl = `${scheme}//stats.${host}`;
+const statusUrl = `${scheme}//status.${host}`;
 
 export default {
 	host,
@@ -15,5 +17,7 @@ export default {
 	url,
 	apiUrl,
 	devUrl,
-	aboutUrl
+	aboutUrl,
+	statsUrl,
+	statusUrl
 };
diff --git a/src/web/app/desktop/tags/home-widgets/nav.tag b/src/web/app/desktop/tags/home-widgets/nav.tag
index 304be8f954..499d66014b 100644
--- a/src/web/app/desktop/tags/home-widgets/nav.tag
+++ b/src/web/app/desktop/tags/home-widgets/nav.tag
@@ -1,4 +1,4 @@
-<mk-nav-home-widget><a href={ CONFIG.aboutUrl }>Misskeyについて</a><i>・</i><a href={ CONFIG.aboutUrl + '/status' }>ステータス</a><i>・</i><a href="http://zawazawa.jp/misskey/">Wiki</a><i>・</i><a href="https://github.com/syuilo/misskey">リポジトリ</a><i>・</i><a href={ CONFIG.devUrl }>開発者</a><i>・</i><a href="https://twitter.com/misskey_xyz" target="_blank">Follow us on <i class="fa fa-twitter"></i></a>
+<mk-nav-home-widget><a href={ CONFIG.aboutUrl }>Misskeyについて</a><i>・</i><a href={ CONFIG.statsUrl }>統計</a><i>・</i><a href={ CONFIG.statusUrl }>ステータス</a><i>・</i><a href="http://zawazawa.jp/misskey/">Wiki</a><i>・</i><a href="https://github.com/syuilo/misskey">リポジトリ</a><i>・</i><a href={ CONFIG.devUrl }>開発者</a><i>・</i><a href="https://twitter.com/misskey_xyz" target="_blank">Follow us on <i class="fa fa-twitter"></i></a>
 	<style>
 		:scope
 			display block
diff --git a/src/web/app/stats/script.js b/src/web/app/stats/script.js
new file mode 100644
index 0000000000..75063501bb
--- /dev/null
+++ b/src/web/app/stats/script.js
@@ -0,0 +1,23 @@
+/**
+ * Stats
+ */
+
+// Style
+import './style.styl';
+
+import * as riot from 'riot';
+require('./tags');
+import init from '../init';
+
+document.title = 'Misskey Statistics';
+
+/**
+ * init
+ */
+init(me => {
+	mount(document.createElement('mk-index'));
+});
+
+function mount(content) {
+	riot.mount(document.getElementById('app').appendChild(content));
+}
diff --git a/src/web/app/stats/style.styl b/src/web/app/stats/style.styl
new file mode 100644
index 0000000000..b48d7aeb9e
--- /dev/null
+++ b/src/web/app/stats/style.styl
@@ -0,0 +1,9 @@
+@import "../base"
+
+html
+	color #456267
+	background #fff
+
+body
+	margin 0
+	padding 0
diff --git a/src/web/app/stats/tags/index.js b/src/web/app/stats/tags/index.js
new file mode 100644
index 0000000000..f41151949f
--- /dev/null
+++ b/src/web/app/stats/tags/index.js
@@ -0,0 +1 @@
+require('./index.tag');
diff --git a/src/web/app/stats/tags/index.tag b/src/web/app/stats/tags/index.tag
new file mode 100644
index 0000000000..134fad3c0c
--- /dev/null
+++ b/src/web/app/stats/tags/index.tag
@@ -0,0 +1,209 @@
+<mk-index>
+	<h1>Misskey<i>Statistics</i></h1>
+	<main if={ !initializing }>
+		<mk-users stats={ stats }/>
+		<mk-posts stats={ stats }/>
+	</main>
+	<footer><a href={ CONFIG.url }>{ CONFIG.host }</a></footer>
+	<style>
+		:scope
+			display block
+			margin 0 auto
+			padding 0 16px
+			max-width 700px
+
+			> h1
+				margin 0
+				padding 24px 0 0 0
+				font-size 24px
+				font-weight normal
+
+				> i
+					font-style normal
+					color #f43b16
+
+			> main
+				> *
+					margin 24px 0
+					padding-top 24px
+					border-top solid 1px #eee
+
+					> h2
+						margin 0 0 12px 0
+						font-size 18px
+						font-weight normal
+
+			> footer
+				margin 24px 0
+				text-align center
+
+				> a
+					color #546567
+	</style>
+	<script>
+		this.mixin('api');
+
+		this.initializing = true;
+
+		this.on('mount', () => {
+			this.api('stats').then(stats => {
+				this.update({
+					initializing: false,
+					stats
+				});
+			});
+		});
+	</script>
+</mk-index>
+
+<mk-posts>
+	<h2>%i18n:stats.posts-count% <b>{ stats.posts_count }</b></h2>
+	<mk-posts-chart if={ !initializing } data={ data }/>
+	<style>
+		:scope
+			display block
+	</style>
+	<script>
+		this.mixin('api');
+
+		this.initializing = true;
+		this.stats = this.opts.stats;
+
+		this.on('mount', () => {
+			this.api('aggregation/posts', {
+				limit: 365
+			}).then(data => {
+				this.update({
+					initializing: false,
+					data
+				});
+			});
+		});
+	</script>
+</mk-posts>
+
+<mk-users>
+	<h2>%i18n:stats.users-count% <b>{ stats.users_count }</b></h2>
+	<mk-users-chart if={ !initializing } data={ data }/>
+	<style>
+		:scope
+			display block
+	</style>
+	<script>
+		this.mixin('api');
+
+		this.initializing = true;
+		this.stats = this.opts.stats;
+
+		this.on('mount', () => {
+			this.api('aggregation/users', {
+				limit: 365
+			}).then(data => {
+				this.update({
+					initializing: false,
+					data
+				});
+			});
+		});
+	</script>
+</mk-users>
+
+<mk-posts-chart>
+	<svg riot-viewBox="0 0 { viewBoxX } { viewBoxY }" preserveAspectRatio="none">
+		<title>Black ... Total<br/>Blue ... Posts<br/>Red ... Replies<br/>Green ... Reposts</title>
+		<polyline
+			riot-points={ pointsPost }
+			fill="none"
+			stroke-width="1"
+			stroke="#41ddde"/>
+		<polyline
+			riot-points={ pointsReply }
+			fill="none"
+			stroke-width="1"
+			stroke="#f7796c"/>
+		<polyline
+			riot-points={ pointsRepost }
+			fill="none"
+			stroke-width="1"
+			stroke="#a1de41"/>
+		<polyline
+			riot-points={ pointsTotal }
+			fill="none"
+			stroke-width="1"
+			stroke="#555"
+			stroke-dasharray="2 2"/>
+	</svg>
+	<style>
+		:scope
+			display block
+
+			> svg
+				display block
+				padding 1px
+				width 100%
+	</style>
+	<script>
+		this.viewBoxX = 365;
+		this.viewBoxY = 80;
+
+		this.data = this.opts.data.reverse();
+		this.data.forEach(d => d.total = d.posts + d.replies + d.reposts);
+		const peak = Math.max.apply(null, this.data.map(d => d.total));
+
+		this.on('mount', () => {
+			this.render();
+		});
+
+		this.render = () => {
+			this.update({
+				pointsPost: this.data.map((d, i) => `${i},${(1 - (d.posts / peak)) * this.viewBoxY}`).join(' '),
+				pointsReply: this.data.map((d, i) => `${i},${(1 - (d.replies / peak)) * this.viewBoxY}`).join(' '),
+				pointsRepost: this.data.map((d, i) => `${i},${(1 - (d.reposts / peak)) * this.viewBoxY}`).join(' '),
+				pointsTotal: this.data.map((d, i) => `${i},${(1 - (d.total / peak)) * this.viewBoxY}`).join(' ')
+			});
+		};
+	</script>
+</mk-posts-chart>
+
+<mk-users-chart>
+	<svg riot-viewBox="0 0 { viewBoxX } { viewBoxY }" preserveAspectRatio="none">
+		<polyline
+			riot-points={ createdPoints }
+			fill="none"
+			stroke-width="1"
+			stroke="#1cde84"/>
+		<polyline
+			riot-points={ totalPoints }
+			fill="none"
+			stroke-width="1"
+			stroke="#555"/>
+	</svg>
+	<style>
+		:scope
+			display block
+
+			> svg
+				display block
+				padding 1px
+				width 100%
+	</style>
+	<script>
+		this.viewBoxX = 365;
+		this.viewBoxY = 80;
+
+		this.data = this.opts.data.reverse();
+		const totalPeak = Math.max.apply(null, this.data.map(d => d.total));
+		const createdPeak = Math.max.apply(null, this.data.map(d => d.created));
+
+		this.on('mount', () => {
+			this.render();
+		});
+
+		this.render = () => {
+			this.update({
+				totalPoints: this.data.map((d, i) => `${i},${(1 - (d.total / totalPeak)) * this.viewBoxY}`).join(' '),
+				createdPoints: this.data.map((d, i) => `${i},${(1 - (d.created / createdPeak)) * this.viewBoxY}`).join(' ')
+			});
+		};
+	</script>
+</mk-users-chart>
diff --git a/src/web/app/status/script.js b/src/web/app/status/script.js
new file mode 100644
index 0000000000..06d4d9a7a4
--- /dev/null
+++ b/src/web/app/status/script.js
@@ -0,0 +1,23 @@
+/**
+ * Status
+ */
+
+// Style
+import './style.styl';
+
+import * as riot from 'riot';
+require('./tags');
+import init from '../init';
+
+document.title = 'Misskey System Status';
+
+/**
+ * init
+ */
+init(me => {
+	mount(document.createElement('mk-index'));
+});
+
+function mount(content) {
+	riot.mount(document.getElementById('app').appendChild(content));
+}
diff --git a/src/web/app/status/style.styl b/src/web/app/status/style.styl
new file mode 100644
index 0000000000..b48d7aeb9e
--- /dev/null
+++ b/src/web/app/status/style.styl
@@ -0,0 +1,9 @@
+@import "../base"
+
+html
+	color #456267
+	background #fff
+
+body
+	margin 0
+	padding 0
diff --git a/src/web/app/status/tags/index.js b/src/web/app/status/tags/index.js
new file mode 100644
index 0000000000..f41151949f
--- /dev/null
+++ b/src/web/app/status/tags/index.js
@@ -0,0 +1 @@
+require('./index.tag');
diff --git a/src/web/app/status/tags/index.tag b/src/web/app/status/tags/index.tag
new file mode 100644
index 0000000000..6fb6041c3c
--- /dev/null
+++ b/src/web/app/status/tags/index.tag
@@ -0,0 +1,201 @@
+<mk-index>
+	<h1>Misskey<i>Status</i></h1>
+	<p><i class="fa fa-info-circle"></i>%i18n:status.all-systems-maybe-operational%</p>
+	<main>
+		<mk-cpu-usage connection={ connection }/>
+		<mk-mem-usage connection={ connection }/>
+	</main>
+	<footer><a href={ CONFIG.url }>{ CONFIG.host }</a></footer>
+	<style>
+		:scope
+			display block
+			margin 0 auto
+			padding 0 16px
+			max-width 700px
+
+			> h1
+				margin 0
+				padding 24px 0 16px 0
+				font-size 24px
+				font-weight normal
+
+				> i
+					font-style normal
+					color #f43b16
+
+			> p
+				display block
+				margin 0
+				padding 12px 16px
+				background #eaf4ef
+				//border solid 1px #99ccb2
+				border-radius 4px
+
+				> i
+					margin-right 5px
+
+			> main
+				> *
+					margin 24px 0
+
+					> h2
+						margin 0 0 12px 0
+						font-size 18px
+						font-weight normal
+
+			> footer
+				margin 24px 0
+				text-align center
+
+				> a
+					color #546567
+	</style>
+	<script>
+		import Connection from '../../common/scripts/server-stream';
+
+		this.mixin('api');
+
+		this.initializing = true;
+		this.connection = new Connection();
+
+		this.on('mount', () => {
+			this.api('meta').then(meta => {
+				this.update({
+					initializing: false,
+					meta
+				});
+			});
+		});
+
+		this.on('unmount', () => {
+			this.connection.close();
+		});
+
+	</script>
+</mk-index>
+
+<mk-cpu-usage>
+	<h2>CPU <b>{ percentage }%</b></h2>
+	<mk-line-chart ref="chart"/>
+	<style>
+		:scope
+			display block
+	</style>
+	<script>
+		this.connection = this.opts.connection;
+
+		this.on('mount', () => {
+			this.connection.on('stats', this.onStats);
+		});
+
+		this.on('unmount', () => {
+			this.connection.off('stats', this.onStats);
+		});
+
+		this.onStats = stats => {
+			this.refs.chart.addData(1 - stats.cpu_usage);
+
+			const percentage = (stats.cpu_usage * 100).toFixed(0);
+
+			this.update({
+				percentage
+			});
+		};
+	</script>
+</mk-cpu-usage>
+
+<mk-mem-usage>
+	<h2>MEM <b>{ percentage }%</b></h2>
+	<mk-line-chart ref="chart"/>
+	<style>
+		:scope
+			display block
+	</style>
+	<script>
+		this.connection = this.opts.connection;
+
+		this.on('mount', () => {
+			this.connection.on('stats', this.onStats);
+		});
+
+		this.on('unmount', () => {
+			this.connection.off('stats', this.onStats);
+		});
+
+		this.onStats = stats => {
+			stats.mem.used = stats.mem.total - stats.mem.free;
+			this.refs.chart.addData(1 - (stats.mem.used / stats.mem.total));
+
+			const percentage = (stats.mem.used / stats.mem.total * 100).toFixed(0);
+
+			this.update({
+				percentage
+			});
+		};
+	</script>
+</mk-mem-usage>
+
+<mk-line-chart>
+	<svg riot-viewBox="0 0 { viewBoxX } { viewBoxY }" preserveAspectRatio="none">
+		<defs>
+			<linearGradient id={ gradientId } x1="0" x2="0" y1="1" y2="0">
+				<stop offset="0%" stop-color="rgba(244, 59, 22, 0)"></stop>
+				<stop offset="100%" stop-color="#f43b16"></stop>
+			</linearGradient>
+			<mask id={ maskId } x="0" y="0" riot-width={ viewBoxX } riot-height={ viewBoxY }>
+				<polygon
+					riot-points={ polygonPoints }
+					fill="#fff"
+					fill-opacity="0.5"/>
+			</mask>
+		</defs>
+		<line x1="0" y1="0" riot-x2={ viewBoxX } y2="0" stroke="rgba(255, 255, 255, 0.1)" stroke-width="0.25" stroke-dasharray="1"/>
+		<line x1="0" y1="25%" riot-x2={ viewBoxX } y2="25%" stroke="rgba(255, 255, 255, 0.1)" stroke-width="0.25" stroke-dasharray="1"/>
+		<line x1="0" y1="50%" riot-x2={ viewBoxX } y2="50%" stroke="rgba(255, 255, 255, 0.1)" stroke-width="0.25" stroke-dasharray="1"/>
+		<line x1="0" y1="75%" riot-x2={ viewBoxX } y2="75%" stroke="rgba(255, 255, 255, 0.1)" stroke-width="0.25" stroke-dasharray="1"/>
+		<line x1="0" y1="100%" riot-x2={ viewBoxX } y2="100%" stroke="rgba(255, 255, 255, 0.1)" stroke-width="0.25" stroke-dasharray="1"/>
+		<rect
+			x="-1" y="-1"
+			riot-width={ viewBoxX + 2 } riot-height={ viewBoxY + 2 }
+			style="stroke: none; fill: url(#{ gradientId }); mask: url(#{ maskId })"/>
+		<polyline
+			riot-points={ polylinePoints }
+			fill="none"
+			stroke="#f43b16"
+			stroke-width="0.5"/>
+	</svg>
+	<style>
+		:scope
+			display block
+			padding 16px
+			border-radius 8px
+			background #1c2531
+
+			> svg
+				display block
+				padding 1px
+				width 100%
+	</style>
+	<script>
+		import uuid from '../../common/scripts/uuid';
+
+		this.viewBoxX = 100;
+		this.viewBoxY = 30;
+		this.data = [];
+		this.gradientId = uuid();
+		this.maskId = uuid();
+
+		this.addData = data => {
+			this.data.push(data);
+			if (this.data.length > 100) this.data.shift();
+
+			const polylinePoints = this.data.map((d, i) => `${this.viewBoxX - ((this.data.length - 1) - i)},${d * this.viewBoxY}`).join(' ');
+			const polygonPoints = `${this.viewBoxX - (this.data.length - 1)},${ this.viewBoxY } ${ polylinePoints } ${ this.viewBoxX },${ this.viewBoxY }`;
+
+			this.update({
+				polylinePoints,
+				polygonPoints
+			});
+		};
+	</script>
+</mk-line-chart>