profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactoring

Browse source
This commit is contained in:
syuilo 2018-10-23 05:36:35 +09:00
parent c8b6b6e44f
commit 7c7f32d9a6
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
32 changed files with 1125 additions and 1111 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/server/api/endpoints/charts/drive.ts
View file

@ -1,10 +1,10 @@
import $ from 'cafy';
import getParams from '../../get-params';
import { driveStats } from '../../../../services/stats';
import driveChart from '../../../../chart/drive';
export const meta = {
desc: {
'ja-JP': 'ドライブの統計を取得します。'
'ja-JP': 'ドライブのチャートを取得します。'
},
params: {
@ -27,7 +27,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) throw psErr;
const stats = await driveStats.getChart(ps.span as any, ps.limit);
const stats = await driveChart.getChart(ps.span as any, ps.limit);
res(stats);
});

6
src/server/api/endpoints/charts/hashtag.ts
View file

@ -1,10 +1,10 @@
import $ from 'cafy';
import getParams from '../../get-params';
import { hashtagStats } from '../../../../services/stats';
import hashtagChart from '../../../../chart/hashtag';
export const meta = {
desc: {
'ja-JP': 'ハッシュタグごとの統計を取得します。'
'ja-JP': 'ハッシュタグごとのチャートを取得します。'
},
params: {
@ -33,7 +33,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) throw psErr;
const stats = await hashtagStats.getChart(ps.span as any, ps.limit, ps.tag);
const stats = await hashtagChart.getChart(ps.span as any, ps.limit, ps.tag);
res(stats);
});

6
src/server/api/endpoints/charts/network.ts
View file

@ -1,10 +1,10 @@
import $ from 'cafy';
import getParams from '../../get-params';
import { networkStats } from '../../../../services/stats';
import networkChart from '../../../../chart/network';
export const meta = {
desc: {
'ja-JP': 'ネットワークの統計を取得します。'
'ja-JP': 'ネットワークのチャートを取得します。'
},
params: {
@ -27,7 +27,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) throw psErr;
const stats = await networkStats.getChart(ps.span as any, ps.limit);
const stats = await networkChart.getChart(ps.span as any, ps.limit);
res(stats);
});

6
src/server/api/endpoints/charts/notes.ts
View file

@ -1,10 +1,10 @@
import $ from 'cafy';
import getParams from '../../get-params';
import { notesStats } from '../../../../services/stats';
import notesChart from '../../../../chart/notes';
export const meta = {
desc: {
'ja-JP': '投稿の統計を取得します。'
'ja-JP': '投稿のチャートを取得します。'
},
params: {
@ -27,7 +27,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) throw psErr;
const stats = await notesStats.getChart(ps.span as any, ps.limit);
const stats = await notesChart.getChart(ps.span as any, ps.limit);
res(stats);
});

6
src/server/api/endpoints/charts/user/drive.ts
View file

@ -1,11 +1,11 @@
import $ from 'cafy';
import getParams from '../../../get-params';
import { perUserDriveStats } from '../../../../../services/stats';
import perUserDriveChart from '../../../../../chart/per-user-drive';
import ID from '../../../../../misc/cafy-id';
export const meta = {
desc: {
'ja-JP': 'ユーザーごとのドライブの統計を取得します。'
'ja-JP': 'ユーザーごとのドライブのチャートを取得します。'
},
params: {
@ -35,7 +35,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) throw psErr;
const stats = await perUserDriveStats.getChart(ps.span as any, ps.limit, ps.userId);
const stats = await perUserDriveChart.getChart(ps.span as any, ps.limit, ps.userId);
res(stats);
});

6
src/server/api/endpoints/charts/user/following.ts
View file

