summary refs log tree commit diff
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-07-10 14:22:27 +1000
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-07-10 14:22:27 +1000
commit7b4c483ae9a978437430b844b2c32662da348d62 (patch)
treec6a604790aaf547bb9b150d73393f23da4b8889d
parentMerge branch 'master' into slowcord (diff)
parentTry to allow role icons to be removed (diff)
downloadserver-7b4c483ae9a978437430b844b2c32662da348d62.tar.xz
Merge branch 'feat/latestWebClient' into slowcord
-rw-r--r--api/assets/schemas.json3
-rw-r--r--api/src/routes/users/@me/index.ts1
2 files changed, 4 insertions, 0 deletions
diff --git a/api/assets/schemas.json b/api/assets/schemas.json

index 773c9927..5259131b 100644 --- a/api/assets/schemas.json +++ b/api/assets/schemas.json
@@ -12535,6 +12535,9 @@ }, "email": { "type": "string" + }, + "discriminator": { + "type": "string" } }, "additionalProperties": false, diff --git a/api/src/routes/users/@me/index.ts b/api/src/routes/users/@me/index.ts
index 6be9d3f2..dc0d1cb1 100644 --- a/api/src/routes/users/@me/index.ts +++ b/api/src/routes/users/@me/index.ts
@@ -23,6 +23,7 @@ export interface UserModifySchema { new_password?: string; code?: string; email?: string; + discriminator?: string; } router.get("/", route({}), async (req: Request, res: Response) => {