fix being able to register with taken username

1 files changed, 8 insertions, 5 deletions

diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts

index 5ec9862e..07b68b6d 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -379,7 +379,7 @@ export class User extends BaseClass {
 
 		if (uniqueUsernames) {
 			// check if there is already an account with this username
-			if (!User.isUsernameAvailable(username))
+			if (!(await User.isUsernameAvailable(username)))
 				throw FieldErrors({
 					username: {
 						code: "USERNAME_ALREADY_TAKEN",
@@ -463,11 +463,14 @@ export class User extends BaseClass {
 	}
 
 	static async isUsernameAvailable(username: string) {
-		const user = await User.findOne({
-			where: { username },
-			select: ["id"],
+		// TODO: implement regex check?
+		const count = await User.count({
+			where: {
+				username: username.toLowerCase(),
+			},
 		});
-		return !user;
+
+		return count === 0;
 	}
 }