wip

7 files changed, 19 insertions, 37 deletions

diff --git a/src/server/api/endpoints/aggregation/posts.ts b/src/server/api/endpoints/aggregation/posts.ts
index d348cadae9..9ada9cd3f5 100644
--- a/src/server/api/endpoints/aggregation/posts.ts
+++ b/src/server/api/endpoints/aggregation/posts.ts
@@ -1,13 +1,10 @@
-/**
- * Module dependencies
- */
 import $ from 'cafy';
 import Note from '../../../../models/note';
 
 /**
  * Aggregate notes
  */
-module.exports = params => new Promise(async (res, rej) => {
+module.exports = (params: any) => new Promise(async (res, rej) => {
 	// Get 'limit' parameter
 	const [limit = 365, limitErr] = $.num.optional().range(1, 365).get(params.limit);
 	if (limitErr) return rej('invalid limit param');
diff --git a/src/server/api/endpoints/aggregation/users.ts b/src/server/api/endpoints/aggregation/users.ts
index b116c1454b..c084404d0a 100644
--- a/src/server/api/endpoints/aggregation/users.ts
+++ b/src/server/api/endpoints/aggregation/users.ts
@@ -1,13 +1,10 @@
-/**
- * Module dependencies
- */
 import $ from 'cafy';
 import User from '../../../../models/user';
 
 /**
  * Aggregate users
  */
-module.exports = params => new Promise(async (res, rej) => {
+module.exports = (params: any) => new Promise(async (res, rej) => {
 	// Get 'limit' parameter
 	const [limit = 365, limitErr] = $.num.optional().range(1, 365).get(params.limit);
 	if (limitErr) return rej('invalid limit param');
diff --git a/src/server/api/endpoints/aggregation/users/activity.ts b/src/server/api/endpoints/aggregation/users/activity.ts
index 9109487ac6..d4c716d65b 100644
--- a/src/server/api/endpoints/aggregation/users/activity.ts
+++ b/src/server/api/endpoints/aggregation/users/activity.ts
@@ -1,6 +1,3 @@
-/**
- * Module dependencies
- */
 import $ from 'cafy'; import ID from '../../../../../cafy-id';
 import User from '../../../../../models/user';
 import Note from '../../../../../models/note';
@@ -10,7 +7,7 @@ import Note from '../../../../../models/note';
 /**
  * Aggregate activity of a user
  */
-module.exports = (params) => new Promise(async (res, rej) => {
+module.exports = (params: any) => new Promise(async (res, rej) => {
 	// Get 'limit' parameter
 	const [limit = 365, limitErr] = $.num.optional().range(1, 365).get(params.limit);
 	if (limitErr) return rej('invalid limit param');
@@ -73,13 +70,13 @@ module.exports = (params) => new Promise(async (res, rej) => {
 			} }
 		]);
 
-	datas.forEach(data => {
+	datas.forEach((data: any) => {
 		data.date = data._id;
 		delete data._id;
 
-		data.notes = (data.data.filter(x => x.type == 'note')[0] || { count: 0 }).count;
-		data.renotes = (data.data.filter(x => x.type == 'renote')[0] || { count: 0 }).count;
-		data.replies = (data.data.filter(x => x.type == 'reply')[0] || { count: 0 }).count;
+		data.notes = (data.data.filter((x: any) => x.type == 'note')[0] || { count: 0 }).count;
+		data.renotes = (data.data.filter((x: any) => x.type == 'renote')[0] || { count: 0 }).count;
+		data.replies = (data.data.filter((x: any) => x.type == 'reply')[0] || { count: 0 }).count;
 
 		delete data.data;
 	});
@@ -89,7 +86,7 @@ module.exports = (params) => new Promise(async (res, rej) => {
 	for (let i = 0; i < limit; i++) {
 		const day = new Date(new Date().setDate(new Date().getDate() - i));
 
-		const data = datas.filter(d =>
+		const data = datas.filter((d: any) =>
 			d.date.year == day.getFullYear() && d.date.month == day.getMonth() + 1 && d.date.day == day.getDate()
 		)[0];
 
diff --git a/src/server/api/endpoints/aggregation/users/followers.ts b/src/server/api/endpoints/aggregation/users/followers.ts
index dfcaf8462f..847f376079 100644
--- a/src/server/api/endpoints/aggregation/users/followers.ts
+++ b/src/server/api/endpoints/aggregation/users/followers.ts
@@ -8,7 +8,7 @@ import FollowedLog from '../../../../../models/followed-log';
 /**
  * Aggregate followers of a user
  */
-module.exports = (params) => new Promise(async (res, rej) => {
+module.exports = (params: any) => new Promise(async (res, rej) => {
 	// Get 'userId' parameter
 	const [userId, userIdErr] = $.type(ID).get(params.userId);
 	if (userIdErr) return rej('invalid userId param');
diff --git a/src/server/api/endpoints/aggregation/users/following.ts b/src/server/api/endpoints/aggregation/users/following.ts
index 5f826fd71c..6c52752f98 100644
--- a/src/server/api/endpoints/aggregation/users/following.ts
+++ b/src/server/api/endpoints/aggregation/users/following.ts
@@ -8,7 +8,7 @@ import FollowingLog from '../../../../../models/following-log';
 /**
  * Aggregate following of a user
  */
-module.exports = (params) => new Promise(async (res, rej) => {
+module.exports = (params: any) => new Promise(async (res, rej) => {
 	// Get 'userId' parameter
 	const [userId, userIdErr] = $.type(ID).get(params.userId);
 	if (userIdErr) return rej('invalid userId param');
diff --git a/src/server/api/endpoints/aggregation/users/post.ts b/src/server/api/endpoints/aggregation/users/post.ts
index 11f9ef14cd..28ba1482bf 100644
--- a/src/server/api/endpoints/aggregation/users/post.ts
+++ b/src/server/api/endpoints/aggregation/users/post.ts
@@ -1,6 +1,3 @@
-/**
- * Module dependencies
- */
 import $ from 'cafy'; import ID from '../../../../../cafy-id';
 import User from '../../../../../models/user';
 import Note from '../../../../../models/note';
@@ -8,7 +5,7 @@ import Note from '../../../../../models/note';
 /**
  * Aggregate note of a user
  */
-module.exports = (params) => new Promise(async (res, rej) => {
+module.exports = (params: any) => new Promise(async (res, rej) => {
 	// Get 'userId' parameter
 	const [userId, userIdErr] = $.type(ID).get(params.userId);
 	if (userIdErr) return rej('invalid userId param');
@@ -67,13 +64,13 @@ module.exports = (params) => new Promise(async (res, rej) => {
 			} }
 		]);
 
-	datas.forEach(data => {
+	datas.forEach((data: any) => {
 		data.date = data._id;
 		delete data._id;
 
-		data.notes = (data.data.filter(x => x.type == 'note')[0] || { count: 0 }).count;
-		data.renotes = (data.data.filter(x => x.type == 'renote')[0] || { count: 0 }).count;
-		data.replies = (data.data.filter(x => x.type == 'reply')[0] || { count: 0 }).count;
+		data.notes = (data.data.filter((x: any) => x.type == 'note')[0] || { count: 0 }).count;
+		data.renotes = (data.data.filter((x: any) => x.type == 'renote')[0] || { count: 0 }).count;
+		data.replies = (data.data.filter((x: any) => x.type == 'reply')[0] || { count: 0 }).count;
 
 		delete data.data;
 	});
@@ -83,7 +80,7 @@ module.exports = (params) => new Promise(async (res, rej) => {
 	for (let i = 0; i < 30; i++) {
 		const day = new Date(new Date().setDate(new Date().getDate() - i));
 
-		const data = datas.filter(d =>
+		const data = datas.filter((d: any) =>
 			d.date.year == day.getFullYear() && d.date.month == day.getMonth() + 1 && d.date.day == day.getDate()
 		)[0];
 
diff --git a/src/server/api/endpoints/aggregation/users/reaction.ts b/src/server/api/endpoints/aggregation/users/reaction.ts
index 2de2840258..adb5acfb4e 100644
--- a/src/server/api/endpoints/aggregation/users/reaction.ts
+++ b/src/server/api/endpoints/aggregation/users/reaction.ts
@@ -1,17 +1,11 @@
-/**
- * Module dependencies
- */
 import $ from 'cafy'; import ID from '../../../../../cafy-id';
 import User from '../../../../../models/user';
 import Reaction from '../../../../../models/note-reaction';
 
 /**
  * Aggregate reaction of a user
- *
- * @param {any} params
- * @return {Promise<any>}
  */
-module.exports = (params) => new Promise(async (res, rej) => {
+module.exports = (params: any) => new Promise(async (res, rej) => {
 	// Get 'userId' parameter
 	const [userId, userIdErr] = $.type(ID).get(params.userId);
 	if (userIdErr) return rej('invalid userId param');
@@ -48,7 +42,7 @@ module.exports = (params) => new Promise(async (res, rej) => {
 			}}
 		]);
 
-	datas.forEach(data => {
+	datas.forEach((data: any) => {
 		data.date = data._id;
 		delete data._id;
 	});
@@ -58,7 +52,7 @@ module.exports = (params) => new Promise(async (res, rej) => {
 	for (let i = 0; i < 30; i++) {
 		const day = new Date(new Date().setDate(new Date().getDate() - i));
 
-		const data = datas.filter(d =>
+		const data = datas.filter((d: any) =>
 			d.date.year == day.getFullYear() && d.date.month == day.getMonth() + 1 && d.date.day == day.getDate()
 		)[0];