2 files changed, 8 insertions, 11 deletions
diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts
index 4f8d6a4f4f..fd1fb3922c 100644
--- a/src/server/api/endpoints/notes/create.ts
+++ b/src/server/api/endpoints/notes/create.ts
@@ -219,7 +219,7 @@ export default define(meta, (ps, user, app) => new Promise(async (res, rej) => {
 	}
 
 	// テキストが無いかつ添付ファイルが無いかつRenoteも無いかつ投票も無かったらエラー
-	if ((ps.text == null) && files === null && renote === null && ps.poll == null) {
+	if (!(ps.text || files.length || renote || ps.poll)) {
 		return rej('text, fileIds, renoteId or poll is required');
 	}
 
diff --git a/src/server/api/endpoints/notes/replies.ts b/src/server/api/endpoints/notes/replies.ts
index 6046b9b310..6c2b690ab2 100644
--- a/src/server/api/endpoints/notes/replies.ts
+++ b/src/server/api/endpoints/notes/replies.ts
@@ -33,16 +33,13 @@ export const meta = {
 };
 
 export default define(meta, (ps, user) => new Promise(async (res, rej) => {
-	// Lookup note
-	const note = await Note.findOne({
-		_id: ps.noteId
-	});
 
-	if (note === null) {
-		return rej('note not found');
-	}
-
-	const ids = (note._replyIds || []).slice(ps.offset, ps.offset + ps.limit);
+	const notes = await Note.find({
+			replyId: ps.noteId
+		}, {
+			limit: ps.limit,
+			skip: ps.offset
+		});
 
-	res(await packMany(ids, user));
+	res(await packMany(notes, user));
 }));