From 9a685108c7e582498887a668de56d6dfcf92ac3d Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Sun, 10 Jul 2022 13:50:32 +1000
Subject: [PATCH 1/2] Fix username/discrim changing

---
 api/assets/schemas.json           | 3 +++
 api/src/routes/users/@me/index.ts | 1 +
 2 files changed, 4 insertions(+)

diff --git a/api/assets/schemas.json b/api/assets/schemas.json
index 26ed589e..942e205f 100644
--- a/api/assets/schemas.json
+++ b/api/assets/schemas.json
@@ -12526,6 +12526,9 @@
             },
             "code": {
                 "type": "string"
+            },
+            "discriminator": {
+                "type": "string"
             }
         },
         "additionalProperties": false,
diff --git a/api/src/routes/users/@me/index.ts b/api/src/routes/users/@me/index.ts
index 1af413c4..107e59c4 100644
--- a/api/src/routes/users/@me/index.ts
+++ b/api/src/routes/users/@me/index.ts
@@ -21,6 +21,7 @@ export interface UserModifySchema {
 	password?: string;
 	new_password?: string;
 	code?: string;
+	discriminator?: string;
 }
 
 router.get("/", route({}), async (req: Request, res: Response) => {

From 5612a47b4974be7e144f8d3bb99daf7d2abbf259 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Sun, 10 Jul 2022 14:18:49 +1000
Subject: [PATCH 2/2] Try to allow role icons to be removed

---
 api/src/routes/guilds/#guild_id/roles/#role_id/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/src/routes/guilds/#guild_id/roles/#role_id/index.ts b/api/src/routes/guilds/#guild_id/roles/#role_id/index.ts
index 2ad01682..f3d707e0 100644
--- a/api/src/routes/guilds/#guild_id/roles/#role_id/index.ts
+++ b/api/src/routes/guilds/#guild_id/roles/#role_id/index.ts
@@ -42,6 +42,7 @@ router.patch("/", route({ body: "RoleModifySchema", permission: "MANAGE_ROLES" }
 	const body = req.body as RoleModifySchema;
 
 	if (body.icon) body.icon = await handleFile(`/role-icons/${role_id}`, body.icon as string);
+	else body.icon = undefined;
 
 	const role = new Role({
 		...body,