From af6b5a6594856794573ff700c5ea388e4cc4500d Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Thu, 2 Feb 2023 22:15:03 +1100
Subject: [PATCH] Merge pull request from GHSA-r7h4-76f7-6264

* Actually use maxUsername config value.

* Change maxUsername default to discord.com default
---
 src/api/routes/users/@me/index.ts                      | 10 ++++++++++
 .../types/subconfigurations/limits/UserLimits.ts       |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts
index 0d3c3135..30091344 100644
--- a/src/api/routes/users/@me/index.ts
+++ b/src/api/routes/users/@me/index.ts
@@ -129,6 +129,16 @@ router.patch(
 					},
 				});
 			}
+
+			const { maxUsername } = Config.get().limits.user;
+			if (check_username.length > maxUsername) {
+				throw FieldErrors({
+					username: {
+						code: "USERNAME_INVALID",
+						message: `Username must be less than ${maxUsername} in length`,
+					},
+				});
+			}
 		}
 
 		if (body.discriminator) {
diff --git a/src/util/config/types/subconfigurations/limits/UserLimits.ts b/src/util/config/types/subconfigurations/limits/UserLimits.ts
index 06f7a059..836f7143 100644
--- a/src/util/config/types/subconfigurations/limits/UserLimits.ts
+++ b/src/util/config/types/subconfigurations/limits/UserLimits.ts
@@ -18,6 +18,6 @@
 
 export class UserLimits {
 	maxGuilds: number = 1048576;
-	maxUsername: number = 127;
+	maxUsername: number = 32;
 	maxFriends: number = 5000;
 }