Merge branch 'master' into 2fa

2 files changed, 5 insertions, 8 deletions

diff --git a/api/assets/schemas.json b/api/assets/schemas.json

index 4249eb81..8f0f31be 100644
--- a/api/assets/schemas.json
+++ b/api/assets/schemas.json
@@ -7166,6 +7166,9 @@
     "GuildUpdateSchema": {
         "type": "object",
         "properties": {
+            "name": {
+                "type": "string"
+            },
             "banner": {
                 "type": [
                     "null",
@@ -7211,10 +7214,6 @@
             "preferred_locale": {
                 "type": "string"
             },
-            "name": {
-                "maxLength": 100,
-                "type": "string"
-            },
             "region": {
                 "type": "string"
             },
@@ -7235,9 +7234,6 @@
             }
         },
         "additionalProperties": false,
-        "required": [
-            "name"
-        ],
         "definitions": {
             "Embed": {
                 "type": "object",
diff --git a/api/src/routes/guilds/#guild_id/index.ts b/api/src/routes/guilds/#guild_id/index.ts

index 4ec3df72..be556fb2 100644
--- a/api/src/routes/guilds/#guild_id/index.ts
+++ b/api/src/routes/guilds/#guild_id/index.ts
@@ -7,7 +7,8 @@ import { GuildCreateSchema } from "../index";
 
 const router = Router();
 
-export interface GuildUpdateSchema extends Omit<GuildCreateSchema, "channels"> {
+export interface GuildUpdateSchema extends Omit<GuildCreateSchema, "channels" | "name"> {
+	name?: string;
 	banner?: string | null;
 	splash?: string | null;
 	description?: string;