summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-06-11 11:27:55 +0900
committerGitHub <noreply@github.com>2018-06-11 11:27:55 +0900
commit0700be86e218320178b47d6e0327f7e8435bd821 (patch)
tree27ced8befdb8108dcb9093ea6fff3461390bc3b6 /src
parentMerge pull request #1698 from syuilo/cleanup-dependencies (diff)
parent:v: (diff)
downloadmisskey-0700be86e218320178b47d6e0327f7e8435bd821.tar.gz
misskey-0700be86e218320178b47d6e0327f7e8435bd821.tar.bz2
misskey-0700be86e218320178b47d6e0327f7e8435bd821.zip
Merge pull request #1702 from syuilo/hashtags-stats
Hashtags stats
Diffstat (limited to 'src')
-rw-r--r--src/client/app/common/views/widgets/hashtags.chart.vue78
-rw-r--r--src/client/app/common/views/widgets/hashtags.vue100
-rw-r--r--src/client/app/common/views/widgets/index.ts2
-rw-r--r--src/client/app/desktop/views/components/home.vue1
-rw-r--r--src/client/app/desktop/views/pages/deck/deck.widgets-column.vue1
-rw-r--r--src/client/app/mobile/views/pages/widgets.vue1
-rw-r--r--src/daemons/hashtags-stats-child.ts60
-rw-r--r--src/daemons/hashtags-stats.ts20
-rw-r--r--src/daemons/notes-stats-child.ts (renamed from src/notes-stats-child.ts)10
-rw-r--r--src/daemons/notes-stats.ts (renamed from src/notes-stats.ts)0
-rw-r--r--src/daemons/server-stats.ts (renamed from src/server-stats.ts)10
-rw-r--r--src/index.ts4
-rw-r--r--src/server/api/endpoints.ts5
-rw-r--r--src/server/api/endpoints/hashtags/trend.ts80
14 files changed, 365 insertions, 7 deletions
diff --git a/src/client/app/common/views/widgets/hashtags.chart.vue b/src/client/app/common/views/widgets/hashtags.chart.vue
new file mode 100644
index 0000000000..19b56ef283
--- /dev/null
+++ b/src/client/app/common/views/widgets/hashtags.chart.vue
@@ -0,0 +1,78 @@
+<template>
+<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`">
+ <defs>
+ <linearGradient :id="gradientId" x1="0" x2="0" y1="1" y2="0">
+ <stop offset="0%" stop-color="hsl(200, 80%, 70%)"></stop>
+ <stop offset="100%" stop-color="hsl(90, 80%, 70%)"></stop>
+ </linearGradient>
+ <mask :id="maskId" x="0" y="0" :width="viewBoxX" :height="viewBoxY">
+ <polygon
+ :points="polygonPoints"
+ fill="#fff"
+ fill-opacity="0.5"/>
+ <polyline
+ :points="polylinePoints"
+ fill="none"
+ stroke="#fff"
+ stroke-width="0.7"/>
+ <circle
+ :cx="headX"
+ :cy="headY"
+ r="1.2"
+ fill="#fff"/>
+ </mask>
+ </defs>
+ <rect
+ x="-2" y="-2"
+ :width="viewBoxX + 4" :height="viewBoxY + 4"
+ :style="`stroke: none; fill: url(#${ gradientId }); mask: url(#${ maskId })`"/>
+</svg>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import * as uuid from 'uuid';
+
+export default Vue.extend({
+ props: {
+ src: {
+ type: Array,
+ required: true
+ }
+ },
+ data() {
+ return {
+ viewBoxX: 50,
+ viewBoxY: 30,
+ gradientId: uuid(),
+ maskId: uuid(),
+ polylinePoints: '',
+ polygonPoints: '',
+ headX: null,
+ headY: null
+ };
+ },
+ watch: {
+ src() {
+ this.draw();
+ }
+ },
+ created() {
+ this.draw();
+ },
+ methods: {
+ draw() {
+ const stats = this.src.slice().reverse();
+ const peak = Math.max.apply(null, stats) || 1;
+
+ const polylinePoints = stats.map((x, i) => [this.viewBoxX - ((stats.length - 1) - i), (1 - (x / peak)) * this.viewBoxY]);
+ this.polylinePoints = polylinePoints.map(xy => `${xy[0]},${xy[1]}`).join(' ');
+
+ this.polygonPoints = `${this.viewBoxX - (stats.length - 1)},${ this.viewBoxY } ${ this.polylinePoints } ${ this.viewBoxX },${ this.viewBoxY }`;
+
+ this.headX = polylinePoints[polylinePoints.length - 1][0];
+ this.headY = polylinePoints[polylinePoints.length - 1][1];
+ }
+ }
+});
+</script>
diff --git a/src/client/app/common/views/widgets/hashtags.vue b/src/client/app/common/views/widgets/hashtags.vue
new file mode 100644
index 0000000000..c4647ee0f9
--- /dev/null
+++ b/src/client/app/common/views/widgets/hashtags.vue
@@ -0,0 +1,100 @@
+<template>
+<div class="mkw-hashtags">
+ <mk-widget-container :show-header="!props.compact">
+ <template slot="header">%fa:hashtag%%i18n:@title%</template>
+
+ <div class="mkw-hashtags--body" :data-mobile="platform == 'mobile'">
+ <p class="fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p>
+ <div v-else>
+ <div v-for="stat in stats" :key="stat.tag">
+ <div class="tag">
+ <router-link :to="`/tags/${ stat.tag }`">#{{ stat.tag }}</router-link>
+ </div>
+ <x-chart class="chart" :src="stat.chart"/>
+ </div>
+ </div>
+ </div>
+ </mk-widget-container>
+</div>
+</template>
+
+<script lang="ts">
+import define from '../../../common/define-widget';
+import XChart from './hashtags.chart.vue';
+
+export default define({
+ name: 'hashtags',
+ props: () => ({
+ compact: false
+ })
+}).extend({
+ components: {
+ XChart
+ },
+ data() {
+ return {
+ stats: [],
+ fetching: true,
+ clock: null
+ };
+ },
+ mounted() {
+ this.fetch();
+ this.clock = setInterval(this.fetch, 1000 * 60 * 10);
+ },
+ beforeDestroy() {
+ clearInterval(this.clock);
+ },
+ methods: {
+ func() {
+ this.props.compact = !this.props.compact;
+ this.save();
+ },
+ fetch() {
+ (this as any).api('hashtags/trend').then(stats => {
+ this.stats = stats;
+ this.fetching = false;
+ });
+ }
+ }
+});
+</script>
+
+<style lang="stylus" scoped>
+root(isDark)
+ .mkw-hashtags--body
+ > .fetching
+ margin 0
+ padding 16px
+ text-align center
+ color #aaa
+
+ > [data-fa]
+ margin-right 4px
+
+ > div
+ > div
+ display flex
+ align-items center
+ padding 16px
+
+ &:not(:last-child)
+ border-bottom solid 1px #393f4f
+
+ > .tag
+ flex 1
+
+ > a
+ color #9baec8
+
+ > .chart
+ width 50px
+ height 30px
+
+.mkw-hashtags[data-darkmode]
+ root(true)
+
+.mkw-hashtags:not([data-darkmode])
+ root(false)
+
+</style>
diff --git a/src/client/app/common/views/widgets/index.ts b/src/client/app/common/views/widgets/index.ts
index 0190393ba7..7d548ef353 100644
--- a/src/client/app/common/views/widgets/index.ts
+++ b/src/client/app/common/views/widgets/index.ts
@@ -13,6 +13,7 @@ import wSlideshow from './slideshow.vue';
import wTips from './tips.vue';
import wDonation from './donation.vue';
import wNav from './nav.vue';
+import wHashtags from './hashtags.vue';
Vue.component('mkw-analog-clock', wAnalogClock);
Vue.component('mkw-nav', wNav);
@@ -27,3 +28,4 @@ Vue.component('mkw-posts-monitor', wPostsMonitor);
Vue.component('mkw-memo', wMemo);
Vue.component('mkw-rss', wRss);
Vue.component('mkw-version', wVersion);
+Vue.component('mkw-hashtags', wHashtags);
diff --git a/src/client/app/desktop/views/components/home.vue b/src/client/app/desktop/views/components/home.vue
index cac1fd935b..8774aada63 100644
--- a/src/client/app/desktop/views/components/home.vue
+++ b/src/client/app/desktop/views/components/home.vue
@@ -23,6 +23,7 @@
<option value="post-form">%i18n:common.widgets.post-form%</option>
<option value="messaging">%i18n:common.widgets.messaging%</option>
<option value="memo">%i18n:common.widgets.memo%</option>
+ <option value="hashtags">%i18n:common.widgets.hashtags%</option>
<option value="posts-monitor">%i18n:common.widgets.posts-monitor%</option>
<option value="server">%i18n:common.widgets.server%</option>
<option value="donation">%i18n:common.widgets.donation%</option>
diff --git a/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue b/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue
index 2a3a2472dc..a41bf8c3ca 100644
--- a/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue
@@ -23,6 +23,7 @@
<option value="post-form">%i18n:common.widgets.post-form%</option>
<option value="messaging">%i18n:common.widgets.messaging%</option>
<option value="memo">%i18n:common.widgets.memo%</option>
+ <option value="hashtags">%i18n:common.widgets.hashtags%</option>
<option value="posts-monitor">%i18n:common.widgets.posts-monitor%</option>
<option value="server">%i18n:common.widgets.server%</option>
<option value="donation">%i18n:common.widgets.donation%</option>
diff --git a/src/client/app/mobile/views/pages/widgets.vue b/src/client/app/mobile/views/pages/widgets.vue
index ea8580b4d0..294c80e7a0 100644
--- a/src/client/app/mobile/views/pages/widgets.vue
+++ b/src/client/app/mobile/views/pages/widgets.vue
@@ -15,6 +15,7 @@
<option value="rss">%i18n:common.widgets.rss%</option>
<option value="photo-stream">%i18n:common.widgets.photo-stream%</option>
<option value="slideshow">%i18n:common.widgets.slideshow%</option>
+ <option value="hashtags">%i18n:common.widgets.hashtags%</option>
<option value="posts-monitor">%i18n:common.widgets.posts-monitor%</option>
<option value="version">%i18n:common.widgets.version%</option>
<option value="server">%i18n:common.widgets.server%</option>
diff --git a/src/daemons/hashtags-stats-child.ts b/src/daemons/hashtags-stats-child.ts
new file mode 100644
index 0000000000..3f7f4d6e9e
--- /dev/null
+++ b/src/daemons/hashtags-stats-child.ts
@@ -0,0 +1,60 @@
+import Note from '../models/note';
+
+// 10分
+const interval = 1000 * 60 * 10;
+
+async function tick() {
+ const res = await Note.aggregate([{
+ $match: {
+ createdAt: {
+ $gt: new Date(Date.now() - interval)
+ },
+ tags: {
+ $exists: true,
+ $ne: []
+ }
+ }
+ }, {
+ $unwind: '$tags'
+ }, {
+ $group: {
+ _id: '$tags',
+ count: {
+ $sum: 1
+ }
+ }
+ }, {
+ $group: {
+ _id: null,
+ tags: {
+ $push: {
+ tag: '$_id',
+ count: '$count'
+ }
+ }
+ }
+ }, {
+ $project: {
+ _id: false,
+ tags: true
+ }
+ }]) as {
+ tags: Array<{
+ tag: string;
+ count: number;
+ }>
+ };
+
+ const stats = res.tags
+ .sort((a, b) => a.count - b.count)
+ .map(tag => [tag.tag, tag.count])
+ .slice(0, 10);
+
+ console.log(stats);
+
+ process.send(stats);
+}
+
+tick();
+
+setInterval(tick, interval);
diff --git a/src/daemons/hashtags-stats.ts b/src/daemons/hashtags-stats.ts
new file mode 100644
index 0000000000..5ed028ac33
--- /dev/null
+++ b/src/daemons/hashtags-stats.ts
@@ -0,0 +1,20 @@
+import * as childProcess from 'child_process';
+import Xev from 'xev';
+
+const ev = new Xev();
+
+export default function() {
+ const log = [];
+
+ const p = childProcess.fork(__dirname + '/hashtags-stats-child.js');
+
+ p.on('message', stats => {
+ ev.emit('hashtagsStats', stats);
+ log.push(stats);
+ if (log.length > 30) log.shift();
+ });
+
+ ev.on('requestHashTagsStatsLog', id => {
+ ev.emit('hashtagsStatsLog:' + id, log);
+ });
+}
diff --git a/src/notes-stats-child.ts b/src/daemons/notes-stats-child.ts
index 5f85a2a3cc..7f54a36bff 100644
--- a/src/notes-stats-child.ts
+++ b/src/daemons/notes-stats-child.ts
@@ -1,8 +1,8 @@
-import Note from './models/note';
+import Note from '../models/note';
const interval = 5000;
-setInterval(async () => {
+async function tick() {
const [all, local] = await Promise.all([Note.count({
createdAt: {
$gte: new Date(Date.now() - interval)
@@ -19,4 +19,8 @@ setInterval(async () => {
};
process.send(stats);
-}, interval);
+}
+
+tick();
+
+setInterval(tick, interval);
diff --git a/src/notes-stats.ts b/src/daemons/notes-stats.ts
index 3094c34af0..3094c34af0 100644
--- a/src/notes-stats.ts
+++ b/src/daemons/notes-stats.ts
diff --git a/src/server-stats.ts b/src/daemons/server-stats.ts
index 7b0d4a8576..1403402508 100644
--- a/src/server-stats.ts
+++ b/src/daemons/server-stats.ts
@@ -5,6 +5,8 @@ import Xev from 'xev';
const ev = new Xev();
+const interval = 1000;
+
/**
* Report server stats regularly
*/
@@ -15,7 +17,7 @@ export default function() {
ev.emit('serverStatsLog:' + id, log);
});
- setInterval(() => {
+ async function tick() {
osUtils.cpuUsage(cpuUsage => {
const disk = diskusage.checkSync(os.platform() == 'win32' ? 'c:' : '/');
const stats = {
@@ -32,5 +34,9 @@ export default function() {
log.push(stats);
if (log.length > 50) log.shift();
});
- }, 1000);
+ }
+
+ tick();
+
+ setInterval(tick, interval);
}
diff --git a/src/index.ts b/src/index.ts
index 4a98b7564c..35cf5a243b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -17,8 +17,8 @@ import ProgressBar from './utils/cli/progressbar';
import EnvironmentInfo from './utils/environmentInfo';
import MachineInfo from './utils/machineInfo';
import DependencyInfo from './utils/dependencyInfo';
-import serverStats from './server-stats';
-import notesStats from './notes-stats';
+import serverStats from './daemons/server-stats';
+import notesStats from './daemons/notes-stats';
import loadConfig from './config/load';
import { Config } from './config/types';
diff --git a/src/server/api/endpoints.ts b/src/server/api/endpoints.ts
index 91e5298e73..5f0a020d6f 100644
--- a/src/server/api/endpoints.ts
+++ b/src/server/api/endpoints.ts
@@ -629,6 +629,11 @@ const endpoints: Endpoint[] = [
},
{
+ name: 'hashtags/trend',
+ withCredential: true
+ },
+
+ {
name: 'messaging/history',
withCredential: true,
kind: 'messaging-read'
diff --git a/src/server/api/endpoints/hashtags/trend.ts b/src/server/api/endpoints/hashtags/trend.ts
new file mode 100644
index 0000000000..c888a6cbb5
--- /dev/null
+++ b/src/server/api/endpoints/hashtags/trend.ts
@@ -0,0 +1,80 @@
+import Note from '../../../../models/note';
+
+/**
+ * Get trends of hashtags
+ */
+module.exports = (params, user) => new Promise(async (res, rej) => {
+ const data = await Note.aggregate([{
+ $match: {
+ createdAt: {
+ $gt: new Date(Date.now() - 1000 * 60 * 60)
+ },
+ tags: {
+ $exists: true,
+ $ne: []
+ }
+ }
+ }, {
+ $unwind: '$tags'
+ }, {
+ $group: {
+ _id: '$tags',
+ count: {
+ $sum: 1
+ }
+ }
+ }, {
+ $group: {
+ _id: null,
+ tags: {
+ $push: {
+ tag: '$_id',
+ count: '$count'
+ }
+ }
+ }
+ }, {
+ $project: {
+ _id: false,
+ tags: true
+ }
+ }]) as Array<{
+ tags: Array<{
+ tag: string;
+ count: number;
+ }>
+ }>;
+
+ if (data.length == 0) {
+ return res([]);
+ }
+
+ const hots = data[0].tags
+ .sort((a, b) => b.count - a.count)
+ .map(tag => tag.tag)
+ .slice(0, 10);
+
+ const countPromises: Array<Promise<number[]>> = [];
+
+ for (let i = 0; i < 10; i++) {
+ // 10分
+ const interval = 1000 * 60 * 10;
+
+ countPromises.push(Promise.all(hots.map(tag => Note.count({
+ tags: tag,
+ createdAt: {
+ $lt: new Date(Date.now() - (interval * i)),
+ $gt: new Date(Date.now() - (interval * (i + 1)))
+ }
+ }))));
+ }
+
+ const countsLog = await Promise.all(countPromises);
+
+ const stats = hots.map((tag, i) => ({
+ tag,
+ chart: countsLog.map(counts => counts[i])
+ }));
+
+ res(stats);
+});