summary refs log tree commit diff
diff options
context:
space:
mode:
authorPuyodead1 <puyodead@protonmail.com>2023-12-23 17:31:31 -0500
committerRory& <root@rory.gay>2026-01-21 07:10:11 +0100
commite311114f6997c151430b547b4ab80ba4f0cc8c7e (patch)
treed92a505f60e142f6fc984fbfbb1a0a3d54bbdea5
parentupdate pomelo experiment (diff)
downloadserver-ts-e311114f6997c151430b547b4ab80ba4f0cc8c7e.tar.xz
rename unique uesrname response and schema
-rw-r--r--src/api/routes/unique-username/username-attempt-unauthed.ts11
-rw-r--r--src/api/routes/unique-username/username-suggestions-unauthed.ts4
-rw-r--r--src/schemas/responses/TypedResponses.ts3
-rw-r--r--src/schemas/responses/UniqueUsernameAttemptResponse.ts3
-rw-r--r--src/schemas/responses/UsernameAttemptResponse.ts3
-rw-r--r--src/schemas/uncategorised/UniqueUsernameAttemptSchema.ts3
-rw-r--r--src/schemas/uncategorised/UsernameAttemptUnauthedSchema.ts3
-rw-r--r--src/schemas/uncategorised/index.ts4
8 files changed, 21 insertions, 13 deletions
diff --git a/src/api/routes/unique-username/username-attempt-unauthed.ts b/src/api/routes/unique-username/username-attempt-unauthed.ts

index 3af1fa88..b225a299 100644 --- a/src/api/routes/unique-username/username-attempt-unauthed.ts +++ b/src/api/routes/unique-username/username-attempt-unauthed.ts
@@ -1,5 +1,5 @@ import { route } from "@spacebar/api"; -import { Config, User, UsernameAttemptUnauthedSchema } from "@spacebar/util"; +import { Config, UniqueUsernameAttemptSchema, User } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server"; const router = Router(); @@ -7,15 +7,16 @@ const router = Router(); router.post( "/", route({ - requestBody: "UsernameAttemptUnauthedSchema", + requestBody: "UniqueUsernameAttemptSchema", responses: { - 200: { body: "UsernameAttemptResponse" }, + 200: { body: "UniqueUsernameAttemptResponse" }, 400: { body: "APIErrorResponse" }, }, - description: "Check if a username is available", + description: + "Checks whether a unique username is available for the user to claim.", }), async (req: Request, res: Response) => { - const body = req.body as UsernameAttemptUnauthedSchema; + const body = req.body as UniqueUsernameAttemptSchema; const { uniqueUsernames } = Config.get().general; if (!uniqueUsernames) { throw new HTTPError( diff --git a/src/api/routes/unique-username/username-suggestions-unauthed.ts b/src/api/routes/unique-username/username-suggestions-unauthed.ts
index 9b112b55..2ce09285 100644 --- a/src/api/routes/unique-username/username-suggestions-unauthed.ts +++ b/src/api/routes/unique-username/username-suggestions-unauthed.ts
@@ -1,12 +1,14 @@ import { route } from "@spacebar/api"; +import { Config } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server"; -import { Config } from "../../../util"; const router = Router(); router.get( "/", route({ + description: + "Returns a suggested unique username string based on the current user's username.", query: { global_name: { type: "string", diff --git a/src/schemas/responses/TypedResponses.ts b/src/schemas/responses/TypedResponses.ts
index 13956ec8..e9c6a673 100644 --- a/src/schemas/responses/TypedResponses.ts +++ b/src/schemas/responses/TypedResponses.ts
@@ -35,6 +35,9 @@ export type APIDMChannelArray = DmChannelDTO[]; export type APIBackupCodeArray = BackupCode[]; +export type PrivateUserResponse = APIPrivateUser; +export type PublicUserResponse = APIPublicUser; + export interface UserUpdateResponse extends APIPrivateUser { newToken?: string; } diff --git a/src/schemas/responses/UniqueUsernameAttemptResponse.ts b/src/schemas/responses/UniqueUsernameAttemptResponse.ts new file mode 100644
index 00000000..b9804f9c --- /dev/null +++ b/src/schemas/responses/UniqueUsernameAttemptResponse.ts
@@ -0,0 +1,3 @@ +export interface UniqueUsernameAttemptResponse { + taken: boolean; +} diff --git a/src/schemas/responses/UsernameAttemptResponse.ts b/src/schemas/responses/UsernameAttemptResponse.ts deleted file mode 100644
index 864a3bb0..00000000 --- a/src/schemas/responses/UsernameAttemptResponse.ts +++ /dev/null
@@ -1,3 +0,0 @@ -export interface UsernameAttemptResponse { - taken: boolean; -} diff --git a/src/schemas/uncategorised/UniqueUsernameAttemptSchema.ts b/src/schemas/uncategorised/UniqueUsernameAttemptSchema.ts new file mode 100644
index 00000000..39ebb25f --- /dev/null +++ b/src/schemas/uncategorised/UniqueUsernameAttemptSchema.ts
@@ -0,0 +1,3 @@ +export interface UniqueUsernameAttemptSchema { + username: string; +} diff --git a/src/schemas/uncategorised/UsernameAttemptUnauthedSchema.ts b/src/schemas/uncategorised/UsernameAttemptUnauthedSchema.ts deleted file mode 100644
index 0ac83dd0..00000000 --- a/src/schemas/uncategorised/UsernameAttemptUnauthedSchema.ts +++ /dev/null
@@ -1,3 +0,0 @@ -export interface UsernameAttemptUnauthedSchema { - username: string; -} diff --git a/src/schemas/uncategorised/index.ts b/src/schemas/uncategorised/index.ts
index 1cd19b3f..2d677903 100644 --- a/src/schemas/uncategorised/index.ts +++ b/src/schemas/uncategorised/index.ts
@@ -78,12 +78,14 @@ export * from "./TotpDisableSchema"; export * from "./TotpEnableSchema"; export * from "./TotpSchema"; export * from "./UploadAttachmentRequestSchema"; +export * from "./UniqueUsernameAttemptSchema"; export * from "./UserDeleteSchema"; export * from "./UserGuildSettingsSchema"; export * from "./UserModifySchema"; export * from "./UserNoteUpdateSchema"; export * from "./UserProfileModifySchema"; -export * from "./UsernameAttemptUnauthedSchema"; +export * from "./UserSettingsSchema"; +export * from "./Validator"; export * from "./VanityUrlSchema"; export * from "./VerifyEmailSchema"; export * from "./VoiceStateUpdateSchema";