1 files changed, 23 insertions, 83 deletions

diff --git a/src/server/api/endpoints/notes/children.ts b/src/server/api/endpoints/notes/children.ts
index 3738459b71..72f2c39d6a 100644
--- a/src/server/api/endpoints/notes/children.ts
+++ b/src/server/api/endpoints/notes/children.ts
@@ -1,9 +1,11 @@
 import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
-import Note, { packMany } from '../../../../models/note';
+import { ID } from '../../../../misc/cafy-id';
 import define from '../../define';
-import { getFriends } from '../../common/get-friends';
-import { getHideUserIds } from '../../common/get-hide-users';
+import { makePaginationQuery } from '../../common/make-pagination-query';
+import { generateVisibilityQuery } from '../../common/generate-visibility-query';
+import { generateMuteQuery } from '../../common/generate-mute-query';
+import { Brackets } from 'typeorm';
+import { Notes } from '../../../../models';
 
 export const meta = {
 	desc: {
@@ -18,7 +20,6 @@ export const meta = {
 	params: {
 		noteId: {
 			validator: $.type(ID),
-			transform: transform,
 			desc: {
 				'ja-JP': '対象の投稿のID',
 				'en-US': 'Target note ID'
@@ -32,12 +33,10 @@ export const meta = {
 
 		sinceId: {
 			validator: $.optional.type(ID),
-			transform: transform,
 		},
 
 		untilId: {
 			validator: $.optional.type(ID),
-			transform: transform,
 		},
 	},
 
@@ -50,83 +49,24 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const [followings, hideUserIds] = await Promise.all([
-		// フォローを取得
-		// Fetch following
-		user ? getFriends(user._id) : [],
+	const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
+		.andWhere(new Brackets(qb => { qb
+			.where(`note.replyId = :noteId`, { noteId: ps.noteId })
+			.orWhere(new Brackets(qb => { qb
+				.where(`note.renoteId = :noteId`, { noteId: ps.noteId })
+				.andWhere(new Brackets(qb => { qb
+					.where(`note.text IS NOT NULL`)
+					.orWhere(`note.fileIds != '{}'`)
+					.orWhere(`note.hasPoll = TRUE`);
+				}));
+			}));
+		}))
+		.leftJoinAndSelect('note.user', 'user');
 
-		// 隠すユーザーを取得
-		getHideUserIds(user)
-	]);
+	if (user) generateVisibilityQuery(query, user);
+	if (user) generateMuteQuery(query, user);
 
-	const visibleQuery = user == null ? [{
-		visibility: { $in: [ 'public', 'home' ] }
-	}] : [{
-		visibility: { $in: [ 'public', 'home' ] }
-	}, {
-		// myself (for followers/specified/private)
-		userId: user._id
-	}, {
-		// to me (for specified)
-		visibleUserIds: { $in: [ user._id ] }
-	}, {
-		visibility: 'followers',
-		$or: [{
-			// フォロワーの投稿
-			userId: { $in: followings.map(f => f.id) },
-		}, {
-			// 自分の投稿へのリプライ
-			'_reply.userId': user._id,
-		}, {
-			// 自分へのメンションが含まれている
-			mentions: { $in: [ user._id ] }
-		}]
-	}];
+	const notes = await query.take(ps.limit).getMany();
 
-	const q = {
-		$and: [{
-			$or: [{
-				replyId: ps.noteId,
-			}, {
-				renoteId: ps.noteId,
-				$or: [{
-					text: { $ne: null }
-				}, {
-					fileIds: { $ne: [] }
-				}, {
-					poll: { $ne: null }
-				}]
-			}]
-		}, {
-			$or: visibleQuery
-		}]
-	} as any;
-
-	if (hideUserIds && hideUserIds.length > 0) {
-		q['userId'] = {
-			$nin: hideUserIds
-		};
-	}
-
-	const sort = {
-		_id: -1
-	};
-
-	if (ps.sinceId) {
-		sort._id = 1;
-		q._id = {
-			$gt: ps.sinceId
-		};
-	} else if (ps.untilId) {
-		q._id = {
-			$lt: ps.untilId
-		};
-	}
-
-	const notes = await Note.find(q, {
-		limit: ps.limit,
-		sort: sort
-	});
-
-	return await packMany(notes, user);
+	return await Notes.packMany(notes, user);
 });