summary refs log tree commit diff
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-07-09 14:16:15 +1000
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-07-09 14:16:15 +1000
commit4e68d41e60afc99e9397220321df53e2440ec396 (patch)
tree2132d75d820c059834a9370bfa8574a216eeb182
parentAllow multiple attachments in messages (diff)
parentFilter out schemas that block generation instead, and also include util in files (diff)
downloadserver-4e68d41e60afc99e9397220321df53e2440ec396.tar.xz
Merge branch 'master' into feat/multiUploads
-rw-r--r--api/assets/schemas.json1113
-rw-r--r--api/scripts/generate_schema.js22
2 files changed, 652 insertions, 483 deletions
diff --git a/api/assets/schemas.json b/api/assets/schemas.json
index 7cd2bbbb..2102292b 100644
--- a/api/assets/schemas.json
+++ b/api/assets/schemas.json
@@ -1355,70 +1355,73 @@
                 },
                 "additionalProperties": false
             },
-            "password": {
-                "type": "string"
-            },
-            "undelete": {
-                "type": "boolean"
-            },
-            "captcha_key": {
-                "type": "string"
-            },
-            "login_source": {
-                "type": "string"
-            },
-            "gift_code_sku_id": {
-                "type": "string"
-            }
-        },
-        "additionalProperties": false,
-        "required": [
-            "login",
-            "password"
-        ],
-        "$schema": "http://json-schema.org/draft-07/schema#"
-    },
-    "RegisterSchema": {
-        "type": "object",
-        "properties": {
-            "username": {
-                "minLength": 2,
-                "maxLength": 32,
-                "type": "string"
-            },
-            "password": {
-                "minLength": 1,
-                "maxLength": 72,
-                "type": "string"
-            },
-            "consent": {
-                "type": "boolean"
-            },
-            "email": {
-                "format": "email",
-                "type": "string"
-            },
-            "fingerprint": {
-                "type": "string"
-            },
-            "invite": {
-                "type": "string"
-            },
-            "date_of_birth": {
-                "type": "string"
-            },
-            "gift_code_sku_id": {
-                "type": "string"
+            "UserPublic": {
+                "type": "object",
+                "properties": {
+                    "username": {
+                        "type": "string"
+                    },
+                    "discriminator": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "public_flags": {
+                        "type": "integer"
+                    },
+                    "avatar": {
+                        "type": "string"
+                    },
+                    "accent_color": {
+                        "type": "integer"
+                    },
+                    "banner": {
+                        "type": "string"
+                    },
+                    "bio": {
+                        "type": "string"
+                    },
+                    "bot": {
+                        "type": "boolean"
+                    },
+                    "premium_since": {
+                        "type": "string",
+                        "format": "date-time"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "bio",
+                    "bot",
+                    "discriminator",
+                    "id",
+                    "premium_since",
+                    "public_flags",
+                    "username"
+                ]
             },
-            "captcha_key": {
-                "type": "string"
+            "PublicConnectedAccount": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "verified": {
+                        "type": "boolean"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "name",
+                    "type",
+                    "verified"
+                ]
             }
         },
-        "additionalProperties": false,
-        "required": [
-            "consent",
-            "username"
-        ],
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
     "ChannelModifySchema": {
@@ -1436,6 +1439,8 @@
                     11,
                     12,
                     13,
+                    14,
+                    15,
                     2,
                     255,
                     3,
@@ -1518,14 +1523,6 @@
         },
         "additionalProperties": false,
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -1656,6 +1653,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -1671,6 +1680,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -1822,104 +1833,39 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "MessageCreateSchema": {
+    "InviteCreateSchema": {
         "type": "object",
         "properties": {
-            "content": {
+            "target_user_id": {
                 "type": "string"
             },
-            "nonce": {
+            "target_type": {
                 "type": "string"
             },
-            "tts": {
-                "type": "boolean"
-            },
-            "flags": {
+            "validate": {
                 "type": "string"
             },
-            "embeds": {
-                "type": "array",
-                "items": {
-                    "$ref": "#/definitions/Embed"
-                }
+            "max_age": {
+                "type": "integer"
             },
-            "embed": {
-                "$ref": "#/definitions/Embed"
+            "max_uses": {
+                "type": "integer"
             },
-            "allowed_mentions": {
-                "type": "object",
-                "properties": {
-                    "parse": {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        }
-                    },
-                    "roles": {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        }
-                    },
-                    "users": {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        }
-                    },
-                    "replied_user": {
-                        "type": "boolean"
-                    }
-                },
-                "additionalProperties": false
+            "temporary": {
+                "type": "boolean"
             },
-            "message_reference": {
-                "type": "object",
-                "properties": {
-                    "message_id": {
-                        "type": "string"
-                    },
-                    "channel_id": {
-                        "type": "string"
-                    },
-                    "guild_id": {
-                        "type": "string"
-                    },
-                    "fail_if_not_exists": {
-                        "type": "boolean"
-                    }
-                },
-                "additionalProperties": false,
-                "required": [
-                    "channel_id",
-                    "message_id"
-                ]
+            "unique": {
+                "type": "boolean"
             },
-            "payload_json": {
+            "target_user": {
                 "type": "string"
             },
-            "file": {},
-            "attachments": {
-                "type": "array",
-                "items": {}
-            },
-            "sticker_ids": {
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
+            "target_user_type": {
+                "type": "integer"
             }
         },
         "additionalProperties": false,
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -2050,6 +1996,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -2065,6 +2023,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -2216,47 +2176,18 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "InviteCreateSchema": {
+    "MessageAcknowledgeSchema": {
         "type": "object",
         "properties": {
-            "target_user_id": {
-                "type": "string"
-            },
-            "target_type": {
-                "type": "string"
-            },
-            "validate": {
-                "type": "string"
-            },
-            "max_age": {
-                "type": "integer"
-            },
-            "max_uses": {
-                "type": "integer"
-            },
-            "temporary": {
-                "type": "boolean"
-            },
-            "unique": {
+            "manual": {
                 "type": "boolean"
             },
-            "target_user": {
-                "type": "string"
-            },
-            "target_user_type": {
+            "mention_count": {
                 "type": "integer"
             }
         },
         "additionalProperties": false,
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -2387,6 +2318,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -2402,6 +2345,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -2553,26 +2498,21 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "MessageAcknowledgeSchema": {
+    "BulkDeleteSchema": {
         "type": "object",
         "properties": {
-            "manual": {
-                "type": "boolean"
-            },
-            "mention_count": {
-                "type": "integer"
+            "messages": {
+                "type": "array",
+                "items": {
+                    "type": "string"
+                }
             }
         },
         "additionalProperties": false,
+        "required": [
+            "messages"
+        ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -2703,6 +2643,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -2718,6 +2670,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -2869,29 +2823,30 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "BulkDeleteSchema": {
+    "ChannelPermissionOverwriteSchema": {
         "type": "object",
         "properties": {
-            "messages": {
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
+            "allow": {
+                "type": "string"
+            },
+            "deny": {
+                "type": "string"
+            },
+            "id": {
+                "type": "string"
+            },
+            "type": {
+                "$ref": "#/definitions/ChannelPermissionOverwriteType"
             }
         },
         "additionalProperties": false,
         "required": [
-            "messages"
+            "allow",
+            "deny",
+            "id",
+            "type"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -3022,6 +2977,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -3037,6 +3004,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -3188,38 +3157,22 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "ChannelPermissionOverwriteSchema": {
+    "PurgeSchema": {
         "type": "object",
         "properties": {
-            "allow": {
+            "before": {
                 "type": "string"
             },
-            "deny": {
+            "after": {
                 "type": "string"
-            },
-            "id": {
-                "type": "string"
-            },
-            "type": {
-                "$ref": "#/definitions/ChannelPermissionOverwriteType"
             }
         },
         "additionalProperties": false,
         "required": [
-            "allow",
-            "deny",
-            "id",
-            "type"
+            "after",
+            "before"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -3350,6 +3303,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -3365,6 +3330,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -3533,14 +3500,6 @@
             "name"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -3671,6 +3630,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -3686,6 +3657,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -3878,14 +3851,6 @@
             "url"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -4016,6 +3981,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -4031,6 +4008,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -4194,14 +4173,6 @@
             "url"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -4332,6 +4303,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -4347,6 +4330,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -4510,14 +4495,6 @@
         },
         "additionalProperties": false,
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -4648,6 +4625,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -4663,6 +4652,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -4844,14 +4835,6 @@
             "user_id"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -4982,6 +4965,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -4997,6 +4992,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -5175,14 +5172,6 @@
             "user_id"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -5313,6 +5302,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -5328,6 +5329,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -5503,14 +5506,6 @@
             ]
         },
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -5641,6 +5636,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -5656,6 +5663,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -5834,14 +5843,6 @@
             "image"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -5972,6 +5973,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -5987,6 +6000,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -6153,14 +6168,6 @@
         },
         "additionalProperties": false,
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -6291,6 +6298,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -6306,6 +6325,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -6494,14 +6515,6 @@
             "name"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -6632,6 +6645,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -6647,6 +6672,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -6874,14 +6901,6 @@
             "name"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -7012,6 +7031,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -7027,6 +7058,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -7190,14 +7223,6 @@
         },
         "additionalProperties": false,
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -7328,6 +7353,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -7343,6 +7380,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -7506,14 +7545,6 @@
             "nick"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -7644,6 +7675,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -7659,6 +7702,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -7822,14 +7867,6 @@
             "days"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -7960,6 +7997,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -7975,6 +8024,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -8156,14 +8207,6 @@
         },
         "additionalProperties": false,
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -8294,6 +8337,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -8309,6 +8364,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -8479,14 +8536,6 @@
             ]
         },
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -8617,6 +8666,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -8632,6 +8693,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -8806,14 +8869,6 @@
             "tags"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -8944,6 +8999,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -8959,6 +9026,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -9125,14 +9194,6 @@
             "name"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -9263,6 +9324,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -9278,6 +9351,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -9444,14 +9519,6 @@
             "name"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -9582,6 +9649,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -9597,6 +9676,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -9759,14 +9840,6 @@
         },
         "additionalProperties": false,
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -9897,6 +9970,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -9912,6 +9997,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -10094,14 +10181,6 @@
             "channel_id"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -10232,6 +10311,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -10247,6 +10338,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -10436,14 +10529,6 @@
         },
         "additionalProperties": false,
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -10574,6 +10659,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -10589,6 +10686,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -10756,14 +10855,6 @@
             "enabled"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -10894,6 +10985,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -10909,6 +11012,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -11078,14 +11183,6 @@
             "name"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -11216,6 +11313,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -11231,6 +11340,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -11406,14 +11517,6 @@
             "user"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -11544,6 +11647,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -11559,6 +11674,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -11740,14 +11857,6 @@
             "object"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -11878,6 +11987,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -11893,6 +12014,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -12062,14 +12185,6 @@
             "recipients"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -12200,6 +12315,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -12215,6 +12342,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -12367,7 +12496,6 @@
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
     "UserModifySchema": {
-        "additionalProperties": false,
         "type": "object",
         "properties": {
             "username": {
@@ -12404,15 +12532,8 @@
                 "type": "string"
             }
         },
+        "additionalProperties": false,
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -12543,6 +12664,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -12558,6 +12691,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -12724,14 +12859,6 @@
         },
         "additionalProperties": false,
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -12862,6 +12989,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -12877,6 +13016,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -13044,14 +13185,6 @@
             "username"
         ],
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -13182,6 +13315,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -13197,6 +13342,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
@@ -13522,14 +13669,6 @@
         },
         "additionalProperties": false,
         "definitions": {
-            "ChannelPermissionOverwriteType": {
-                "enum": [
-                    0,
-                    1,
-                    2
-                ],
-                "type": "number"
-            },
             "Embed": {
                 "type": "object",
                 "properties": {
@@ -13660,6 +13799,18 @@
                 },
                 "additionalProperties": false
             },
+            "Record<string,string>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
             "ChannelModifySchema": {
                 "type": "object",
                 "properties": {
@@ -13675,6 +13826,8 @@
                             11,
                             12,
                             13,
+                            14,
+                            15,
                             2,
                             255,
                             3,
diff --git a/api/scripts/generate_schema.js b/api/scripts/generate_schema.js
index 7e742ec1..b56c3fbc 100644
--- a/api/scripts/generate_schema.js
+++ b/api/scripts/generate_schema.js
@@ -27,7 +27,16 @@ const Excluded = [
 	"Response",
 	"e.Response",
 	"request.Response",
-	"supertest.Response"
+	"supertest.Response",
+
+	// TODO: Figure out how to exclude schemas from node_modules?
+	"SomeJSONSchema",
+	"UncheckedPartialSchema",
+	"PartialSchema",
+	"UncheckedPropertiesSchema",
+	"PropertiesSchema",
+	"AsyncSchema",
+	"AnySchema",
 ];
 
 function modify(obj) {
@@ -39,11 +48,18 @@ function modify(obj) {
 }
 
 function main() {
-	const program = TJS.getProgramFromFiles(walk(path.join(__dirname, "..", "src", "routes")), compilerOptions);
+	const files = 		[
+		...walk(path.join(__dirname, "..", "src", "routes")),
+		...walk(path.join(__dirname, "..", "..", "util", "src")),
+	];
+	const program = TJS.getProgramFromFiles(
+		files,
+		compilerOptions
+	);
 	const generator = TJS.buildGenerator(program, settings);
 	if (!generator || !program) return;
 
-	const schemas = generator.getUserSymbols().filter((x) => (x.endsWith("Schema") || x.endsWith("Response")) && !Excluded.includes(x));
+	let schemas = generator.getUserSymbols().filter((x) => (x.endsWith("Schema") || x.endsWith("Response")) && !Excluded.includes(x));
 	console.log(schemas);
 
 	var definitions = {};