@ -1,11 +1,11 @@
import $ from 'cafy';
import getParams from '../../../get-params';
import { perUserFollowingStats } from '../../../../../services/stats';
import perUserFollowingChart from '../../../../../chart/per-user-following';
import ID from '../../../../../misc/cafy-id';
export const meta = {
desc: {
'ja-JP': 'ユーザーごとのフォロー/フォロワーの統計を取得します。'
'ja-JP': 'ユーザーごとのフォロー/フォロワーのチャートを取得します。'
},
params: {
@ -35,7 +35,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) throw psErr;
const stats = await perUserFollowingStats.getChart(ps.span as any, ps.limit, ps.userId);
const stats = await perUserFollowingChart.getChart(ps.span as any, ps.limit, ps.userId);
res(stats);
});

6
src/server/api/endpoints/charts/user/notes.ts
View file

@ -1,11 +1,11 @@
import $ from 'cafy';
import getParams from '../../../get-params';
import { perUserNotesStats } from '../../../../../services/stats';
import perUserNotesChart from '../../../../../chart/per-user-notes';
import ID from '../../../../../misc/cafy-id';
export const meta = {
desc: {
'ja-JP': 'ユーザーごとの投稿の統計を取得します。'
'ja-JP': 'ユーザーごとの投稿のチャートを取得します。'
},
params: {
@ -35,7 +35,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) throw psErr;
const stats = await perUserNotesStats.getChart(ps.span as any, ps.limit, ps.userId);
const stats = await perUserNotesChart.getChart(ps.span as any, ps.limit, ps.userId);
res(stats);
});

6
src/server/api/endpoints/charts/user/reactions.ts
View file

@ -1,11 +1,11 @@
import $ from 'cafy';
import getParams from '../../../get-params';
import { perUserReactionsStats } from '../../../../../services/stats';
import perUserReactionsChart from '../../../../../chart/per-user-reactions';
import ID from '../../../../../misc/cafy-id';
export const meta = {
desc: {
'ja-JP': 'ユーザーごとの被リアクション数の統計を取得します。'
'ja-JP': 'ユーザーごとの被リアクション数のチャートを取得します。'
},
params: {
@ -35,7 +35,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) throw psErr;
const stats = await perUserReactionsStats.getChart(ps.span as any, ps.limit, ps.userId);
const stats = await perUserReactionsChart.getChart(ps.span as any, ps.limit, ps.userId);
res(stats);
});

6
src/server/api/endpoints/charts/users.ts
View file

@ -1,10 +1,10 @@
import $ from 'cafy';
import getParams from '../../get-params';
import { usersStats } from '../../../../services/stats';
import usersChart from '../../../../chart/users';
export const meta = {
desc: {
'ja-JP': 'ユーザーの統計を取得します。'
'ja-JP': 'ユーザーのチャートを取得します。'
},
params: {
@ -27,7 +27,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) throw psErr;
const stats = await usersStats.getChart(ps.span as any, ps.limit);
const stats = await usersChart.getChart(ps.span as any, ps.limit);
res(stats);
});

4
src/server/api/private/signup.ts
View file

@ -7,7 +7,7 @@ import generateUserToken from '../common/generate-native-user-token';
import config from '../../../config';
import Meta from '../../../models/meta';
import RegistrationTicket from '../../../models/registration-tickets';
import { usersStats } from '../../../services/stats';
import usersChart from '../../../chart/users';
if (config.recaptcha) {
recaptcha.init({
@ -130,7 +130,7 @@ export default async (ctx: Koa.Context) => {
}, { upsert: true });
//#endregion
usersStats.update(account, true);
usersChart.update(account, true);
const res = await pack(account, account, {
detail: true,

4
src/server/index.ts
View file

@ -17,7 +17,7 @@ const requestStats = require('request-stats');
import activityPub from './activitypub';
import webFinger from './webfinger';
import config from '../config';
import { networkStats } from '../services/stats';
import networkChart from '../chart/network';
import apiServer from './api';
// Init app
@ -104,7 +104,7 @@ export default () => new Promise(resolve => {
const outgoingBytes = queue.reduce((a, b) => a + b.res.bytes, 0);
queue = [];
networkStats.update(requests, time, incomingBytes, outgoingBytes);
networkChart.update(requests, time, incomingBytes, outgoingBytes);
}, 5000);
//#endregion
});