Refactoring

src/services/drive/add-file.ts

@@ -17,7 +17,8 @@ import { isLocalUser, IUser, IRemoteUser } from '../../models/user';
 import delFile from './delete-file';
 import config from '../../config';
 import { getDriveFileThumbnailBucket } from '../../models/drive-file-thumbnail';
-import { driveStats, perUserDriveStats } from '../stats';
+import driveChart from '../../chart/drive';
+import perUserDriveChart from '../../chart/per-user-drive';
 
 const log = debug('misskey:drive:add-file');
 
@@ -399,8 +400,8 @@ export default async function(
 	});
 
 	// 統計を更新
-	driveStats.update(driveFile, true);
-	perUserDriveStats.update(driveFile, true);
+	driveChart.update(driveFile, true);
+	perUserDriveChart.update(driveFile, true);
 
 	return driveFile;
 }

src/services/drive/delete-file.ts

@@ -2,7 +2,8 @@ import * as Minio from 'minio';
 import DriveFile, { DriveFileChunk, IDriveFile } from '../../models/drive-file';
 import DriveFileThumbnail, { DriveFileThumbnailChunk } from '../../models/drive-file-thumbnail';
 import config from '../../config';
-import { driveStats, perUserDriveStats } from '../stats';
+import driveChart from '../../chart/drive';
+import perUserDriveChart from '../../chart/per-user-drive';
 
 export default async function(file: IDriveFile, isExpired = false) {
 	if (file.metadata.storage == 'minio') {
@@ -48,6 +49,6 @@ export default async function(file: IDriveFile, isExpired = false) {
 	//#endregion
 
 	// 統計を更新
-	driveStats.update(file, false);
-	perUserDriveStats.update(file, false);
+	driveChart.update(file, false);
+	perUserDriveChart.update(file, false);
 }

src/services/following/create.ts

@@ -7,7 +7,7 @@ import renderFollow from '../../remote/activitypub/renderer/follow';
 import renderAccept from '../../remote/activitypub/renderer/accept';
 import { deliver } from '../../queue';
 import createFollowRequest from './requests/create';
-import { perUserFollowingStats } from '../stats';
+import perUserFollowingChart from '../../chart/per-user-following';
 
 export default async function(follower: IUser, followee: IUser, requestId?: string) {
 	// フォロー対象が鍵アカウントである or
@@ -53,7 +53,7 @@ export default async function(follower: IUser, followee: IUser, requestId?: stri
 	});
 	//#endregion
 
-	perUserFollowingStats.update(follower, followee, true);
+	perUserFollowingChart.update(follower, followee, true);
 
 	// Publish follow event
 	if (isLocalUser(follower)) {

src/services/following/delete.ts

@@ -5,7 +5,7 @@ import pack from '../../remote/activitypub/renderer';
 import renderFollow from '../../remote/activitypub/renderer/follow';
 import renderUndo from '../../remote/activitypub/renderer/undo';
 import { deliver } from '../../queue';
-import { perUserFollowingStats } from '../stats';
+import perUserFollowingChart from '../../chart/per-user-following';
 
 export default async function(follower: IUser, followee: IUser) {
 	const following = await Following.findOne({
@@ -38,7 +38,7 @@ export default async function(follower: IUser, followee: IUser) {
 	});
 	//#endregion
 
-	perUserFollowingStats.update(follower, followee, false);
+	perUserFollowingChart.update(follower, followee, false);
 
 	// Publish unfollow event
 	if (isLocalUser(follower)) {

src/services/following/requests/accept.ts

@@ -6,7 +6,7 @@ import renderAccept from '../../../remote/activitypub/renderer/accept';
 import { deliver } from '../../../queue';
 import Following from '../../../models/following';
 import { publishMainStream } from '../../../stream';
-import { perUserFollowingStats } from '../../stats';
+import perUserFollowingChart from '../../../chart/per-user-following';
 
 export default async function(followee: IUser, follower: IUser) {
 	await Following.insert({
@@ -58,7 +58,7 @@ export default async function(followee: IUser, follower: IUser) {
 	});
 	//#endregion
 
-	perUserFollowingStats.update(follower, followee, true);
+	perUserFollowingChart.update(follower, followee, true);
 
 	await User.update({ _id: followee._id }, {
 		$inc: {

src/services/note/create.ts

@@ -23,7 +23,9 @@ import registerHashtag from '../register-hashtag';
 import isQuote from '../../misc/is-quote';
 import { TextElementMention } from '../../mfm/parse/elements/mention';
 import { TextElementHashtag } from '../../mfm/parse/elements/hashtag';
-import { notesStats, perUserNotesStats } from '../stats';
+import notesChart from '../../chart/notes';
+import perUserNotesChart from '../../chart/per-user-notes';
+
 import { erase, unique } from '../../prelude/array';
 import insertNoteUnread from './unread';
 
@@ -165,8 +167,8 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
 	}
 
 	// 統計を更新
-	notesStats.update(note, true);
-	perUserNotesStats.update(user, note, true);
+	notesChart.update(note, true);
+	perUserNotesChart.update(user, note, true);
 
 	// ハッシュタグ登録
 	tags.map(tag => registerHashtag(user, tag));

src/services/note/delete.ts

@@ -6,7 +6,8 @@ import pack from '../../remote/activitypub/renderer';
 import { deliver } from '../../queue';
 import Following from '../../models/following';
 import renderTombstone from '../../remote/activitypub/renderer/tombstone';
-import { notesStats, perUserNotesStats } from '../stats';
+import notesChart from '../../chart/notes';
+import perUserNotesChart from '../../chart/per-user-notes';
 import config from '../../config';
 import NoteUnread from '../../models/note-unread';
 import read from './read';
@@ -63,6 +64,6 @@ export default async function(user: IUser, note: INote) {
 	//#endregion
 
 	// 統計を更新
-	notesStats.update(note, false);
-	perUserNotesStats.update(user, note, false);
+	notesChart.update(note, false);
+	perUserNotesChart.update(user, note, false);
 }

src/services/note/reaction/create.ts

@@ -8,7 +8,7 @@ import watch from '../watch';
 import renderLike from '../../../remote/activitypub/renderer/like';
 import { deliver } from '../../../queue';
 import pack from '../../../remote/activitypub/renderer';
-import { perUserReactionsStats } from '../../stats';
+import perUserReactionsChart from '../../../chart/per-user-reactions';
 
 export default async (user: IUser, note: INote, reaction: string) => new Promise(async (res, rej) => {
 	// Myself
@@ -44,7 +44,7 @@ export default async (user: IUser, note: INote, reaction: string) => new Promise
 		$inc: inc
 	});
 
-	perUserReactionsStats.update(user, note);
+	perUserReactionsChart.update(user, note);
 
 	publishNoteStream(note._id, 'reacted', {
 		reaction: reaction,

src/services/register-hashtag.ts

@@ -1,6 +1,6 @@
 import { IUser } from '../models/user';
 import Hashtag from '../models/hashtag';
-import { hashtagStats } from './stats';
+import hashtagChart from '../chart/hashtag';
 
 export default async function(user: IUser, tag: string) {
 	tag = tag.toLowerCase();
@@ -27,5 +27,5 @@ export default async function(user: IUser, tag: string) {
 		});
 	}
 
-	hashtagStats.update(tag, user._id);
+	hashtagChart.update(tag, user._id);
 }