From 9f4f7cac6512330481ea3e2de0633fc893788c33 Mon Sep 17 00:00:00 2001 From: Puyodead1 Date: Fri, 5 May 2023 11:09:05 -0400 Subject: [PATCH] initial pomelo implementation --- assets/openapi.json | 89 +- assets/schemas.json | 5808 +++++++++++++---- src/api/routes/auth/forgot.ts | 2 +- .../messages/#message_id/crosspost.ts | 1 + .../channels/#channel_id/messages/index.ts | 5 +- src/api/routes/guilds/#guild_id/bans.ts | 2 + .../guilds/#guild_id/messages/search.ts | 2 + src/api/routes/oauth2/authorize.ts | 6 + src/api/routes/users/#id/relationships.ts | 2 + src/api/routes/users/@me/index.ts | 2 + src/api/routes/users/@me/relationships.ts | 21 +- src/connections/Discord/index.ts | 3 + src/util/config/types/GeneralConfiguration.ts | 1 + src/util/dtos/UserDTO.ts | 16 +- src/util/entities/User.ts | 47 +- src/util/schemas/RelationshipPostSchema.ts | 1 + .../schemas/responses/GuildBansResponse.ts | 2 + .../responses/GuildWidgetJsonResponse.ts | 2 + .../responses/UserRelationsResponse.ts | 2 + src/util/util/email/index.ts | 3 + 20 files changed, 4702 insertions(+), 1315 deletions(-) diff --git a/assets/openapi.json b/assets/openapi.json index da2b20f1..d1796bbd 100644 --- a/assets/openapi.json +++ b/assets/openapi.json @@ -1359,6 +1359,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -1524,6 +1530,9 @@ "$ref": "#/components/schemas/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -1541,6 +1550,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -3486,6 +3497,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -3521,6 +3538,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -3946,25 +3964,32 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": "string", - "nullable": true - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": "string", + "nullable": true } }, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -6355,6 +6380,15 @@ "discriminator": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": [ + "null", + "string" + ] + }, "id": { "type": "string" }, @@ -6372,6 +6406,8 @@ "required": [ "avatar", "discriminator", + "display_name", + "global_name", "id", "public_flags", "username" @@ -6615,6 +6651,15 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": [ + "null", + "string" + ] + }, "discriminator": { "type": "string" }, @@ -6636,6 +6681,8 @@ "avatar", "avatar_url", "discriminator", + "display_name", + "global_name", "id", "status", "username" @@ -6997,6 +7044,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -7058,6 +7111,7 @@ "disabled", "discriminator", "flags", + "global_name", "id", "mfa_enabled", "nsfw_allowed", @@ -7114,6 +7168,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -7175,6 +7235,7 @@ "disabled", "discriminator", "flags", + "global_name", "id", "mfa_enabled", "nsfw_allowed", @@ -7273,6 +7334,10 @@ "autoCreateBotUsers": { "type": "boolean", "default": false + }, + "pomeloEnabled": { + "type": "boolean", + "default": false } }, "required": [ @@ -7284,6 +7349,7 @@ "instanceDescription", "instanceId", "instanceName", + "pomeloEnabled", "tosPage" ] }, @@ -7845,6 +7911,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -7857,6 +7929,7 @@ }, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" diff --git a/assets/schemas.json b/assets/schemas.json index ab8e0a3f..682c7bb5 100644 --- a/assets/schemas.json +++ b/assets/schemas.json @@ -1490,6 +1490,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -1655,6 +1661,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -1673,6 +1682,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -3650,6 +3661,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -3686,6 +3703,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -4127,28 +4145,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -5709,6 +5734,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -5874,6 +5905,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -5892,6 +5926,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -7869,6 +7905,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -7905,6 +7947,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -8346,28 +8389,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -9928,6 +9978,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -10093,6 +10149,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -10111,6 +10170,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -12088,6 +12149,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -12124,6 +12191,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -12565,28 +12633,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -14142,6 +14217,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -14307,6 +14388,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -14325,6 +14409,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -16302,6 +16388,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -16338,6 +16430,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -16779,28 +16872,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -18392,6 +18492,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -18557,6 +18663,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -18575,6 +18684,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -20552,6 +20663,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -20588,6 +20705,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -21029,28 +21147,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -22611,6 +22736,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -22776,6 +22907,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -22794,6 +22928,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -24771,6 +24907,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -24807,6 +24949,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -25248,28 +25391,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -26821,6 +26971,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -26986,6 +27142,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -27004,6 +27163,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -28981,6 +29142,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -29017,6 +29184,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -29458,28 +29626,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -31034,6 +31209,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -31199,6 +31380,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -31217,6 +31401,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -33194,6 +33380,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -33230,6 +33422,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -33671,28 +33864,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -35256,6 +35456,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -35421,6 +35627,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -35439,6 +35648,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -37416,6 +37627,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -37452,6 +37669,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -37893,28 +38111,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -39466,6 +39691,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -39631,6 +39862,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -39649,6 +39883,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -41626,6 +41862,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -41662,6 +41904,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -42103,28 +42346,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -43676,6 +43926,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -43841,6 +44097,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -43859,6 +44118,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -45836,6 +46097,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -45872,6 +46139,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -46313,28 +46581,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -47905,6 +48180,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -48070,6 +48351,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -48088,6 +48372,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -50065,6 +50351,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -50101,6 +50393,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -50542,28 +50835,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -52118,6 +52418,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -52283,6 +52589,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -52301,6 +52610,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -54278,6 +54589,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -54314,6 +54631,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -54755,28 +55073,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -56391,6 +56716,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -56556,6 +56887,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -56574,6 +56908,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -58551,6 +58887,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -58587,6 +58929,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -59028,28 +59371,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -60623,6 +60973,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -60788,6 +61144,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -60806,6 +61165,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -62783,6 +63144,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -62819,6 +63186,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -63260,28 +63628,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -64996,6 +65371,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -65161,6 +65542,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -65179,6 +65563,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -67156,6 +67542,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -67192,6 +67584,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -67633,28 +68026,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -69227,6 +69627,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -69392,6 +69798,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -69410,6 +69819,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -71387,6 +71798,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -71423,6 +71840,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -71864,28 +72282,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -73468,6 +73893,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -73633,6 +74064,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -73651,6 +74085,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -75628,6 +76064,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -75664,6 +76106,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -76105,28 +76548,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -77691,6 +78141,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -77856,6 +78312,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -77874,6 +78333,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -79851,6 +80312,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -79887,6 +80354,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -80328,28 +80796,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -81920,6 +82395,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -82085,6 +82566,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -82103,6 +82587,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -84080,6 +84566,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -84116,6 +84608,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -84557,28 +85050,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -86139,6 +86639,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -86304,6 +86810,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -86322,6 +86831,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -88299,6 +88810,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -88335,6 +88852,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -88776,28 +89294,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -90346,6 +90871,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -90511,6 +91042,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -90529,6 +91063,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -92506,6 +93042,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -92542,6 +93084,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -92983,28 +93526,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -94671,6 +95221,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -94836,6 +95392,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -94854,6 +95413,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -96831,6 +97392,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -96867,6 +97434,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -97308,28 +97876,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -98993,6 +99568,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -99158,6 +99739,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -99176,6 +99760,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -101153,6 +101739,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -101189,6 +101781,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -101630,28 +102223,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -103203,6 +103803,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -103368,6 +103974,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -103386,6 +103995,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -105363,6 +105974,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -105399,6 +106016,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -105840,28 +106458,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -107421,6 +108046,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -107586,6 +108217,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -107604,6 +108238,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -109581,6 +110217,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -109617,6 +110259,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -110058,28 +110701,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -111632,6 +112282,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -111797,6 +112453,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -111815,6 +112474,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -113792,6 +114453,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -113828,6 +114495,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -114269,28 +114937,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -115843,6 +116518,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -116008,6 +116689,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -116026,6 +116710,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -118003,6 +118689,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -118039,6 +118731,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -118480,28 +119173,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -120089,6 +120789,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -120254,6 +120960,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -120272,6 +120981,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -122249,6 +122960,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -122285,6 +123002,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -122726,28 +123444,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -124300,6 +125025,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -124465,6 +125196,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -124483,6 +125217,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -126460,6 +127196,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -126496,6 +127238,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -126937,28 +127680,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -128510,6 +129260,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -128675,6 +129431,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -128693,6 +129452,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -130670,6 +131431,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -130706,6 +131473,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -131147,28 +131915,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -132735,6 +133510,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -132900,6 +133681,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -132918,6 +133702,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -134895,6 +135681,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -134931,6 +135723,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -135372,28 +136165,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -136949,6 +137749,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -137114,6 +137920,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -137132,6 +137941,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -139109,6 +139920,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -139145,6 +139962,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -139586,28 +140404,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -141237,6 +142062,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -141402,6 +142233,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -141420,6 +142254,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -143397,6 +144233,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -143433,6 +144275,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -143874,28 +144717,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -145447,6 +146297,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -145612,6 +146468,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -145630,6 +146489,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -147607,6 +148468,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -147643,6 +148510,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -148084,28 +148952,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -149657,6 +150532,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -149822,6 +150703,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -149840,6 +150724,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -151817,6 +152703,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -151853,6 +152745,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -152294,28 +153187,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -153864,6 +154764,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -154029,6 +154935,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -154047,6 +154956,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -156024,6 +156935,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -156060,6 +156977,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -156501,28 +157419,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -158077,6 +159002,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -158242,6 +159173,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -158260,6 +159194,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -160237,6 +161173,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -160273,6 +161215,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -160714,28 +161657,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -162300,6 +163250,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -162465,6 +163421,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -162483,6 +163442,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -164460,6 +165421,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -164496,6 +165463,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -164937,28 +165905,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -166507,6 +167482,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -166672,6 +167653,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -166690,6 +167674,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -168667,6 +169653,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -168703,6 +169695,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -169144,28 +170137,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -170763,6 +171763,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -170928,6 +171934,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -170946,6 +171955,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -172923,6 +173934,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -172959,6 +173976,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -173400,28 +174418,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -175005,6 +176030,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -175170,6 +176201,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -175188,6 +176222,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -177165,6 +178201,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -177201,6 +178243,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -177642,28 +178685,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -179212,6 +180262,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -179377,6 +180433,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -179395,6 +180454,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -181372,6 +182433,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -181408,6 +182475,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -181849,28 +182917,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -183444,6 +184519,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -183609,6 +184690,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -183627,6 +184711,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -185604,6 +186690,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -185640,6 +186732,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -186081,28 +187174,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -187765,6 +188865,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -187930,6 +189036,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -187948,6 +189057,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -189925,6 +191036,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -189961,6 +191078,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -190402,28 +191520,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -191971,6 +193096,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -192136,6 +193267,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -192154,6 +193288,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -194131,6 +195267,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -194167,6 +195309,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -194608,28 +195751,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -196216,6 +197366,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -196381,6 +197537,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -196399,6 +197558,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -198376,6 +199537,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -198412,6 +199579,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -198853,28 +200021,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -200449,6 +201624,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -200614,6 +201795,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -200632,6 +201816,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -202609,6 +203795,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -202645,6 +203837,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -203086,28 +204279,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -204734,6 +205934,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -204899,6 +206105,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -204917,6 +206126,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -206894,6 +208105,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -206930,6 +208147,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -207371,28 +208589,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -208941,6 +210166,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -209106,6 +210337,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -209124,6 +210358,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -211101,6 +212337,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -211137,6 +212379,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -211578,28 +212821,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -213156,6 +214406,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -213321,6 +214577,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -213339,6 +214598,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -215316,6 +216577,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -215352,6 +216619,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -215793,28 +217061,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -217361,6 +218636,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -217526,6 +218807,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -217544,6 +218828,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -219521,6 +220807,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -219557,6 +220849,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -219998,28 +221291,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -221572,6 +222872,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -221737,6 +223043,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -221755,6 +223064,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -223732,6 +225043,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -223768,6 +225085,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -224209,28 +225527,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -225783,6 +227108,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -225948,6 +227279,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -225966,6 +227300,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -227943,6 +229279,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -227979,6 +229321,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -228420,28 +229763,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -229994,6 +231344,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -230159,6 +231515,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -230177,6 +231536,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -232154,6 +233515,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -232190,6 +233557,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -232631,28 +233999,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -234237,6 +235612,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -234402,6 +235783,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -234420,6 +235804,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -236397,6 +237783,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -236433,6 +237825,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -236874,28 +238267,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -238452,6 +239852,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -238617,6 +240023,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -238635,6 +240044,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -240612,6 +242023,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -240648,6 +242065,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -241089,28 +242507,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -242657,6 +244082,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -242822,6 +244253,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -242840,6 +244274,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -244817,6 +246253,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -244853,6 +246295,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -245294,28 +246737,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -246868,6 +248318,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -247033,6 +248489,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -247051,6 +248510,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -249028,6 +250489,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -249064,6 +250531,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -249505,28 +250973,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -251090,6 +252565,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -251255,6 +252736,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -251273,6 +252757,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -253250,6 +254736,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -253286,6 +254778,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -253727,28 +255220,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -255326,6 +256826,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -255491,6 +256997,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -255509,6 +257018,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -257486,6 +258997,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -257522,6 +259039,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -257963,28 +259481,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -259533,6 +261058,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -259698,6 +261229,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -259716,6 +261250,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -261693,6 +263229,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -261729,6 +263271,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -262170,28 +263713,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -263743,6 +265293,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -263908,6 +265464,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -263926,6 +265485,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -265903,6 +267464,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -265939,6 +267506,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -266380,28 +267948,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -266832,6 +268407,15 @@ "discriminator": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": [ + "null", + "string" + ] + }, "id": { "type": "string" }, @@ -266849,6 +268433,8 @@ "required": [ "avatar", "discriminator", + "display_name", + "global_name", "id", "public_flags", "username" @@ -267982,6 +269568,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -268147,6 +269739,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -268165,6 +269760,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -270142,6 +271739,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -270178,6 +271781,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -270619,28 +272223,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -272189,6 +273800,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -272354,6 +273971,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -272372,6 +273992,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -274349,6 +275971,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -274385,6 +276013,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -274826,28 +276455,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -276475,6 +278111,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -276640,6 +278282,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -276658,6 +278303,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -278635,6 +280282,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -278671,6 +280324,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -279112,28 +280766,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -280689,6 +282350,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -280854,6 +282521,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -280872,6 +282542,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -282849,6 +284521,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -282885,6 +284563,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -283326,28 +285005,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -284896,6 +286582,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -285061,6 +286753,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -285079,6 +286774,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -287056,6 +288753,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -287092,6 +288795,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -287533,28 +289237,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -289103,6 +290814,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -289268,6 +290985,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -289286,6 +291006,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -291263,6 +292985,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -291299,6 +293027,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -291740,28 +293469,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -293317,6 +295053,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -293482,6 +295224,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -293500,6 +295245,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -295477,6 +297224,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -295513,6 +297266,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -295954,28 +297708,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -297528,6 +299289,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -297693,6 +299460,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -297711,6 +299481,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -299688,6 +301460,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -299724,6 +301502,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -300165,28 +301944,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -301735,6 +303521,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -301900,6 +303692,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -301918,6 +303713,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -303895,6 +305692,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -303931,6 +305734,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -304372,28 +306176,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -304855,6 +306666,15 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": [ + "null", + "string" + ] + }, "discriminator": { "type": "string" }, @@ -304876,6 +306696,8 @@ "avatar", "avatar_url", "discriminator", + "display_name", + "global_name", "id", "status", "username" @@ -306017,6 +307839,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -306182,6 +308010,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -306200,6 +308031,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -308177,6 +310010,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -308213,6 +310052,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -308654,28 +310494,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -310235,6 +312082,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -310400,6 +312253,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -310418,6 +312274,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -312395,6 +314253,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -312431,6 +314295,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -312872,28 +314737,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -314454,6 +316326,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -314619,6 +316497,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -314637,6 +316518,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -316614,6 +318497,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -316650,6 +318539,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -317091,28 +318981,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -318723,6 +320620,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -318888,6 +320791,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -318906,6 +320812,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -320883,6 +322791,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -320919,6 +322833,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -321360,28 +323275,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -322951,6 +324873,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -323116,6 +325044,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -323134,6 +325065,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -325111,6 +327044,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -325147,6 +327086,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -325588,28 +327528,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -327185,6 +329132,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -327350,6 +329303,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -327368,6 +329324,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -329345,6 +331303,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -329381,6 +331345,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -329822,28 +331787,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -331413,6 +333385,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -331578,6 +333556,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -331596,6 +333577,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -333573,6 +335556,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -333609,6 +335598,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -334050,28 +336040,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -335620,6 +337617,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -335785,6 +337788,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -335803,6 +337809,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -337780,6 +339788,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -337816,6 +339830,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -338257,28 +340272,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -339855,6 +341877,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -340020,6 +342048,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -340038,6 +342069,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -342015,6 +344048,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -342051,6 +344090,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -342492,28 +344532,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -344102,6 +346149,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -344267,6 +346320,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -344285,6 +346341,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -346262,6 +348320,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -346298,6 +348362,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -346739,28 +348804,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -348303,6 +350375,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -348468,6 +350546,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -348486,6 +350567,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -350463,6 +352546,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -350499,6 +352588,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -350940,28 +353030,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -352514,6 +354611,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -352679,6 +354782,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -352697,6 +354803,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -354674,6 +356782,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -354710,6 +356824,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -355151,28 +357266,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -356721,6 +358843,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -356886,6 +359014,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -356904,6 +359035,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -358881,6 +361014,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -358917,6 +361056,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -359358,28 +361498,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -360935,6 +363082,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -361100,6 +363253,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -361118,6 +363274,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -363095,6 +365253,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -363131,6 +365295,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -363572,28 +365737,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -365353,6 +367525,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -365518,6 +367696,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -365536,6 +367717,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -367513,6 +369696,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -367549,6 +369738,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -367990,28 +370180,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -369551,6 +371748,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -369716,6 +371919,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -369734,6 +371940,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -371711,6 +373919,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -371747,6 +373961,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -372188,28 +374403,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -372647,6 +374869,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -372709,6 +374937,7 @@ "disabled", "discriminator", "flags", + "global_name", "id", "mfa_enabled", "nsfw_allowed", @@ -373843,6 +376072,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -374008,6 +376243,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -374026,6 +376264,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -376003,6 +378243,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -376039,6 +378285,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -376480,28 +378727,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -378044,6 +380298,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -378209,6 +380469,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -378227,6 +380490,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -380204,6 +382469,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -380240,6 +382511,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -380681,28 +382953,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -382245,6 +384524,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -382410,6 +384695,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -382428,6 +384716,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -384405,6 +386695,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -384441,6 +386737,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -384882,28 +387179,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -386446,6 +388750,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -386611,6 +388921,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -386629,6 +388942,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -388606,6 +390921,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -388642,6 +390963,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -389083,28 +391405,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -389545,6 +391874,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -389607,6 +391942,7 @@ "disabled", "discriminator", "flags", + "global_name", "id", "mfa_enabled", "nsfw_allowed", @@ -390741,6 +393077,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -390906,6 +393248,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -390924,6 +393269,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -392901,6 +395248,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -392937,6 +395290,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -393378,28 +395732,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -394940,6 +397301,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -395105,6 +397472,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -395123,6 +397493,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -397100,6 +399472,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -397136,6 +399514,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -397577,28 +399956,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -399139,6 +401525,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -399304,6 +401696,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -399322,6 +401717,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -401299,6 +403696,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -401335,6 +403738,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -401776,28 +404180,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -403338,6 +405749,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -403503,6 +405920,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -403521,6 +405941,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -405498,6 +407920,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -405534,6 +407962,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -405975,28 +408404,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -407539,6 +409975,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -407704,6 +410146,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -407722,6 +410167,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -409699,6 +412146,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -409735,6 +412188,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -410176,28 +412630,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -411740,6 +414201,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -411905,6 +414372,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -411923,6 +414393,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -413900,6 +416372,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -413936,6 +416414,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -414377,28 +416856,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -415941,6 +418427,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -416106,6 +418598,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -416124,6 +418619,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -418101,6 +420598,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -418137,6 +420640,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -418578,28 +421082,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -420142,6 +422653,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -420307,6 +422824,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -420325,6 +422845,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -422302,6 +424824,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -422338,6 +424866,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -422779,28 +425308,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -424343,6 +426879,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -424508,6 +427050,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -424526,6 +427071,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -426503,6 +429050,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -426539,6 +429092,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -426980,28 +429534,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -427472,6 +430033,10 @@ "autoCreateBotUsers": { "type": "boolean", "default": false + }, + "pomeloEnabled": { + "type": "boolean", + "default": false } }, "additionalProperties": false, @@ -427484,6 +430049,7 @@ "instanceDescription", "instanceId", "instanceName", + "pomeloEnabled", "tosPage" ], "definitions": { @@ -428608,6 +431174,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -428773,6 +431345,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -428791,6 +431366,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -430768,6 +433345,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -430804,6 +433387,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -431245,28 +433829,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -432809,6 +435400,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -432974,6 +435571,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -432992,6 +435592,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -434969,6 +437571,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -435005,6 +437613,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -435446,28 +438055,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -437010,6 +439626,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -437175,6 +439797,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -437193,6 +439818,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -439170,6 +441797,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -439206,6 +441839,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -439647,28 +442281,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -441211,6 +443852,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -441376,6 +444023,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -441394,6 +444044,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -443371,6 +446023,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -443407,6 +446065,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -443848,28 +446507,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -445459,6 +448125,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -445624,6 +448296,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -445642,6 +448317,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -447619,6 +450296,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -447655,6 +450338,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -448096,28 +450780,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -449896,6 +452587,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -450061,6 +452758,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -450079,6 +452779,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -452056,6 +454758,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -452092,6 +454800,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -452533,28 +455242,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -454097,6 +456813,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -454262,6 +456984,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -454280,6 +457005,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -456257,6 +458984,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -456293,6 +459026,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -456734,28 +459468,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -458298,6 +461039,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -458463,6 +461210,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -458481,6 +461231,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -460458,6 +463210,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -460494,6 +463252,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -460935,28 +463694,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -462499,6 +465265,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -462664,6 +465436,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -462682,6 +465457,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -464659,6 +467436,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -464695,6 +467478,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -465136,28 +467920,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -466700,6 +469491,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -466865,6 +469662,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -466883,6 +469683,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -468860,6 +471662,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -468896,6 +471704,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -469337,28 +472146,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -470927,6 +473743,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -471092,6 +473914,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -471110,6 +473935,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -473087,6 +475914,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -473123,6 +475956,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -473564,28 +476398,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -475128,6 +477969,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -475293,6 +478140,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -475311,6 +478161,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -477288,6 +480140,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -477324,6 +480182,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -477765,28 +480624,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -479350,6 +482216,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -479515,6 +482387,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -479533,6 +482408,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -481510,6 +484387,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -481546,6 +484429,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -481987,28 +484871,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -483565,6 +486456,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -483730,6 +486627,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -483748,6 +486648,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -485725,6 +488627,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -485761,6 +488669,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -486202,28 +489111,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -487892,6 +490808,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -488057,6 +490979,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -488075,6 +491000,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -490052,6 +492979,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -490088,6 +493021,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -490529,28 +493463,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -490978,6 +493919,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -490990,6 +493937,7 @@ }, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -492117,6 +495065,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -492282,6 +495236,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -492300,6 +495257,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -494277,6 +497236,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -494313,6 +497278,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -494754,28 +497720,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -496336,6 +499309,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -496501,6 +499480,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -496519,6 +499501,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -498496,6 +501480,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -498532,6 +501522,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -498973,28 +501964,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -500547,6 +503545,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -500712,6 +503716,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -500730,6 +503737,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -502707,6 +505716,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -502743,6 +505758,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -503184,28 +506200,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -504758,6 +507781,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -504923,6 +507952,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -504941,6 +507973,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -506918,6 +509952,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -506954,6 +509994,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -507395,28 +510436,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -508956,6 +512004,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -509121,6 +512175,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -509139,6 +512196,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -511116,6 +514175,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -511152,6 +514217,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -511593,28 +514659,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -513166,6 +516239,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -513331,6 +516410,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -513349,6 +516431,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -515326,6 +518410,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -515362,6 +518452,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -515803,28 +518894,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -517391,6 +520489,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -517556,6 +520660,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -517574,6 +520681,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -519551,6 +522660,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -519587,6 +522702,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -520028,28 +523144,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -521620,6 +524743,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -521785,6 +524914,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -521803,6 +524935,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -523780,6 +526914,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -523816,6 +526956,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -524257,28 +527398,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -525828,6 +528976,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -525993,6 +529147,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -526011,6 +529168,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -527988,6 +531147,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -528024,6 +531189,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -528465,28 +531631,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -530035,6 +533208,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -530200,6 +533379,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -530218,6 +533400,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -532195,6 +535379,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -532231,6 +535421,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -532672,28 +535863,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -534242,6 +537440,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -534407,6 +537611,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -534425,6 +537632,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -536402,6 +539611,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -536438,6 +539653,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -536879,28 +540095,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" @@ -538455,6 +541678,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -538620,6 +541849,9 @@ "$ref": "#/definitions/SecurityKey" } }, + "handle": { + "type": "string" + }, "id": { "type": "string" } @@ -538638,6 +541870,8 @@ "extended_settings", "fingerprints", "flags", + "global_name", + "handle", "id", "mfa_enabled", "mobile", @@ -540615,6 +543849,12 @@ "username": { "type": "string" }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, "discriminator": { "type": "string" }, @@ -540651,6 +543891,7 @@ "bio", "bot", "discriminator", + "global_name", "id", "premium_since", "premium_type", @@ -541092,28 +544333,35 @@ "MinimalPublicUserDTO": { "type": "object", "properties": { - "avatar": { - "type": [ - "null", - "string" - ] - }, - "discriminator": { + "id": { "type": "string" }, - "id": { + "username": { + "type": "string" + }, + "global_name": { + "type": "string" + }, + "display_name": { + "type": "string" + }, + "discriminator": { "type": "string" }, "public_flags": { "type": "integer" }, - "username": { - "type": "string" + "avatar": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false, "required": [ "discriminator", + "global_name", "id", "public_flags", "username" diff --git a/src/api/routes/auth/forgot.ts b/src/api/routes/auth/forgot.ts index 6fa86021..7a791164 100644 --- a/src/api/routes/auth/forgot.ts +++ b/src/api/routes/auth/forgot.ts @@ -111,7 +111,7 @@ router.post( }) .catch((e) => { console.error( - `Failed to send password reset email to ${user.username}#${user.discriminator}: ${e}`, + `Failed to send password reset email to ${user.handle}: ${e}`, ); throw new HTTPError("Failed to send password reset email", 500); }); diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts index 5ca645c0..ed2670ca 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts @@ -43,6 +43,7 @@ router.post( username: "", avatar: "", discriminator: "", + global_name: "", public_flags: 64, }, attachments: [], diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts index a5bfcfd7..8b028f43 100644 --- a/src/api/routes/channels/#channel_id/messages/index.ts +++ b/src/api/routes/channels/#channel_id/messages/index.ts @@ -171,11 +171,14 @@ router.get( if ((y.user_ids || []).includes(req.user_id)) y.me = true; delete y.user_ids; }); + const { pomeloEnabled } = Config.get().general; if (!x.author) x.author = User.create({ id: "4", - discriminator: "0000", + discriminator: pomeloEnabled ? "0" : "0000", username: "Spacebar Ghost", + global_name: "spacebarghost", + display_name: "Spacebar Ghost", public_flags: 0, }); x.attachments?.forEach((y: Attachment) => { diff --git a/src/api/routes/guilds/#guild_id/bans.ts b/src/api/routes/guilds/#guild_id/bans.ts index 9aeb27f0..ede9f4bd 100644 --- a/src/api/routes/guilds/#guild_id/bans.ts +++ b/src/api/routes/guilds/#guild_id/bans.ts @@ -70,6 +70,8 @@ router.get( user: { username: user.username, discriminator: user.discriminator, + global_name: user.global_name, + display_name: user.display_name, id: user.id, avatar: user.avatar, public_flags: user.public_flags, diff --git a/src/api/routes/guilds/#guild_id/messages/search.ts b/src/api/routes/guilds/#guild_id/messages/search.ts index 637d1e43..bf5fc4cd 100644 --- a/src/api/routes/guilds/#guild_id/messages/search.ts +++ b/src/api/routes/guilds/#guild_id/messages/search.ts @@ -149,6 +149,8 @@ router.get( avatar: x.author?.avatar, avatar_decoration: null, discriminator: x.author?.discriminator, + global_name: x.author?.global_name, + display_name: x.author?.display_name, public_flags: x.author?.public_flags, }, attachments: x.attachments, diff --git a/src/api/routes/oauth2/authorize.ts b/src/api/routes/oauth2/authorize.ts index 2f2351f3..11255b98 100644 --- a/src/api/routes/oauth2/authorize.ts +++ b/src/api/routes/oauth2/authorize.ts @@ -89,6 +89,8 @@ router.get( "username", "avatar", "discriminator", + "global_name", + "display_name", "public_flags", ], }); @@ -137,6 +139,8 @@ router.get( avatar: user.avatar, avatar_decoration: null, // TODO discriminator: user.discriminator, + global_name: user.global_name, + display_name: user.display_name, public_flags: user.public_flags, }, application: { @@ -159,6 +163,8 @@ router.get( avatar: bot.avatar, avatar_decoration: null, // TODO discriminator: bot.discriminator, + global_name: bot.global_name, + display_name: bot.display_name, public_flags: bot.public_flags, bot: true, approximated_guild_count: 0, // TODO diff --git a/src/api/routes/users/#id/relationships.ts b/src/api/routes/users/#id/relationships.ts index 3737ca00..0008e75d 100644 --- a/src/api/routes/users/#id/relationships.ts +++ b/src/api/routes/users/#id/relationships.ts @@ -58,6 +58,8 @@ router.get( username: relation_user.username, avatar: relation_user.avatar, discriminator: relation_user.discriminator, + global_name: relation_user.global_name, + display_name: relation_user.display_name, public_flags: relation_user.public_flags, }); } diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts index ad11a428..1d209542 100644 --- a/src/api/routes/users/@me/index.ts +++ b/src/api/routes/users/@me/index.ts @@ -140,6 +140,7 @@ router.patch( newToken = (await generateToken(user.id)) as string; } + // TODO: pomelo: disallow if pomelo is enabled if (body.username) { const check_username = body?.username?.replace(/\s/g, ""); if (!check_username) { @@ -162,6 +163,7 @@ router.patch( } } + // TODO: pomelo: disallow if pomelo is enabled if (body.discriminator) { if ( await User.findOne({ diff --git a/src/api/routes/users/@me/relationships.ts b/src/api/routes/users/@me/relationships.ts index bce0a654..08342602 100644 --- a/src/api/routes/users/@me/relationships.ts +++ b/src/api/routes/users/@me/relationships.ts @@ -114,19 +114,26 @@ router.post( }, }), async (req: Request, res: Response) => { + const { pomeloEnabled } = Config.get().general; + const where = pomeloEnabled + ? { + // TODO: pomelo: should we use username or add global_name property to the request? + global_name: req.body.username, + } + : { + discriminator: String(req.body.discriminator).padStart( + 4, + "0", + ), //Discord send the discriminator as integer, we need to add leading zeroes + username: req.body.username, + }; return await updateRelationship( req, res, await User.findOneOrFail({ relations: ["relationships", "relationships.to"], select: userProjection, - where: { - discriminator: String(req.body.discriminator).padStart( - 4, - "0", - ), //Discord send the discriminator as integer, we need to add leading zeroes - username: req.body.username, - }, + where, }), req.body.type, ); diff --git a/src/connections/Discord/index.ts b/src/connections/Discord/index.ts index 731086f1..206aa671 100644 --- a/src/connections/Discord/index.ts +++ b/src/connections/Discord/index.ts @@ -31,6 +31,8 @@ interface UserResponse { id: string; username: string; discriminator: string; + global_name: string; + display_name?: string; avatar_url: string | null; } @@ -128,6 +130,7 @@ export default class DiscordConnection extends Connection { if (exists) return null; + // TODO: pomelo return await this.createConnection({ user_id: userId, external_id: userInfo.id, diff --git a/src/util/config/types/GeneralConfiguration.ts b/src/util/config/types/GeneralConfiguration.ts index cff8c527..df3dfbcd 100644 --- a/src/util/config/types/GeneralConfiguration.ts +++ b/src/util/config/types/GeneralConfiguration.ts @@ -29,4 +29,5 @@ export class GeneralConfiguration { image: string | null = null; instanceId: string = Snowflake.generate(); autoCreateBotUsers: boolean = false; + pomeloEnabled: boolean = false; } diff --git a/src/util/dtos/UserDTO.ts b/src/util/dtos/UserDTO.ts index a24c8d96..5687bcef 100644 --- a/src/util/dtos/UserDTO.ts +++ b/src/util/dtos/UserDTO.ts @@ -19,17 +19,21 @@ import { User } from "../entities"; export class MinimalPublicUserDTO { - avatar?: string | null; - discriminator: string; id: string; - public_flags: number; username: string; + global_name: string; + display_name?: string; + discriminator: string; + public_flags: number; + avatar?: string | null; constructor(user: User) { - this.avatar = user.avatar; - this.discriminator = user.discriminator; this.id = user.id; - this.public_flags = user.public_flags; this.username = user.username; + this.global_name = user.global_name; + this.display_name = user.display_name; + this.discriminator = user.discriminator; + this.public_flags = user.public_flags; + this.avatar = user.avatar; } } diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts index c6582b00..0620640b 100644 --- a/src/util/entities/User.ts +++ b/src/util/entities/User.ts @@ -37,6 +37,8 @@ import { UserSettings } from "./UserSettings"; export enum PublicUserEnum { username, + global_name, + display_name, discriminator, id, public_flags, @@ -90,8 +92,14 @@ export class User extends BaseClass { @Column() username: string; // username max length 32, min 2 (should be configurable) + @Column({nullable: true}) + global_name: string; // puyo: pomelo + + @Column({nullable: true}) + display_name?: string; // puyo: pomelo + @Column() - discriminator: string; // opaque string: 4 digits on discord.com + discriminator: string; // opaque string: 4 digits on discord.com, 0 for pomelo @Column({ nullable: true }) avatar?: string; // hash of the user avatar @@ -323,6 +331,13 @@ export class User extends BaseClass { } } + public get handle(): string { + const {pomeloEnabled} = Config.get().general; + + // if pomelo is enabled, global_name should be set + return pomeloEnabled ? this.global_name as string : `${this.username}#${this.discriminator}`; + } + static async register({ email, username, @@ -337,19 +352,25 @@ export class User extends BaseClass { id?: string; req?: Request; }) { + const {pomeloEnabled} = Config.get().general; + // trim special uf8 control characters -> Backspace, Newline, ... username = trimSpecial(username); - const discriminator = await User.generateDiscriminator(username); - if (!discriminator) { - // We've failed to generate a valid and unused discriminator - throw FieldErrors({ - username: { - code: "USERNAME_TOO_MANY_USERS", - message: - req?.t("auth:register.USERNAME_TOO_MANY_USERS") || "", - }, - }); + let discriminator: string | undefined; + if(pomeloEnabled) discriminator = "0"; + else { + discriminator = await User.generateDiscriminator(username); + if (!discriminator) { + // We've failed to generate a valid and unused discriminator + throw FieldErrors({ + username: { + code: "USERNAME_TOO_MANY_USERS", + message: + req?.t("auth:register.USERNAME_TOO_MANY_USERS") || "", + }, + }); + } } // TODO: save date_of_birth @@ -364,6 +385,8 @@ export class User extends BaseClass { const user = User.create({ username: username, + global_name: username, // TODO: convert to lowercase, strip special characters,etc??? + // display_name: username, // TODO: how should we do this? discriminator, id: id || Snowflake.generate(), email: email, @@ -391,7 +414,7 @@ export class User extends BaseClass { if (!Config.get().defaults.user.verified && email) { await Email.sendVerifyEmail(user, email).catch((e) => { console.error( - `Failed to send verification email to ${user.username}#${user.discriminator}: ${e}`, + `Failed to send verification email to ${user.handle}: ${e}`, ); }); } diff --git a/src/util/schemas/RelationshipPostSchema.ts b/src/util/schemas/RelationshipPostSchema.ts index 066ecfd8..f0a5fc32 100644 --- a/src/util/schemas/RelationshipPostSchema.ts +++ b/src/util/schemas/RelationshipPostSchema.ts @@ -16,6 +16,7 @@ along with this program. If not, see . */ +// TODO: pomelo? export interface RelationshipPostSchema { discriminator: string; username: string; diff --git a/src/util/schemas/responses/GuildBansResponse.ts b/src/util/schemas/responses/GuildBansResponse.ts index 77c95a48..aa53105d 100644 --- a/src/util/schemas/responses/GuildBansResponse.ts +++ b/src/util/schemas/responses/GuildBansResponse.ts @@ -21,6 +21,8 @@ export interface GuildBansResponse { user: { username: string; discriminator: string; + global_name: string; + display_name: string | null; id: string; avatar: string | null; public_flags: number; diff --git a/src/util/schemas/responses/GuildWidgetJsonResponse.ts b/src/util/schemas/responses/GuildWidgetJsonResponse.ts index bd692304..60e8e7cc 100644 --- a/src/util/schemas/responses/GuildWidgetJsonResponse.ts +++ b/src/util/schemas/responses/GuildWidgetJsonResponse.ts @@ -30,6 +30,8 @@ export interface GuildWidgetJsonResponse { members: { id: string; username: string; + global_name: string; + display_name: string | null; discriminator: string; avatar: string | null; status: ClientStatus; diff --git a/src/util/schemas/responses/UserRelationsResponse.ts b/src/util/schemas/responses/UserRelationsResponse.ts index 808dd3d3..59db277f 100644 --- a/src/util/schemas/responses/UserRelationsResponse.ts +++ b/src/util/schemas/responses/UserRelationsResponse.ts @@ -19,6 +19,8 @@ import { User } from "@spacebar/util"; export type UserRelationsResponse = (Pick & Pick & + Pick & + Pick & Pick & Pick & Pick)[]; diff --git a/src/util/util/email/index.ts b/src/util/util/email/index.ts index 619cc5c3..6d34e234 100644 --- a/src/util/util/email/index.ts +++ b/src/util/util/email/index.ts @@ -112,9 +112,12 @@ export const Email: { ) { const { instanceName } = Config.get().general; + // TODO: pomelo: display_name should take precedence over username if pomelo is enabled. maybe we should use global_name as the username? const replacements = [ ["{instanceName}", instanceName], ["{userUsername}", user.username], + ["{userGlobalName}", user.global_name], + ["{userDisplayName}", user.display_name], ["{userDiscriminator}", user.discriminator], ["{userId}", user.id], ["{phoneNumber}", user.phone?.slice(-4)],