Merge pull request #1428 from CyberL1/fix/guild-folder-types-nullable

3 files changed, 21 insertions, 9 deletions

diff --git a/assets/openapi.json b/assets/openapi.json

index ec14fb55..ee7a4e8a 100644
--- a/assets/openapi.json
+++ b/assets/openapi.json
@@ -8431,7 +8431,8 @@
                 "type": "object",
                 "properties": {
                     "color": {
-                        "type": "integer"
+                        "type": "integer",
+                        "nullable": true
                     },
                     "guild_ids": {
                         "type": "array",
@@ -8440,10 +8441,12 @@
                         }
                     },
                     "id": {
-                        "type": "integer"
+                        "type": "integer",
+                        "nullable": true
                     },
                     "name": {
-                        "type": "string"
+                        "type": "string",
+                        "nullable": true
                     }
                 },
                 "required": [
diff --git a/assets/schemas.json b/assets/schemas.json

index 8896f103..576a9c60 100644
--- a/assets/schemas.json
+++ b/assets/schemas.json
@@ -8927,7 +8927,10 @@
         "type": "object",
         "properties": {
             "color": {
-                "type": "integer"
+                "type": [
+                    "null",
+                    "integer"
+                ]
             },
             "guild_ids": {
                 "type": "array",
@@ -8936,10 +8939,16 @@
                 }
             },
             "id": {
-                "type": "integer"
+                "type": [
+                    "null",
+                    "integer"
+                ]
             },
             "name": {
-                "type": "string"
+                "type": [
+                    "null",
+                    "string"
+                ]
             }
         },
         "additionalProperties": false,
diff --git a/src/schemas/api/users/UserSettings.ts b/src/schemas/api/users/UserSettings.ts

index c38e393a..f91a35d7 100644
--- a/src/schemas/api/users/UserSettings.ts
+++ b/src/schemas/api/users/UserSettings.ts
@@ -62,10 +62,10 @@ export interface CustomStatus {
 }
 
 export interface GuildFolder {
-	color?: number;
+	color?: number | null;
 	guild_ids: string[];
-	id?: number;
-	name?: string;
+	id?: number | null;
+	name?: string | null;
 }
 
 export interface FriendSourceFlags {