From dd1aa8c7d6ec003fcf187c1fc8e6c56f60723414 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Aug 2017 15:17:03 +0900 Subject: [PATCH] stats --- docs/setup.en.md | 1 + docs/setup.ja.md | 1 + locales/en.yml | 4 + locales/ja.yml | 4 + src/api/endpoints.ts | 9 + src/api/endpoints/aggregation/posts.ts | 95 ++++++++ src/api/endpoints/aggregation/users.ts | 59 +++++ src/api/endpoints/stats.ts | 48 +++++ src/config.ts | 2 + src/web/app/common/scripts/config.js | 2 + src/web/app/desktop/tags/home-widgets/nav.tag | 2 +- src/web/app/stats/script.js | 23 ++ src/web/app/stats/style.styl | 9 + src/web/app/stats/tags/index.js | 1 + src/web/app/stats/tags/index.tag | 202 ++++++++++++++++++ src/web/app/status/tags/index.tag | 1 - webpack/webpack.config.ts | 1 + 17 files changed, 462 insertions(+), 2 deletions(-) create mode 100644 src/api/endpoints/aggregation/posts.ts create mode 100644 src/api/endpoints/aggregation/users.ts create mode 100644 src/api/endpoints/stats.ts create mode 100644 src/web/app/stats/script.js create mode 100644 src/web/app/stats/style.styl create mode 100644 src/web/app/stats/tags/index.js create mode 100644 src/web/app/stats/tags/index.tag diff --git a/docs/setup.en.md b/docs/setup.en.md index b6391c6780..3e48935346 100644 --- a/docs/setup.en.md +++ b/docs/setup.en.md @@ -25,6 +25,7 @@ Note that Misskey uses following subdomains: * **api**.*{primary domain}* * **auth**.*{primary domain}* * **about**.*{primary domain}* +* **stats**.*{primary domain}* * **status**.*{primary domain}* * **dev**.*{primary domain}* * **file**.*{secondary domain}* diff --git a/docs/setup.ja.md b/docs/setup.ja.md index a770ac8c21..4f48a08088 100644 --- a/docs/setup.ja.md +++ b/docs/setup.ja.md @@ -26,6 +26,7 @@ Misskeyは以下のサブドメインを使います: * **api**.*{primary domain}* * **auth**.*{primary domain}* * **about**.*{primary domain}* +* **stats**.*{primary domain}* * **status**.*{primary domain}* * **dev**.*{primary domain}* * **file**.*{secondary domain}* diff --git a/locales/en.yml b/locales/en.yml index a91fc5709b..55a588f99f 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -427,6 +427,10 @@ mobile: known: "You know" load-more: "More" +stats: + posts-count: "Number of all posts" + users-count: "Number of all users" + status: all-systems-maybe-operational: "All systems maybe operational" what-is-this-site: "" diff --git a/locales/ja.yml b/locales/ja.yml index efbc60475c..e5b2beaed1 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -428,6 +428,10 @@ mobile: known: "知り合い" load-more: "もっと" +stats: + posts-count: "投稿の数" + users-count: "アカウントの数" + status: all-systems-maybe-operational: "すべてのシステムがたぶん正常に作動しています" what-is-this-site: "" diff --git a/src/api/endpoints.ts b/src/api/endpoints.ts index bb2501c982..5bbc480a8e 100644 --- a/src/api/endpoints.ts +++ b/src/api/endpoints.ts @@ -69,6 +69,9 @@ const endpoints: Endpoint[] = [ { name: 'meta' }, + { + name: 'stats' + }, { name: 'username/available' }, @@ -109,6 +112,12 @@ const endpoints: Endpoint[] = [ withCredential: true, secure: true }, + { + name: 'aggregation/posts', + }, + { + name: 'aggregation/users', + }, { name: 'aggregation/users/activity', }, diff --git a/src/api/endpoints/aggregation/posts.ts b/src/api/endpoints/aggregation/posts.ts new file mode 100644 index 0000000000..573816e4fd --- /dev/null +++ b/src/api/endpoints/aggregation/posts.ts @@ -0,0 +1,95 @@ +/** + * Module dependencies + */ +import $ from 'cafy'; +import Post from '../../models/post'; + +/** + * Aggregate posts + * + * @param {any} params + * @return {Promise} + */ +module.exports = params => new Promise(async (res, rej) => { + // Get 'limit' parameter + const [limit = 365, limitErr] = $(params.limit).optional.number().range(1, 365).$; + if (limitErr) return rej('invalid limit param'); + + const datas = await Post + .aggregate([ + { $project: { + repost_id: '$repost_id', + reply_to_id: '$reply_to_id', + created_at: { $add: ['$created_at', 9 * 60 * 60 * 1000] } // Convert into JST + }}, + { $project: { + date: { + year: { $year: '$created_at' }, + month: { $month: '$created_at' }, + day: { $dayOfMonth: '$created_at' } + }, + type: { + $cond: { + if: { $ne: ['$repost_id', null] }, + then: 'repost', + else: { + $cond: { + if: { $ne: ['$reply_to_id', null] }, + then: 'reply', + else: 'post' + } + } + } + }} + }, + { $group: { _id: { + date: '$date', + type: '$type' + }, count: { $sum: 1 } } }, + { $group: { + _id: '$_id.date', + data: { $addToSet: { + type: '$_id.type', + count: '$count' + }} + } } + ]); + + datas.forEach(data => { + data.date = data._id; + delete data._id; + + data.posts = (data.data.filter(x => x.type == 'post')[0] || { count: 0 }).count; + data.reposts = (data.data.filter(x => x.type == 'repost')[0] || { count: 0 }).count; + data.replies = (data.data.filter(x => x.type == 'reply')[0] || { count: 0 }).count; + + delete data.data; + }); + + const graph = []; + + for (let i = 0; i < limit; i++) { + const day = new Date(new Date().setDate(new Date().getDate() - i)); + + const data = datas.filter(d => + d.date.year == day.getFullYear() && d.date.month == day.getMonth() + 1 && d.date.day == day.getDate() + )[0]; + + if (data) { + graph.push(data); + } else { + graph.push({ + date: { + year: day.getFullYear(), + month: day.getMonth() + 1, // In JavaScript, month is zero-based. + day: day.getDate() + }, + posts: 0, + reposts: 0, + replies: 0 + }); + } + } + + res(graph); +}); diff --git a/src/api/endpoints/aggregation/users.ts b/src/api/endpoints/aggregation/users.ts new file mode 100644 index 0000000000..9be4ca12a1 --- /dev/null +++ b/src/api/endpoints/aggregation/users.ts @@ -0,0 +1,59 @@ +/** + * Module dependencies + */ +import $ from 'cafy'; +import User from '../../models/user'; + +/** + * Aggregate users + * + * @param {any} params + * @return {Promise} + */ +module.exports = params => new Promise(async (res, rej) => { + // Get 'limit' parameter + const [limit = 365, limitErr] = $(params.limit).optional.number().range(1, 365).$; + if (limitErr) return rej('invalid limit param'); + + const startTime = new Date(new Date().setMonth(new Date().getMonth() - 1)); + + const users = await User + .find({ + $or: [ + { deleted_at: { $exists: false } }, + { deleted_at: { $gt: startTime } } + ] + }, { + _id: false, + created_at: true, + deleted_at: true + }, { + sort: { created_at: -1 } + }); + + const graph = []; + + for (let i = 0; i < limit; i++) { + let day = new Date(new Date().setDate(new Date().getDate() - i)); + day = new Date(day.setMilliseconds(999)); + day = new Date(day.setSeconds(59)); + day = new Date(day.setMinutes(59)); + day = new Date(day.setHours(23)); + // day = day.getTime(); + + const count = users.filter(f => + f.created_at < day && (f.deleted_at == null || f.deleted_at > day) + ).length; + + graph.push({ + date: { + year: day.getFullYear(), + month: day.getMonth() + 1, // In JavaScript, month is zero-based. + day: day.getDate() + }, + count: count + }); + } + + res(graph); +}); diff --git a/src/api/endpoints/stats.ts b/src/api/endpoints/stats.ts new file mode 100644 index 0000000000..a6084cd17a --- /dev/null +++ b/src/api/endpoints/stats.ts @@ -0,0 +1,48 @@ +/** + * Module dependencies + */ +import Post from '../models/post'; +import User from '../models/user'; + +/** + * @swagger + * /stats: + * post: + * summary: Show the misskey's statistics + * responses: + * 200: + * description: Success + * schema: + * type: object + * properties: + * posts_count: + * description: count of all posts of misskey + * type: number + * users_count: + * description: count of all users of misskey + * type: number + * + * default: + * description: Failed + * schema: + * $ref: "#/definitions/Error" + */ + +/** + * Show the misskey's statistics + * + * @param {any} params + * @return {Promise} + */ +module.exports = params => new Promise(async (res, rej) => { + const postsCount = await Post + .count(); + + const usersCount = await User + .count(); + + res({ + posts_count: postsCount, + users_count: usersCount + }); +}); diff --git a/src/config.ts b/src/config.ts index 53b7108fdc..8f4ada5af9 100644 --- a/src/config.ts +++ b/src/config.ts @@ -81,6 +81,7 @@ type Mixin = { api_url: string; auth_url: string; about_url: string; + stats_url: string; status_url: string; dev_url: string; drive_url: string; @@ -116,6 +117,7 @@ export default function load() { mixin.auth_url = `${mixin.scheme}://auth.${mixin.host}`; mixin.dev_url = `${mixin.scheme}://dev.${mixin.host}`; mixin.about_url = `${mixin.scheme}://about.${mixin.host}`; + mixin.stats_url = `${mixin.scheme}://stats.${mixin.host}`; mixin.status_url = `${mixin.scheme}://status.${mixin.host}`; mixin.drive_url = `${mixin.secondary_scheme}://file.${mixin.secondary_host}`; diff --git a/src/web/app/common/scripts/config.js b/src/web/app/common/scripts/config.js index d108b834bb..75a7abba29 100644 --- a/src/web/app/common/scripts/config.js +++ b/src/web/app/common/scripts/config.js @@ -8,6 +8,7 @@ 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 { @@ -17,5 +18,6 @@ export default { apiUrl, devUrl, 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 16a93545a4..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 @@ -Misskeyについて・ステータス・Wiki・リポジトリ・開発者・Follow us on +Misskeyについて・統計・ステータス・Wiki・リポジトリ・開発者・Follow us on + + + + +

%i18n:stats.posts-count% { stats.posts_count }

+ + + + + + +

%i18n:stats.users-count% { stats.users_count }

+ + + + + + + + Black ... Total
Blue ... Posts
Red ... Replies
Green ... Reposts + + + + + + + + + + + + + + + + diff --git a/src/web/app/status/tags/index.tag b/src/web/app/status/tags/index.tag index 121f673d4d..07b9921abb 100644 --- a/src/web/app/status/tags/index.tag +++ b/src/web/app/status/tags/index.tag @@ -56,7 +56,6 @@ this.mixin('api'); this.initializing = true; - this.view = 0; this.connection = new Connection(); this.on('mount', () => { diff --git a/webpack/webpack.config.ts b/webpack/webpack.config.ts index 7035d4bb9a..5199285d55 100644 --- a/webpack/webpack.config.ts +++ b/webpack/webpack.config.ts @@ -16,6 +16,7 @@ module.exports = langs.map(([lang, locale]) => { const entry = { desktop: './src/web/app/desktop/script.js', mobile: './src/web/app/mobile/script.js', + stats: './src/web/app/stats/script.js', status: './src/web/app/status/script.js', dev: './src/web/app/dev/script.js', auth: './src/web/app/auth/script.js'