Merge branch 'master' of https://github.com/syuilo/misskey

1 files changed, 1 insertions, 5 deletions

diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts
index c60050d3cd..ff7855bde0 100644
--- a/src/server/api/endpoints/users/notes.ts
+++ b/src/server/api/endpoints/users/notes.ts
@@ -16,17 +16,13 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
 	if (usernameErr) return rej('invalid username param');
 
 	if (userId === undefined && username === undefined) {
-		return rej('userId or pair of username and host is required');
+		return rej('userId or username is required');
 	}
 
 	// Get 'host' parameter
 	const [host, hostErr] = $.str.optional.get(params.host);
 	if (hostErr) return rej('invalid host param');
 
-	if (userId === undefined && host === undefined) {
-		return rej('userId or pair of username and host is required');
-	}
-
 	// Get 'includeReplies' parameter
 	const [includeReplies = true, includeRepliesErr] = $.bool.optional.get(params.includeReplies);
 	if (includeRepliesErr) return rej('invalid includeReplies param');