Resolve #4184

mei23 · Nov 24, 2022 · 2da0997 · 2da0997
1 parent 3d2b9dc
commit 2da0997
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/server/api/endpoints/users/search.ts b/src/server/api/endpoints/users/search.ts
@@ -107,12 +107,12 @@ export default define(meta, async (ps, me) => {
 			});
 		}
 
-		if (users.length < ps.limit) {
+		if (users.length < ps.limit!) {
 			// local
 			const otherUsers = await User
 				.find({
 					host: null,
-					name: new RegExp('^' + escapeRegexp(name), 'i'),
+					name: new RegExp(escapeRegexp(name), 'i'),
 					isDeleted: { $ne: true },
 					isSuspended: { $ne: true }
 				}, {
@@ -122,32 +122,32 @@ export default define(meta, async (ps, me) => {
 			users = users.concat(otherUsers);
 		}
 
-		if (users.length < ps.limit && !ps.localOnly) {
+		if (users.length < ps.limit! && !ps.localOnly) {
 			// try remote
 			const otherUsers = await User
 				.find({
 					host: { $nin: hideHostsForRemote },
-					name: new RegExp('^' + escapeRegexp(name), 'i'),
+					name: new RegExp(escapeRegexp(name), 'i'),
 					isDeleted: { $ne: true },
 					isSuspended: { $ne: true }
 				}, {
-					limit: ps.limit - users.length
+					limit: ps.limit! - users.length
 				});
 
 			users = users.concat(otherUsers);
 		}
 	// ユーザー名
 	} else if (isUsername) {
 		// まず、username (local/remote) の完全一致でアクティブ順
-		if (users.length < ps.limit && !ps.localOnly) {
+		if (users.length < ps.limit! && !ps.localOnly) {
 			users = await User
 				.find({
 						host: { $nin: hideHosts },
 						usernameLower: ps.query.replace('@', '').toLowerCase(),
 						isDeleted: { $ne: true },
 						isSuspended: { $ne: true }
 					}, {
-						limit: ps.limit - users.length,
+						limit: ps.limit! - users.length,
 						skip: ps.offset,
 						sort: { updatedAt: -1 },
 					});
@@ -156,7 +156,7 @@ export default define(meta, async (ps, me) => {
 		const ids = users.map(user => user._id);
 
 		// 足りなかったら、username (local) の前方一致でid順
-		if (users.length < ps.limit) {
+		if (users.length < ps.limit!) {
 			const otherUsers = await User
 				.find({
 					_id: { $nin: ids },
@@ -165,15 +165,15 @@ export default define(meta, async (ps, me) => {
 					isDeleted: { $ne: true },
 					isSuspended: { $ne: true }
 				}, {
-					limit: ps.limit - users.length,
+					limit: ps.limit! - users.length,
 					skip: ps.offset
 				});
 
 				users = users.concat(otherUsers);
 		}
 
 		// 足りなかったら、username (remote) の前方一致でid順
-		if (users.length < ps.limit && !ps.localOnly) {
+		if (users.length < ps.limit! && !ps.localOnly) {
 			const otherUsers = await User
 				.find({
 					_id: { $nin: ids },
@@ -182,7 +182,7 @@ export default define(meta, async (ps, me) => {
 					isDeleted: { $ne: true },
 					isSuspended: { $ne: true }
 				}, {
-					limit: ps.limit - users.length,
+					limit: ps.limit! - users.length,
 					skip: ps.offset
 				});
 
@@ -196,7 +196,7 @@ export default define(meta, async (ps, me) => {
 			isDeleted: { $ne: true },
 			isSuspended: { $ne: true }
 		}, {
-			limit: ps.limit - users.length
+			limit: ps.limit! - users.length
 		});
 	}