Resolve #4121 (#4122)

* Resolve #4121

* Update tslint.json

3 files changed, 10 insertions, 10 deletions

diff --git a/src/server/api/endpoints/aggregation/hashtags.ts b/src/server/api/endpoints/aggregation/hashtags.ts
index 7577711b5f..13d0e1e2a6 100644
--- a/src/server/api/endpoints/aggregation/hashtags.ts
+++ b/src/server/api/endpoints/aggregation/hashtags.ts
@@ -29,22 +29,22 @@ export default define(meta, (ps) => new Promise(async (res, rej) => {
 		$group: {
 			_id: { tag: '$tagsLower', userId: '$userId' }
 		}
-	}]) as Array<{
+	}]) as {
 		_id: {
 			tag: string;
 			userId: any;
 		}
-	}>;
+	}[];
 	//#endregion
 
 	if (data.length == 0) {
 		return res([]);
 	}
 
-	let tags: Array<{
+	let tags: {
 		name: string;
 		count: number;
-	}> = [];
+	}[] = [];
 
 	// カウント
 	for (const x of data.map(x => x._id).filter(x => !hidedTags.includes(x.tag))) {
diff --git a/src/server/api/endpoints/hashtags/trend.ts b/src/server/api/endpoints/hashtags/trend.ts
index a26dbf0941..d4efe5d910 100644
--- a/src/server/api/endpoints/hashtags/trend.ts
+++ b/src/server/api/endpoints/hashtags/trend.ts
@@ -40,22 +40,22 @@ export default define(meta, () => new Promise(async (res, rej) => {
 		$group: {
 			_id: { tag: '$tagsLower', userId: '$userId' }
 		}
-	}]) as Array<{
+	}]) as {
 		_id: {
 			tag: string;
 			userId: any;
 		}
-	}>;
+	}[];
 	//#endregion
 
 	if (data.length == 0) {
 		return res([]);
 	}
 
-	const tags: Array<{
+	const tags: {
 		name: string;
 		count: number;
-	}> = [];
+	}[] = [];
 
 	// カウント
 	for (const x of data.map(x => x._id).filter(x => !hidedTags.includes(x.tag))) {
@@ -108,7 +108,7 @@ export default define(meta, () => new Promise(async (res, rej) => {
 	//#endregion
 
 	//#region 2(または3)で話題と判定されたタグそれぞれについて過去の投稿数グラフを取得する
-	const countPromises: Array<Promise<any[]>> = [];
+	const countPromises: Promise<any[]>[] = [];
 
 	const range = 20;
 
diff --git a/src/server/api/stream/channels/hashtag.ts b/src/server/api/stream/channels/hashtag.ts
index c8b6c578de..586ce02f06 100644
--- a/src/server/api/stream/channels/hashtag.ts
+++ b/src/server/api/stream/channels/hashtag.ts
@@ -14,7 +14,7 @@ export default class extends Channel {
 		const mute = this.user ? await Mute.find({ muterId: this.user._id }) : null;
 		const mutedUserIds = mute ? mute.map(m => m.muteeId.toString()) : [];
 
-		const q: Array<string[]> = params.q;
+		const q: string[][] = params.q;
 
 		if (q == null) return;