From dd1aa8c7d6ec003fcf187c1fc8e6c56f60723414 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Aug 2017 15:17:03 +0900 Subject: stats --- 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 +++++++++++++++++ 4 files changed, 211 insertions(+) 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 (limited to 'src/api') 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 + }); +}); -- cgit v1.2.3-freya From 0e786fbb667450b385c46a1981b6f9b630dc0b65 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Aug 2017 18:02:28 +0900 Subject: その日ごとの「アカウントが作成された回数」もグラフにするようにした MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/endpoints/aggregation/users.ts | 41 +++++++++++++++++----------------- src/web/app/stats/tags/index.tag | 13 ++++++++--- 2 files changed, 30 insertions(+), 24 deletions(-) (limited to 'src/api') diff --git a/src/api/endpoints/aggregation/users.ts b/src/api/endpoints/aggregation/users.ts index 9be4ca12a1..9eb2d035ec 100644 --- a/src/api/endpoints/aggregation/users.ts +++ b/src/api/endpoints/aggregation/users.ts @@ -15,15 +15,8 @@ module.exports = params => new Promise(async (res, rej) => { 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 } } - ] - }, { + .find({}, { _id: false, created_at: true, deleted_at: true @@ -34,24 +27,30 @@ module.exports = params => new Promise(async (res, rej) => { 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)); + let dayStart = new Date(new Date().setDate(new Date().getDate() - i)); + dayStart = new Date(dayStart.setMilliseconds(0)); + dayStart = new Date(dayStart.setSeconds(0)); + dayStart = new Date(dayStart.setMinutes(0)); + dayStart = new Date(dayStart.setHours(0)); + + let dayEnd = new Date(new Date().setDate(new Date().getDate() - i)); + dayEnd = new Date(dayEnd.setMilliseconds(999)); + dayEnd = new Date(dayEnd.setSeconds(59)); + dayEnd = new Date(dayEnd.setMinutes(59)); + dayEnd = new Date(dayEnd.setHours(23)); // day = day.getTime(); - const count = users.filter(f => - f.created_at < day && (f.deleted_at == null || f.deleted_at > day) + const total = users.filter(u => + u.created_at < dayEnd && (u.deleted_at == null || u.deleted_at > dayEnd) + ).length; + + const created = users.filter(u => + u.created_at < dayEnd && u.created_at > dayStart ).length; graph.push({ - date: { - year: day.getFullYear(), - month: day.getMonth() + 1, // In JavaScript, month is zero-based. - day: day.getDate() - }, - count: count + total: total, + created: created }); } diff --git a/src/web/app/stats/tags/index.tag b/src/web/app/stats/tags/index.tag index 0adf58b0bd..134fad3c0c 100644 --- a/src/web/app/stats/tags/index.tag +++ b/src/web/app/stats/tags/index.tag @@ -168,7 +168,12 @@ + @@ -187,7 +192,8 @@ this.viewBoxY = 80; this.data = this.opts.data.reverse(); - const peak = Math.max.apply(null, this.data.map(d => d.count)); + 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(); @@ -195,7 +201,8 @@ this.render = () => { this.update({ - points: this.data.map((d, i) => `${i},${(1 - (d.count / peak)) * this.viewBoxY}`).join(' ') + 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(' ') }); }; -- cgit v1.2.3-freya From 8564a29b5aa1dd34d373cac94480612b9e573345 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Aug 2017 18:03:23 +0900 Subject: [API] Remove needless data --- src/api/endpoints/aggregation/posts.ts | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/api') diff --git a/src/api/endpoints/aggregation/posts.ts b/src/api/endpoints/aggregation/posts.ts index 573816e4fd..48ee225129 100644 --- a/src/api/endpoints/aggregation/posts.ts +++ b/src/api/endpoints/aggregation/posts.ts @@ -79,11 +79,6 @@ module.exports = params => new Promise(async (res, rej) => { 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 -- cgit v1.2.3-freya